1004 files changed, 0 insertions, 156470 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.db.ui/.classpath b/jpa/plugins/org.eclipse.jpt.db.ui/.classpath
deleted file mode 100644
index 304e86186a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/jpa/plugins/org.eclipse.jpt.db.ui/.cvsignore b/jpa/plugins/org.eclipse.jpt.db.ui/.cvsignore
deleted file mode 100644
index a196dd7686..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db.ui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-@dot
-temp.folder
-build.xml
-javaCompiler...args
-javaCompiler...args.*
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.db.ui/.project b/jpa/plugins/org.eclipse.jpt.db.ui/.project
deleted file mode 100644
index 88ea5da610..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jpt.db.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/jpa/plugins/org.eclipse.jpt.db.ui/.settings/org.eclipse.core.resources.prefs b/jpa/plugins/org.eclipse.jpt.db.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 8fa7db1fac..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Jan 15 11:11:22 EST 2008
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/jpa/plugins/org.eclipse.jpt.db.ui/.settings/org.eclipse.jdt.core.prefs b/jpa/plugins/org.eclipse.jpt.db.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 842c286bb1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sun May 27 14:59:42 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jpa/plugins/org.eclipse.jpt.db.ui/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.db.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index e3e7d13160..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.jpt.db.ui
-Bundle-Version: 1.1.0.qualifier
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jpt.db.ui.internal; x-friends:="org.eclipse.jpt.ui"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jpt.db;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.datatools.connectivity.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.datatools.sqltools.editor.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.datatools.connectivity.db.generic.ui;bundle-version="[1.0.1,2.0.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jpa/plugins/org.eclipse.jpt.db.ui/about.html b/jpa/plugins/org.eclipse.jpt.db.ui/about.html
deleted file mode 100644
index be534ba44f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 02, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor's license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/jpa/plugins/org.eclipse.jpt.db.ui/build.properties b/jpa/plugins/org.eclipse.jpt.db.ui/build.properties
deleted file mode 100644
index 0d56981f21..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db.ui/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2007 Oracle.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle. - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               META-INF/,\
-               about.html,\
-               plugin.properties
-jars.compile.order = .
diff --git a/jpa/plugins/org.eclipse.jpt.db.ui/component.xml b/jpa/plugins/org.eclipse.jpt.db.ui/component.xml
deleted file mode 100644
index bf648aaa4f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db.ui/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jpt.db.ui"><description url=""></description><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jpt.db.ui" fragment="false"/></component>
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.db.ui/plugin.properties b/jpa/plugins/org.eclipse.jpt.db.ui/plugin.properties
deleted file mode 100644
index 2b0e5835b1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db.ui/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 Oracle.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle. - initial API and implementation
-###############################################################################
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = Java Persistence API Tools - DB UI
-providerName = Eclipse.org
-
diff --git a/jpa/plugins/org.eclipse.jpt.db.ui/src/org/eclipse/jpt/db/ui/internal/DTPUiTools.java b/jpa/plugins/org.eclipse.jpt.db.ui/src/org/eclipse/jpt/db/ui/internal/DTPUiTools.java
deleted file mode 100644
index 9a2b81e5cc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db.ui/src/org/eclipse/jpt/db/ui/internal/DTPUiTools.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2007, 2008 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.db.ui.internal;
-
-import org.eclipse.datatools.connectivity.IConnectionProfile;
-import org.eclipse.datatools.connectivity.IProfileListener;
-import org.eclipse.datatools.connectivity.ProfileManager;
-import org.eclipse.datatools.connectivity.db.generic.ui.wizard.NewJDBCFilteredCPWizard;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * DTP UI tools
- */
-public class DTPUiTools {
-
-	/**
-	 * Launch the DTP New Connection Profile wizard to create a new database connection profile.
-	 * 
-	 * Returns the name of the added profile, or null if the wizard was cancelled.
-	 * The name can be used to build a Dali connection profile from
-	 * JptDbPlugin.getConnectionProfileFactory().buildConnectionProfile(String).
-	 */
-	public static String createNewConnectionProfile() {
-		// Filter datasource category
-		NewJDBCFilteredCPWizard  wizard = new NewJDBCFilteredCPWizard();
-		WizardDialog wizardDialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard);
-		wizardDialog.setBlockOnOpen(true);
-
-		LocalProfileListener listener = new LocalProfileListener();
-		ProfileManager.getInstance().addProfileListener(listener);
-
-		String newCPName = null;
-		if (wizardDialog.open() == Window.OK) {
-			// assume the last added profile is the one we want
-			newCPName = listener.addedProfile.getName();
-		}
-		ProfileManager.getInstance().removeProfileListener(listener);
-
-		return newCPName;
-	}
-
-
-	// ********** DTP profile listener **********
-
-	/**
-	 * This listener simply holds on to the most recently added connection
-	 * profile.
-	 */
-	static class LocalProfileListener implements IProfileListener {
-		IConnectionProfile addedProfile;
-		
-		public void profileAdded(IConnectionProfile profile) {
-			this.addedProfile = profile;
-		}
-	
-		public void profileChanged(IConnectionProfile profile) {
-			// do nothing
-		}
-	
-		public void profileDeleted(IConnectionProfile profile) {
-			// do nothing
-		}
-	}
-
-
-//	// ********** viewer filter **********
-//
-//	static class LocalViewerFilter extends ViewerFilter {
-//
-//		private static final String DATABASE_CATEGORY_ID = "org.eclipse.datatools.connectivity.db.category"; //$NON-NLS-1$
-//
-//		LocalViewerFilter() {
-//			super();
-//		}
-//
-//		@Override
-//		public boolean select(Viewer viewer, Object parentElement, Object element) {
-//			CPWizardNode wizardNode = (CPWizardNode) element;
-//			IProfileWizardProvider wizardProvider = wizardNode.getProvider();
-//			if (wizardProvider instanceof IWizardCategoryProvider) {
-//				return false;
-//			}
-//			ICategory category = ConnectionProfileManager.getInstance().getProvider(
-//							((ProfileWizardProvider) wizardProvider).getProfile()).getCategory();
-//			
-//			// Only display wizards belong to database category
-//			while (category != null) {
-//				if (category.getId().equals(DATABASE_CATEGORY_ID)) {
-//					return true;
-//				}
-//				category = category.getParent();
-//			}
-//			return false;
-//		}
-//	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/.classpath b/jpa/plugins/org.eclipse.jpt.db/.classpath
deleted file mode 100644
index 304e86186a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/jpa/plugins/org.eclipse.jpt.db/.cvsignore b/jpa/plugins/org.eclipse.jpt.db/.cvsignore
deleted file mode 100644
index a196dd7686..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-@dot
-temp.folder
-build.xml
-javaCompiler...args
-javaCompiler...args.*
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.db/.project b/jpa/plugins/org.eclipse.jpt.db/.project
deleted file mode 100644
index 5675a48e3a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jpt.db</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/jpa/plugins/org.eclipse.jpt.db/.settings/org.eclipse.core.resources.prefs b/jpa/plugins/org.eclipse.jpt.db/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 84ebb5c739..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Jan 15 11:11:02 EST 2008
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/jpa/plugins/org.eclipse.jpt.db/.settings/org.eclipse.jdt.core.prefs b/jpa/plugins/org.eclipse.jpt.db/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 929d54536d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sun May 27 14:59:18 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jpa/plugins/org.eclipse.jpt.db/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.db/META-INF/MANIFEST.MF
deleted file mode 100644
index 2e540e676a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.jpt.db
-Bundle-Version: 1.2.100.qualifier
-Bundle-Activator: org.eclipse.jpt.db.JptDbPlugin
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.datatools.enablement.jdt.classpath;bundle-version="[1.0.1,2.0.0)",
- org.eclipse.datatools.sqltools.editor.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jpt.utility;bundle-version="[1.2.0,2.0.0)"
-Export-Package: org.eclipse.jpt.db,
- org.eclipse.jpt.db.internal;x-internal:=true,
- org.eclipse.jpt.db.internal.vendor;x-internal:=true
diff --git a/jpa/plugins/org.eclipse.jpt.db/about.html b/jpa/plugins/org.eclipse.jpt.db/about.html
deleted file mode 100644
index be534ba44f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 02, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor's license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/jpa/plugins/org.eclipse.jpt.db/build.properties b/jpa/plugins/org.eclipse.jpt.db/build.properties
deleted file mode 100644
index 974eadac6b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2007 Oracle.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle. - initial API and implementation
-###############################################################################
-javacSource=1.5
-javacTarget=1.5
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               META-INF/,\
-               about.html,\
-               plugin.properties
-jars.compile.order = .
diff --git a/jpa/plugins/org.eclipse.jpt.db/component.xml b/jpa/plugins/org.eclipse.jpt.db/component.xml
deleted file mode 100644
index 644c396149..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jpt.db"><description url=""></description><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jpt.db" fragment="false"/></component>
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.db/plugin.properties b/jpa/plugins/org.eclipse.jpt.db/plugin.properties
deleted file mode 100644
index e87a2d3972..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 Oracle.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle. - initial API and implementation
-###############################################################################
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = Java Persistence API Tools - DB
-providerName = Eclipse.org
-
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/Catalog.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/Catalog.java
deleted file mode 100644
index 5c6da7058d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/Catalog.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db;
-
-/**
- * Database catalog
- * 
- * 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.
- * 
- * This interface is not intended to be implemented by clients.
- */
-public interface Catalog
-	extends SchemaContainer, Comparable<Catalog>
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/Column.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/Column.java
deleted file mode 100644
index b502f61ca6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/Column.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db;
-
-import org.eclipse.jpt.utility.JavaType;
-
-/**
- * Database column
- * 
- * 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.
- * 
- * This interface is not intended to be implemented by clients.
- */
-public interface Column
-	extends DatabaseObject, Comparable<Column>
-{
-	/**
-	 * Return the column's table.
-	 */
-	Table getTable();
-
-
-	// ********** constraints **********
-
-	/**
-	 * Return whether the column is part of it's table's primary key.
-	 */
-	boolean isPartOfPrimaryKey();
-
-	/**
-	 * Return whether the column is part of one of it's table's foreign keys.
-	 */
-	boolean isPartOfForeignKey();
-
-	/**
-	 * Return whether the column is part of a unique constraint defined for its
-	 * table.
-	 */
-	boolean isPartOfUniqueConstraint();
-
-	/**
-	 * Return whether the column is nullable.
-	 */
-	boolean isNullable();
-
-
-	// ********** data type **********
-
-	/**
-	 * Return the name of the column's datatype.
-	 */
-	String getDataTypeName();
-
-	/**
-	 * Return whether the column's type is numeric.
-	 */
-	boolean isNumeric();
-
-	/**
-	 * Return the column's precision if it is a NumericalDataType;
-	 * otherwise, return -1.
-	 */
-	public int getPrecision();
-
-	/**
-	 * Return the column's scale if it is an ExactNumericDataType;
-	 * otherwise, return -1.
-	 */
-	public int getScale();
-
-	/**
-	 * If the column is a CharacterStringDataType, return its length;
-	 * otherwise, return -1.
-	 */
-	public int getLength();
-
-	/**
-	 * Return whether the column's datatype is a LOB type
-	 * (i.e. BLOB, CLOB, or NCLOB).
-	 */
-	boolean isLOB();
-
-
-	// ********** Java type **********
-
-	/**
-	 * Return a Java type declaration that is reasonably
-	 * similar to the column's data type.
-	 */
-	String getJavaTypeDeclaration();
-
-	/**
-	 * Return a Java type that is reasonably
-	 * similar to the column's data type.
-	 */
-	JavaType getJavaType();
-
-	/**
-	 * Return a Java type declaration that is reasonably
-	 * similar to the column's data type and suitable for use as a
-	 * primary key field.
-	 */
-	String getPrimaryKeyJavaTypeDeclaration();
-
-	/**
-	 * Return a Java type that is reasonably
-	 * similar to the column's data type and suitable for use as a
-	 * primary key field.
-	 */
-	JavaType getPrimaryKeyJavaType();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ConnectionAdapter.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ConnectionAdapter.java
deleted file mode 100644
index 972848965c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ConnectionAdapter.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db;
-
-
-/**
- * An empty implementation of ConnectionListener.
- * 
- * Provisional API: This class is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- */
-public class ConnectionAdapter implements ConnectionListener {
-
-	public void aboutToClose(ConnectionProfile profile) {
-		// do nothing
-	}
-
-	public void closed(ConnectionProfile profile) {
-		// do nothing
-	}
-
-	public void databaseChanged(ConnectionProfile profile, Database database) {
-		// do nothing
-	}
-
-	public void modified(ConnectionProfile profile) {
-		// do nothing
-	}
-
-	public boolean okToClose(ConnectionProfile profile) {
-		return true;
-	}
-
-	public void opened(ConnectionProfile profile) {
-		// do nothing
-	}
-
-	public void catalogChanged(ConnectionProfile profile, Catalog catalog) {
-		// do nothing
-	}
-
-	public void schemaChanged(ConnectionProfile profile, Schema schema) {
-		// do nothing
-	}
-
-	public void sequenceChanged(ConnectionProfile profile, Sequence sequence) {
-		// do nothing
-	}
-
-	public void tableChanged(ConnectionProfile profile, Table table) {
-		// do nothing
-	}
-
-	public void columnChanged(ConnectionProfile profile, Column column) {
-		// do nothing
-	}
-
-	public void foreignKeyChanged(ConnectionProfile profile, ForeignKey foreignKey) {
-		// do nothing
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ConnectionListener.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ConnectionListener.java
deleted file mode 100644
index 4f3b09bae8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ConnectionListener.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db;
-
-import java.util.EventListener;
-
-
-/**
- * A ConnectionListener is notified of any changes to a connection.
- * 
- * @see org.eclipse.datatools.connectivity.IManagedConnectionListener
- * 
- * 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 ConnectionListener extends EventListener {
-
-	public void opened(ConnectionProfile profile);
-	public void modified(ConnectionProfile profile);
-	public boolean okToClose(ConnectionProfile profile);
-	public void aboutToClose(ConnectionProfile profile);
-	public void closed(ConnectionProfile profile);
-
-	public void databaseChanged(ConnectionProfile profile, Database database);
-	public void catalogChanged(ConnectionProfile profile, Catalog catalog);
-	public void schemaChanged(ConnectionProfile profile, Schema schema);
-	public void sequenceChanged(ConnectionProfile profile, Sequence sequence);
-	public void tableChanged(ConnectionProfile profile, Table table);
-	public void columnChanged(ConnectionProfile profile, Column column);
-	public void foreignKeyChanged(ConnectionProfile profile, ForeignKey foreignKey);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ConnectionProfile.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ConnectionProfile.java
deleted file mode 100644
index c15db7aa7f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ConnectionProfile.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.datatools.connectivity.drivers.jdbc.IJDBCDriverDefinitionConstants;
-
-/**
- * Database connection profile
- * 
- * 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.
- * 
- * This interface is not intended to be implemented by clients.
- */
-public interface ConnectionProfile
-	extends DatabaseObject, Comparable<ConnectionProfile>
-{
-
-	// ********** properties **********
-
-	/**
-	 * Return the connection profile's database.
-	 * Return null if the connection profile is inactive.
-	 */
-	Database getDatabase();
-
-	/**
-	 * Return ID of the provider managing the DTP profile.
-	 */
-	String getProviderID();
-
-	/**
-	 * Return the connection profile's static ID.
-	 */
-	String getInstanceID();
-
-	/**
-	 * Return the default database name.
-	 */
-	String getDatabaseName();
-
-	/**
-	 * Return the database product name.
-	 */
-	String getDatabaseProduct();
-
-	/**
-	 * Return the database vendor.
-	 */
-	String getDatabaseVendor();
-
-	/**
-	 * Return the database version.
-	 */
-	String getDatabaseVersion();
-
-	/**
-	 * Return the driver class name.
-	 */
-	String getDriverClassName();
-
-	/**
-	 * Return the default connection URL.
-	 */
-	String getURL();
-
-	/**
-	 * Return the default user name.
-	 */
-	String getUserName();
-
-	/**
-	 * Return the default user password.
-	 */
-	String getUserPassword();
-
-	/**
-	 * Return the ID of the associated Driver definition.
-	 */
-	String getDriverDefinitionID();
-
-	/**
-	 * Return the jar list for the associated Driver as a 
-	 * comma-delimited string.
-	 */
-	String getDriverJarList();
-
-	/**
-	 * Return the name of the associated Driver definition.
-	 */
-	String getDriverName();
-
-	// ********** connection **********
-
-	/**
-	 * Return whether the profile is either connected to a live database
-	 * session or working off-line (i.e. it has access to meta-data).
-	 * @see isConnected()
-	 * @see isWorkingOffline()
-	 */
-	boolean isActive();
-
-	/**
-	 * Return whether the profile is neither connected to a live database
-	 * session nor working off-line (i.e. it has access to meta-data).
-	 * @see isActive()
-	 */
-	boolean isInactive();
-
-	/**
-	 * Return whether the profile is connected to a live database session
-	 * (i.e. the meta-data comes from the database), as opposed to working
-	 * off-line.
-	 * @see #isActive()
-	 */
-	boolean isConnected();
-
-	/**
-	 * Return whether the profile is not connected to a live database session
-	 * (i.e. the meta-data comes from the database), as opposed to working
-	 * off-line.
-	 * @see #isConnected()
-	 */
-	boolean isDisconnected();
-
-	/**
-	 * Connect to the database.
-	 * @see #disconnect()
-	 */
-	void connect();
-
-	/**
-	 * Disconnect from the database.
-	 * @see #connect()
-	 */
-	void disconnect();
-
-
-	// ********** off-line support **********
-
-	/**
-	 * Return whether the profile is working off-line (i.e. the meta-data
-	 * comes from a local cache), as opposed to connected to a live
-	 * database session.
-	 * @see #isActive()
-	 */
-	boolean isWorkingOffline();
-
-	/**
-	 * Return whether the connection factories associated with the
-	 * connection profile's provider support working offline.
-	 */
-	boolean supportsWorkOfflineMode();
-
-	/**
-	 * Save the state of the connection profile for working in an offline mode.
-	 * If the connection profile does not support working in an offline mode, no
-	 * exception is thrown and the method will return immediately.
-	 */
-	IStatus saveWorkOfflineData();
-
-	/**
-	 * Return whether the connection profile supports working offline and data
-	 * has been saved for working offline.
-	 */
-	boolean canWorkOffline();
-
-	/**
-	 * Begin working off-line.
-	 */
-	IStatus workOffline();
-
-
-	// ********** listeners **********
-
-	/**
-	 * Add the specified connection listener to the connection profile.
-	 */
-	void addConnectionListener(ConnectionListener listener);
-
-	/**
-	 * Remove the specified connection listener from the connection profile.
-	 */
-	void removeConnectionListener(ConnectionListener listener);
-
-
-	// ********** constants **********
-
-	String CONNECTION_PROFILE_TYPE = "org.eclipse.datatools.connectivity.db.generic.connectionProfile";  //$NON-NLS-1$
-	String DRIVER_DEFINITION_PROP_ID = "org.eclipse.datatools.connectivity.driverDefinitionID";  //$NON-NLS-1$
-	String DRIVER_DEFINITION_TYPE_PROP_ID = "org.eclipse.datatools.connectivity.drivers.defnType";  //$NON-NLS-1$
-	String DRIVER_JAR_LIST_PROP_ID = "jarList";  //$NON-NLS-1$
-	String DATABASE_SAVE_PWD_PROP_ID = IJDBCDriverDefinitionConstants.PROP_PREFIX + "savePWD";  //$NON-NLS-1$
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ConnectionProfileAdapter.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ConnectionProfileAdapter.java
deleted file mode 100644
index 648daa5bf6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ConnectionProfileAdapter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db;
-
-/**
- * An empty implementation of ProfileListener.
- * 
- * Provisional API: This class is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- */
-public class ConnectionProfileAdapter implements ConnectionProfileListener {
-
-	public void connectionProfileAdded(String name) {
-		// do nothing
-	}
-
-	public void connectionProfileRemoved(String name) {
-		// do nothing
-	}
-
-	public void connectionProfileRenamed(String oldName, String newName) {
-		// do nothing
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ConnectionProfileFactory.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ConnectionProfileFactory.java
deleted file mode 100644
index e44773953a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ConnectionProfileFactory.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db;
-
-import java.util.Iterator;
-
-/**
- * Database connection profile factory
- * 
- * 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.
- * 
- * This interface is not intended to be implemented by clients.
- */
-public interface ConnectionProfileFactory {
-
-	/**
-	 * Return the names of the DTP connection profiles the factory can wrap with
-	 * new connection profiles.
-	 */
-	Iterator<String> connectionProfileNames();
-
-	/**
-	 * Build and return a connection profile that wraps the DTP connection
-	 * profile with the specified name.
-	 * Return null if there is no DTP connection profile with the specified
-	 * name.
-	 * Use the specified database finder to allow clients to control how
-	 * database objects are found based on their names.
-	 */
-	ConnectionProfile buildConnectionProfile(String name, DatabaseFinder finder);
-
-	/**
-	 * Build and return a connection profile that wraps the DTP connection
-	 * profile with the specified name.
-	 * Return null if there is no DTP connection profile with the specified
-	 * name.
-	 * Clients should use this method when a JPA platform is unavailable
-	 * (e.g. during project creation). The returned connection profile will
-	 * not be able to search for database objects by any names other than
-	 * those supplied by the factory (i.e. lookups cannot be performed with
-	 * "identifiers").
-	 */
-	ConnectionProfile buildConnectionProfile(String name);
-
-	/**
-	 * Add a listener that will be notified of changes to the DTP
-	 * connection profiles.
-	 */
-	void addConnectionProfileListener(ConnectionProfileListener listener);
-
-	/**
-	 * Remove the specified listener.
-	 */
-	void removeConnectionProfileListener(ConnectionProfileListener listener);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ConnectionProfileListener.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ConnectionProfileListener.java
deleted file mode 100644
index f020c5505d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ConnectionProfileListener.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db;
-
-import java.util.EventListener;
-
-/**
- * A ProfileListener is notified of any changes to the DTP connection profiles.
- * 
- * @see org.eclipse.datatools.connectivity.IProfileListener
- * 
- * 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 ConnectionProfileListener
-	extends EventListener
-{
-
-	/**
-	 * The specified profile has been added.
-	 */
-	public void connectionProfileAdded(String name);
-
-	/**
-	 * The specified profile has been removed.
-	 */
-	public void connectionProfileRemoved(String name);
-
-	/**
-	 * The specified profile has been renamed.
-	 */
-	public void connectionProfileRenamed(String oldName, String newName);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/Database.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/Database.java
deleted file mode 100644
index ac5ed09e14..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/Database.java
+++ /dev/null
@@ -1,127 +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.db;
-
-import java.util.Iterator;
-
-/**
- * Database
- * 
- * 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.
- * 
- * This interface is not intended to be implemented by clients.
- */
-public interface Database
-	extends SchemaContainer, Comparable<Database>
-{
-
-	// ********** properties **********
-
-	/**
-	 * Return the name of the database's vendor.
-	 */
-	String getVendorName();
-
-	/**
-	 * Return the database's version.
-	 */
-	String getVersion();
-
-
-	// ********** catalogs **********
-
-	/**
-	 * Return whether the database supports catalogs. If it does, all database
-	 * objects are contained by the database's catalogs; otherwise all database
-	 * objects are contained by the database's schemata.
-	 * 
-	 * Practically speaking:
-	 *     if #supportsCatalogs() returns 'true'
-	 *         #catalogs() returns catalogs that contain the database's schemata
-	 *         #schemata() returns an empty iterator
-	 *     else
-	 *         #catalogs() returns an empty iterator
-	 *         #schemata() returns the database's schemata
-	 * This is complicated by the presence of a "default" catalog that clients can
-	 * use to allow the specification of a catalog to be optional; but clients
-	 * must manage this explicitly.
-	 * 
-	 * @see #catalogs()
-	 * @see #schemata()
-	 */
-	boolean supportsCatalogs();
-
-	/**
-	 * Return the database's catalogs.
-	 * Return an empty iterator if the database does not support catalogs.
-	 * @see #supportsCatalogs()
-	 */
-	Iterator<Catalog> catalogs();
-
-	/**
-	 * Return the number of catalogs the database contains.
-	 * Return zero if the database does not support catalogs.
-	 * @see #supportsCatalogs()
-	 */
-	int catalogsSize();
-
-	/**
-	 * Return the catalog with specified name. The name must be an exact match
-	 * of the catalog's name.
-	 * Return null if the database does not support catalogs.
-	 * @see #supportsCatalogs()
-	 * @see #getCatalogForIdentifier(String)
-	 */
-	Catalog getCatalogNamed(String name);
-
-	/**
-	 * Return the database's catalog identifiers, sorted by name.
-	 * Return an empty iterator if the database does not support catalogs.
-	 */
-	Iterator<String> sortedCatalogIdentifiers();
-
-	/**
-	 * Return the catalog for the specified identifier. The identifier should
-	 * be an SQL identifier (i.e. quoted when case-sensitive or containing
-	 * special characters, unquoted otherwise).
-	 * Return null if the database does not support catalogs.
-	 * @see #supportsCatalogs()
-	 * @see #getCatalogNamed(String)
-	 */
-	Catalog getCatalogForIdentifier(String identifier);
-
-	/**
-	 * Return the database's "default" catalog.
-	 * Return null if the database does not support catalogs.
-	 * @see #supportsCatalogs()
-	 */
-	Catalog getDefaultCatalog();
-
-
-	// ********** utility methods **********
-
-	/**
-	 * Select and return from the specified list of database objects the
-	 * database object identified by the specified identifier.
-	 * The identifier should be an SQL identifier (i.e. delimited when
-	 * non-"normal").
-	 */
-	<T extends DatabaseObject> T selectDatabaseObjectForIdentifier(T[] databaseObjects, String identifier);
-
-	/**
-	 * Convert the specified name to a database-appropriate SQL identifier.
-	 */
-	String convertNameToIdentifier(String name);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/DatabaseFinder.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/DatabaseFinder.java
deleted file mode 100644
index e7806e7933..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/DatabaseFinder.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db;
-
-/**
- * This interface allows clients of the Dali db package to plug in a custom
- * strategy for comparing an identifier to the names of a collection of
- * database objects.
- * 
- * 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.
- * 
- * This interface is not intended to be implemented by clients.
- */
-public interface DatabaseFinder {
-
-	/**
-	 * Select and return from the specified list of database objects the
-	 * database object identified by the specified identifier.
-	 */
-	<T extends DatabaseObject> T selectDatabaseObjectForIdentifier(T[] databaseObjects, String identifier, DefaultCallback defaultCallback);
-
-	/**
-	 * The platform-provided finder is passed a "default" callback that can be
-	 * used if appropriate.
-	 */
-	interface DefaultCallback {
-
-		/**
-		 * Select and return from the specified list of database objects the
-		 * database object identified by the specified identifier.
-		 */
-		<T extends DatabaseObject> T selectDatabaseObjectForIdentifier(T[] databaseObjects, String identifier);
-
-	}
-
-	/**
-	 * This finder searches for an exact match.
-	 */
-	final class Simple implements DatabaseFinder {
-		public static final DatabaseFinder INSTANCE = new Simple();
-		public static DatabaseFinder instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Simple() {
-			super();
-		}
-		// search for an exact match on the name
-		public <T extends DatabaseObject> T selectDatabaseObjectForIdentifier(T[] databaseObjects, String identifier, DefaultCallback defaultCallback) {
-			for (T databaseObject : databaseObjects) {
-				if (databaseObject.getName().equals(identifier)) {
-					return databaseObject;
-				}
-			}
-			return null;
-		}
-		@Override
-		public String toString() {
-			return "DatabaseFinder.Default"; //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * This finder uses the passed in callback to search the list of database objects.
-	 */
-	final class Default implements DatabaseFinder {
-		public static final DatabaseFinder INSTANCE = new Default();
-		public static DatabaseFinder instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Default() {
-			super();
-		}
-		// simply use the callback
-		public <T extends DatabaseObject> T selectDatabaseObjectForIdentifier(T[] databaseObjects, String identifier, DefaultCallback defaultCallback) {
-			return defaultCallback.selectDatabaseObjectForIdentifier(databaseObjects, identifier);
-		}
-		@Override
-		public String toString() {
-			return "DatabaseFinder.Default"; //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/DatabaseObject.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/DatabaseObject.java
deleted file mode 100644
index e9f755dbb0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/DatabaseObject.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db;
-
-/**
- * Common behavior to all database objects
- * 
- * 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.
- * 
- * This interface is not intended to be implemented by clients.
- */
-public interface DatabaseObject {
-
-	/**
-	 * Return the database object's name.
-	 */
-	String getName();
-
-	/**
-	 * Return the database object's "identifier", which is the object's name
-	 * modified so it can be used in an SQL statement (e.g. if the name contains
-	 * special characters or is mixed case, it will be delimited, typically by
-	 * double-quotes).
-	 * Return null if the database object's identifier matches the specified
-	 * "default name".
-	 */
-	String getIdentifier(String defaultName);
-
-	/**
-	 * Return the database object's "identifier", which is the object's name
-	 * modified so it can be used in an SQL statement (e.g. if the name contains
-	 * special characters or is mixed case, it will be delimited, typically by
-	 * double-quotes).
-	 */
-	String getIdentifier();
-
-	/**
-	 * Return the database object's database.
-	 */
-	Database getDatabase();
-
-	/**
-	 * Return the database object's connection profile.
-	 */
-	ConnectionProfile getConnectionProfile();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ForeignKey.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ForeignKey.java
deleted file mode 100644
index 0406b42eba..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/ForeignKey.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db;
-
-import java.util.Iterator;
-
-/**
- * Database foreign key
- * 
- * 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.
- * 
- * This interface is not intended to be implemented by clients.
- */
-public interface ForeignKey
-	extends DatabaseObject, Comparable<ForeignKey>
-{
-
-	// ********** tables **********
-
-	/**
-	 * Return the foreign key's "base" table.
-	 */
-	Table getBaseTable();
-
-	/**
-	 * Return the foreign key's "referenced" table.
-	 */
-	Table getReferencedTable();
-
-
-	// ********** column pairs **********
-
-	/**
-	 * Return the foreign key's column pairs.
-	 */
-	Iterator<ColumnPair> columnPairs();
-
-	/**
-	 * Return the size of the foreign key's column pairs.
-	 */
-	int columnPairsSize();
-
-	/**
-	 * Return the foreign key's single column pair. Throw an
-	 * IllegalStateException if the foreign key has more than one column pair.
-	 */
-	ColumnPair getColumnPair();
-
-	/**
-	 * Return the foreign key's "base" columns.
-	 */
-	Iterator<Column> baseColumns();
-
-	/**
-	 * Return the foreign key's "base" columns that are not part of the base
-	 * table's primary key. (The non-primary key base columns are not used to
-	 * generate basic attributes during entity generation.)
-	 */
-	Iterator<Column> nonPrimaryKeyBaseColumns();
-
-	/**
-	 * Return the foreign key's "referenced" columns.
-	 */
-	Iterator<Column> referencedColumns();
-
-	/**
-	 * Return whether the foreign key references the primary key of the
-	 * "referenced" table and that primary key has only a single column.
-	 * This can be used when determining JPA defaults.
-	 */
-	boolean referencesSingleColumnPrimaryKey();
-
-
-	// ********** JPA support **********
-
-	/**
-	 * Return an appropriate name for an attribute that holds the entity
-	 * mapped to the foreign key's "referenced" table.
-	 */
-	String getAttributeName();
-
-	/**
-	 * If the name of the "base" column adheres to the JPA spec for a
-	 * default mapping (i.e. it ends with an underscore followed by the name
-	 * of the "referenced" column, and the "referenced" column is the single
-	 * primary key column of the "referenced" table), return the corresponding
-	 * default attribute name:
-	 *     ForeignKey(EMP.CUBICLE_ID => CUBICLE.ID) => "CUBICLE"
-	 * Return a null if it does not adhere to the JPA spec:
-	 *     ForeignKey(EMP.CUBICLE_ID => CUBICLE.CUBICLE_ID) => null
-	 *     ForeignKey(EMP.CUBICLE => CUBICLE.ID) => null
-	 */
-	String getDefaultAttributeName();
-
-	/**
-	 * Given the name of an attribute (field or property) that is mapped to the
-	 * foreign key,
-	 * build and return a string to be used as the value for the attribute's
-	 * JoinColumn annotation's 'name' element. Return null if the attribute
-	 * maps to the join column by default.
-	 * Precondition: The foreign key consists of a single column pair whose
-	 * referenced column is the single-column primary key of the foreign
-	 * key's referenced table.
-	 */
-	String getJoinColumnAnnotationIdentifier(String attributeName);
-
-	// ********** column pair interface **********
-
-	/**
-	 * Pair up the foreign key's column pairs, matching each "base" column with
-	 * the appropriate "referenced" column.
-	 * @see #columnPairs()
-	 */
-	interface ColumnPair extends Comparable<ColumnPair> {
-
-		/**
-		 * Return the column pair's "base" column.
-		 */
-		Column getBaseColumn();
-
-		/**
-		 * Return the column pair's "referenced" column.
-		 */
-		Column getReferencedColumn();
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/JptDbPlugin.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/JptDbPlugin.java
deleted file mode 100644
index 041ac8d3bb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/JptDbPlugin.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.datatools.enablement.jdt.classpath.DriverClasspathContainer;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jpt.db.internal.DTPConnectionProfileFactory;
-import org.osgi.framework.BundleContext;
-
-/**
- * The JPT DB plug-in lifecycle implementation.
- * Globally available connection profile factory.
- * 
- * Provisional API: This class is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- */
-public class JptDbPlugin extends Plugin {
-	private DTPConnectionProfileFactory connectionProfileFactory;
-
-	private static JptDbPlugin INSTANCE;  // sorta-final
-
-	/**
-	 * Return the singleton JPT DB plug-in.
-	 */
-	public static JptDbPlugin instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * The constructor
-	 */
-	public JptDbPlugin() {
-		super();
-		INSTANCE = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		this.connectionProfileFactory = DTPConnectionProfileFactory.instance();
-        this.connectionProfileFactory.start();
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		this.connectionProfileFactory.stop();
-		this.connectionProfileFactory = null;
-		INSTANCE = null;
-		super.stop(context);
-	}
-
-	public ConnectionProfileFactory getConnectionProfileFactory() {
-		return this.connectionProfileFactory;
-	}
-
-	/**
-	 * Creates a jar list container for the given DTP driver.
-	 */
-	public IClasspathContainer buildDriverClasspathContainerFor(String driverName) {
-		return new DriverClasspathContainer(driverName);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/Schema.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/Schema.java
deleted file mode 100644
index 984dfb537a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/Schema.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db;
-
-import java.util.Iterator;
-
-
-/**
- * Database schema
- * 
- * 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.
- * 
- * This interface is not intended to be implemented by clients.
- */
-public interface Schema
-	extends DatabaseObject, Comparable<Schema>
-{
-	/**
-	 * Return the schema's container; either a catalog or a database.
-	 */
-	SchemaContainer getContainer();
-
-
-	// ********** tables **********
-
-	/**
-	 * Return the schema's tables.
-	 */
-	Iterator<Table> tables();
-
-	/**
-	 * Return the number of tables the schema contains.
-	 */
-	int tablesSize();
-
-	/**
-	 * Return the table with specified name. The name must be an exact match
-	 * of the table's name.
-	 * @see #getTableForIdentifier(String)
-	 */
-	 Table getTableNamed(String name);
-
-	/**
-	 * Return the schema's table identifiers, sorted by name.
-	 */
-	Iterator<String> sortedTableIdentifiers();
-
-	/**
-	 * Return the table for the specified identifier. The identifier should
-	 * be an SQL identifier (i.e. quoted when case-sensitive or containing
-	 * special characters, unquoted otherwise).
-	 * @see #getTableNamed(String)
-	 */
-	Table getTableForIdentifier(String identifier);
-
-
-	// ********** sequences **********
-
-	/**
-	 * Return the schema's sequences.
-	 */
-	Iterator<Sequence> sequences();
-
-	/**
-	 * Return the number of sequences the schema contains.
-	 */
-	int sequencesSize();
-
-	/**
-	 * Return the sequence with specified name. The name must be an exact match
-	 * of the sequence's name.
-	 * @see #getSequenceForIdentifier(String)
-	 */
-	Sequence getSequenceNamed(String name);
-
-	/**
-	 * Return the schema's sequence identifers, sorted by name.
-	 */
-	Iterator<String> sortedSequenceIdentifiers();
-
-	/**
-	 * Return the sequence for the specified identifier. The identifier should
-	 * be an SQL identifier (i.e. quoted when case-sensitive or containing
-	 * special characters, unquoted otherwise).
-	 * @see #getSequenceNamed(String)
-	 */
-	Sequence getSequenceForIdentifier(String identifier);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/SchemaContainer.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/SchemaContainer.java
deleted file mode 100644
index 26372f4a03..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/SchemaContainer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db;
-
-import java.util.Iterator;
-
-/**
- * Schema "container" (i.e. Database or Catalog)
- * 
- * 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.
- * 
- * This interface is not intended to be implemented by clients.
- */
-public interface SchemaContainer
-	extends DatabaseObject
-{
-
-	/**
-	 * Return the container's schemata.
-	 */
-	Iterator<Schema> schemata();
-
-	/**
-	 * Return the number of schemata in the container.
-	 */
-	int schemataSize();
-
-	/**
-	 * Return the schema with specified name. The name must be an exact match
-	 * of the schema's name.
-	 * @see #schemaNames()
-	 * @see #getSchemaForIdentifier(String)
-	 */
-	Schema getSchemaNamed(String name);
-
-	/**
-	 * Return the container's schema identifiers, sorted by name.
-	 */
-	Iterator<String> sortedSchemaIdentifiers();
-
-	/**
-	 * Return the schema for the specified identifier. The identifier should
-	 * be an SQL identifier (i.e. quoted when case-sensitive or containing
-	 * special characters, unquoted otherwise).
-	 * @see #schemaIdentifiers()
-	 * @see #getSchemaNamed(String)
-	 */
-	Schema getSchemaForIdentifier(String identifier);
-
-	/**
-	 * Return the container's default schema, as defined by the database vendor.
-	 * In most cases the default schema's name will match the user name.
-	 */
-	Schema getDefaultSchema();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/Sequence.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/Sequence.java
deleted file mode 100644
index f4ccaa78f9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/Sequence.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db;
-
-/**
- * Database sequence
- * 
- * 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.
- * 
- * This interface is not intended to be implemented by clients.
- */
-public interface Sequence
-	extends DatabaseObject, Comparable<Sequence>
-{
-
-	/**
-	 * Return the sequence's schema.
-	 */
-	Schema getSchema();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/Table.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/Table.java
deleted file mode 100644
index ef4d334af0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/Table.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db;
-
-import java.util.Iterator;
-
-/**
- * Database table
- * 
- * 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.
- * 
- * This interface is not intended to be implemented by clients.
- */
-public interface Table
-	extends DatabaseObject, Comparable<Table>
-{
-
-	/**
-	 * Return the table's schema.
-	 */
-	Schema getSchema();
-
-
-	// ********** columns **********
-
-	/**
-	 * Return the table's columns.
-	 */
-	Iterator<Column> columns();
-
-	/**
-	 * Return the number of columns the table contains.
-	 */
-	int columnsSize();
-
-	/**
-	 * Return the column with specified name. The name must be an exact match
-	 * of the column's name.
-	 * @see #getColumnForIdentifier(String)
-	 */
-	Column getColumnNamed(String name);
-
-	/**
-	 * Return the table's column identifers, sorted by name.
-	 */
-	Iterator<String> sortedColumnIdentifiers();
-
-	/**
-	 * Return the column for the specified identifier. The identifier should
-	 * be an SQL identifier (i.e. quoted when case-sensitive or containing
-	 * special characters, unquoted otherwise).
-	 * @see #getColumnNamed(String)
-	 */
-	Column getColumnForIdentifier(String identifier);
-
-
-	// ********** primary key columns **********
-
-	/**
-	 * Return the table's primary key columns.
-	 */
-	Iterator<Column> primaryKeyColumns();
-
-	/**
-	 * Return the number of primary key columns the table contains.
-	 */
-	int primaryKeyColumnsSize();
-
-	/**
-	 * Return the table's single primary key column. Throw an
-	 * IllegalStateException if the table has more than one primary key column.
-	 */
-	Column getPrimaryKeyColumn();
-
-
-	// ********** foreign keys **********
-
-	/**
-	 * Return the table's foreign keys.
-	 */
-	Iterator<ForeignKey> foreignKeys();
-
-	/**
-	 * Return the number of foreign keys the table contains.
-	 */
-	int foreignKeysSize();
-
-
-	// ********** join table support **********
-
-	/**
-	 * Return whether the table is possibly a "join" table
-	 * (i.e. it contains only 2 foreign keys). Whether the table *actually* is
-	 * a "join" table is determined by the semantics of the database design.
-	 */
-	boolean isPossibleJoinTable();
-
-	/**
-	 * Assuming the table is a "join" table, return the foreign key to the
-	 * "owning" table.
-	 * @see #isPossibleJoinTable()
-	 */
-	ForeignKey getJoinTableOwningForeignKey();
-
-	/**
-	 * Assuming the table is a "join" table, return the foreign key to the
-	 * "non-owning" table.
-	 * @see #isPossibleJoinTable()
-	 */
-	ForeignKey getJoinTableNonOwningForeignKey();
-
-	/**
-	 * Assuming the table is a "join" table, return whether its name matches
-	 * the JPA default (i.e. "OWNINGTABLE_NONOWNINGTABLE").
-	 * @see #isPossibleJoinTable()
-	 */
-	boolean joinTableNameIsDefault();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPCatalogWrapper.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPCatalogWrapper.java
deleted file mode 100644
index 445bb4df1c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPCatalogWrapper.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db.internal;
-
-import java.text.Collator;
-import java.util.List;
-import org.eclipse.jpt.db.Catalog;
-
-/**
- * Wrap a DTP Catalog
- */
-final class DTPCatalogWrapper
-	extends DTPSchemaContainerWrapper
-	implements Catalog
-{
-	// the wrapped DTP catalog
-	private final org.eclipse.datatools.modelbase.sql.schema.Catalog dtpCatalog;
-
-
-	// ********** constructor **********
-
-	DTPCatalogWrapper(DTPDatabaseWrapper database, org.eclipse.datatools.modelbase.sql.schema.Catalog dtpCatalog) {
-		super(database, dtpCatalog);
-		this.dtpCatalog = dtpCatalog;
-	}
-
-
-	// ********** DTPWrapper implementation **********
-
-	@Override
-	synchronized void catalogObjectChanged() {
-		super.catalogObjectChanged();
-		this.getConnectionProfile().catalogChanged(this);
-	}
-
-
-	// ********** DTPSchemaContainerWrapper implementation **********
-
-	@Override
-	@SuppressWarnings("unchecked")
-	List<org.eclipse.datatools.modelbase.sql.schema.Schema> getDTPSchemata() {
-		return this.dtpCatalog.getSchemas();
-	}
-
-	@Override
-	DTPSchemaWrapper getSchema(org.eclipse.datatools.modelbase.sql.schema.Schema dtpSchema) {
-		// try to short-circuit the search
-		return this.wraps(dtpSchema.getCatalog()) ?
-						this.getSchema_(dtpSchema)
-					:
-						this.getDatabase().getSchemaFromCatalogs(dtpSchema);
-	}
-
-	@Override
-	DTPTableWrapper getTable(org.eclipse.datatools.modelbase.sql.tables.Table dtpTable) {
-		// try to short-circuit the search
-		return this.wraps(dtpTable.getSchema().getCatalog()) ?
-						this.getTable_(dtpTable)
-					:
-						this.getDatabase().getTableFromCatalogs(dtpTable);
-	}
-
-	@Override
-	DTPColumnWrapper getColumn(org.eclipse.datatools.modelbase.sql.tables.Column dtpColumn) {
-		// try to short-circuit the search
-		return this.wraps(dtpColumn.getTable().getSchema().getCatalog()) ?
-						this.getColumn_(dtpColumn)
-					:
-						this.getDatabase().getColumnFromCatalogs(dtpColumn);
-	}
-
-
-	// ********** DatabaseObject implementation **********
-
-	public String getName() {
-		return this.dtpCatalog.getName();
-	}
-
-
-	// ********** Comparable implementation **********
-
-	public int compareTo(Catalog catalog) {
-		return Collator.getInstance().compare(this.getName(), catalog.getName());
-	}
-
-
-	// ********** internal methods **********
-
-	boolean wraps(org.eclipse.datatools.modelbase.sql.schema.Catalog catalog) {
-		return this.dtpCatalog == catalog;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPColumnWrapper.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPColumnWrapper.java
deleted file mode 100644
index 77608037ca..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPColumnWrapper.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db.internal;
-
-import java.text.Collator;
-import org.eclipse.datatools.modelbase.dbdefinition.PredefinedDataTypeDefinition;
-import org.eclipse.datatools.modelbase.sql.datatypes.CharacterStringDataType;
-import org.eclipse.datatools.modelbase.sql.datatypes.DataType;
-import org.eclipse.datatools.modelbase.sql.datatypes.ExactNumericDataType;
-import org.eclipse.datatools.modelbase.sql.datatypes.NumericalDataType;
-import org.eclipse.datatools.modelbase.sql.datatypes.PredefinedDataType;
-import org.eclipse.datatools.modelbase.sql.datatypes.PrimitiveType;
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.utility.JavaType;
-import org.eclipse.jpt.utility.internal.ClassTools;
-import org.eclipse.jpt.utility.internal.SimpleJavaType;
-
-/**
- *  Wrap a DTP Column
- */
-final class DTPColumnWrapper
-	extends DTPDatabaseObjectWrapper
-	implements Column
-{
-	// the wrapped DTP column
-	private final org.eclipse.datatools.modelbase.sql.tables.Column dtpColumn;
-
-
-	// ********** constructor **********
-
-	DTPColumnWrapper(DTPTableWrapper table, org.eclipse.datatools.modelbase.sql.tables.Column dtpColumn) {
-		super(table, dtpColumn);
-		this.dtpColumn = dtpColumn;
-	}
-
-
-	// ********** DTPWrapper implementation **********
-
-	@Override
-	synchronized void catalogObjectChanged() {
-		super.catalogObjectChanged();
-		this.getConnectionProfile().columnChanged(this);
-	}
-
-
-	// ********** Column implementation **********
-
-	public String getName() {
-		return this.dtpColumn.getName();
-	}
-
-	public DTPTableWrapper getTable() {
-		return (DTPTableWrapper) this.getParent();
-	}
-
-	public boolean isPartOfPrimaryKey() {
-		return this.getTable().primaryKeyColumnsContains(this);
-	}
-
-	public boolean isPartOfForeignKey() {
-		return this.getTable().foreignKeyBaseColumnsContains(this);
-	}
-
-	public boolean isPartOfUniqueConstraint() {
-		return this.dtpColumn.isPartOfUniqueConstraint();
-	}
-
-	public boolean isNullable() {
-		return this.dtpColumn.isNullable();
-	}
-
-	public String getDataTypeName() {
-		DataType dataType = this.dtpColumn.getDataType();
-		return (dataType == null) ? null : dataType.getName();
-	}
-
-	public boolean isNumeric() {
-		return this.dtpColumn.getDataType() instanceof NumericalDataType;
-	}	
-
-	public int getPrecision() {
-		DataType dataType = this.dtpColumn.getDataType();
-		return (dataType instanceof NumericalDataType) ?
-						((NumericalDataType) dataType).getPrecision()
-					:
-						-1;
-	}
-
-	public int getScale(){
-		DataType dataType = this.dtpColumn.getDataType();
-		return (dataType instanceof ExactNumericDataType) ?
-						((ExactNumericDataType) dataType).getScale()
-					:
-						-1;
-	}
-
-	public int getLength() {
-		DataType dataType = this.dtpColumn.getDataType();
-		return (dataType instanceof CharacterStringDataType) ?
-						((CharacterStringDataType) dataType).getLength()
-					:
-						-1;
-	}
-
-	public boolean isLOB() {
-		DataType dataType = this.dtpColumn.getDataType();
-		return (dataType instanceof PredefinedDataType) ?
-						primitiveTypeIsLob(((PredefinedDataType) dataType).getPrimitiveType())
-					:
-						false;
-	}
-
-	public String getJavaTypeDeclaration() {
-		return this.getJavaType().declaration();
-	}
-
-	public JavaType getJavaType() {
-		DataType dataType = this.dtpColumn.getDataType();
-		return (dataType instanceof PredefinedDataType) ?
-			convertToJPAJavaType(this.getJavaType((PredefinedDataType) dataType))
-		:
-			DEFAULT_JAVA_TYPE;
-	}
-
-	public String getPrimaryKeyJavaTypeDeclaration() {
-		return this.getPrimaryKeyJavaType().declaration();
-	}
-
-	public JavaType getPrimaryKeyJavaType() {
-		return convertToJPAPrimaryKeyJavaType(this.getJavaType());
-	}
-
-	private JavaType getJavaType(PredefinedDataType dataType) {
-		// this is just a bit hacky: moving from a type declaration to a class name to a type declaration...
-		String dtpJavaClassName = this.getDefinition(dataType).getJavaClassName();
-		return new SimpleJavaType(ClassTools.classNameForTypeDeclaration(dtpJavaClassName));
-	}
-
-	private PredefinedDataTypeDefinition getDefinition(PredefinedDataType dataType) {
-		return this.getDatabase().getDTPDefinition().getPredefinedDataTypeDefinition(dataType.getName());
-	}
-
-
-	// ********** Comparable implementation **********
-
-	public int compareTo(Column column) {
-		return Collator.getInstance().compare(this.getName(), column.getName());
-	}
-
-
-	// ********** internal methods **********
-
-	boolean wraps(org.eclipse.datatools.modelbase.sql.tables.Column column) {
-		return this.dtpColumn == column;
-	}
-
-	@Override
-	void clear() {
-		// no state to clear
-	}
-
-
-	// ********** static methods **********
-
-	/**
-	 * The JDBC spec says JDBC drivers should be able to map BLOBs and CLOBs
-	 * directly, but the JPA spec does not allow them.
-	 */
-	private static JavaType convertToJPAJavaType(JavaType javaType) {
-		if (javaType.equals(BLOB_JAVA_TYPE)) {
-			return BYTE_ARRAY_JAVA_TYPE;
-		}
-		if (javaType.equals(CLOB_JAVA_TYPE)) {
-			return STRING_JAVA_TYPE;
-		}
-		return javaType;
-	}
-
-	/**
-	 * The JPA spec [2.1.4] says only the following types are allowed in
-	 * primary key fields:
-	 *     [variable] primitives
-	 *     [variable] primitive wrappers
-	 *     java.lang.String
-	 *     java.util.Date
-	 *     java.sql.Date
-	 */
-	private static JavaType convertToJPAPrimaryKeyJavaType(JavaType javaType) {
-		if (javaType.isVariablePrimitive()
-				|| javaType.isVariablePrimitiveWrapper()
-				|| javaType.equals(STRING_JAVA_TYPE)
-				|| javaType.equals(UTIL_DATE_JAVA_TYPE)
-				|| javaType.equals(SQL_DATE_JAVA_TYPE)) {
-			return javaType;
-		}
-		if (javaType.equals(BIG_DECIMAL_JAVA_TYPE)) {
-			return LONG_JAVA_TYPE;  // ??
-		}
-		if (javaType.equals(SQL_TIME_JAVA_TYPE)) {
-			return UTIL_DATE_JAVA_TYPE;  // ???
-		}
-		if (javaType.equals(SQL_TIMESTAMP_JAVA_TYPE)) {
-			return UTIL_DATE_JAVA_TYPE;  // ???
-		}
-		// all the other typical types are pretty much un-mappable - return String(?)
-		return STRING_JAVA_TYPE;
-	}
-
-	private static boolean primitiveTypeIsLob(PrimitiveType primitiveType) {
-		return (primitiveType == PrimitiveType.BINARY_LARGE_OBJECT_LITERAL)
-				|| (primitiveType == PrimitiveType.CHARACTER_LARGE_OBJECT_LITERAL)
-				|| (primitiveType == PrimitiveType.NATIONAL_CHARACTER_LARGE_OBJECT_LITERAL);
-	}
-
-
-	// ***** some constants used when converting the column to a Java attribute
-	// TODO Object is the default?
-	private static final JavaType DEFAULT_JAVA_TYPE = new SimpleJavaType(java.lang.Object.class);
-
-	private static final JavaType BLOB_JAVA_TYPE = new SimpleJavaType(java.sql.Blob.class);
-	private static final JavaType BYTE_ARRAY_JAVA_TYPE = new SimpleJavaType(byte[].class);
-
-	private static final JavaType CLOB_JAVA_TYPE = new SimpleJavaType(java.sql.Clob.class);
-	private static final JavaType STRING_JAVA_TYPE = new SimpleJavaType(java.lang.String.class);
-
-	private static final JavaType UTIL_DATE_JAVA_TYPE = new SimpleJavaType(java.util.Date.class);
-	private static final JavaType SQL_DATE_JAVA_TYPE = new SimpleJavaType(java.sql.Date.class);
-	private static final JavaType SQL_TIME_JAVA_TYPE = new SimpleJavaType(java.sql.Time.class);
-	private static final JavaType SQL_TIMESTAMP_JAVA_TYPE = new SimpleJavaType(java.sql.Timestamp.class);
-
-	private static final JavaType BIG_DECIMAL_JAVA_TYPE = new SimpleJavaType(java.math.BigDecimal.class);
-	private static final JavaType LONG_JAVA_TYPE = new SimpleJavaType(long.class);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPConnectionProfileFactory.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPConnectionProfileFactory.java
deleted file mode 100644
index 6e5df2860a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPConnectionProfileFactory.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db.internal;
-
-import java.util.Iterator;
-
-import org.eclipse.datatools.connectivity.IConnectionProfile;
-import org.eclipse.datatools.connectivity.IProfileListener1;
-import org.eclipse.datatools.connectivity.ProfileManager;
-import org.eclipse.jpt.db.ConnectionProfile;
-import org.eclipse.jpt.db.ConnectionProfileFactory;
-import org.eclipse.jpt.db.ConnectionProfileListener;
-import org.eclipse.jpt.db.DatabaseFinder;
-import org.eclipse.jpt.utility.internal.ListenerList;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-
-/**
- * Wrap the DTP ProfileManager in yet another singleton.
- */
-public final class DTPConnectionProfileFactory
-	implements ConnectionProfileFactory
-{
-	private ProfileManager dtpProfileManager;
-
-	private LocalProfileListener profileListener;
-
-
-	// ********** singleton **********
-
-	private static final DTPConnectionProfileFactory INSTANCE = new DTPConnectionProfileFactory();
-
-	public static DTPConnectionProfileFactory instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * 'private' to ensure singleton
-	 */
-	private DTPConnectionProfileFactory() {
-		super();
-	}
-
-
-	// ********** lifecycle **********
-
-	/**
-	 * called by plug-in
-	 */
-	public synchronized void start() {
-		this.dtpProfileManager = ProfileManager.getInstance();
-		this.profileListener = new LocalProfileListener();
-		this.dtpProfileManager.addProfileListener(this.profileListener);
-	}
-
-	/**
-	 * called by plug-in
-	 */
-	public synchronized void stop() {
-		this.dtpProfileManager.removeProfileListener(this.profileListener);
-		this.profileListener = null;
-		this.dtpProfileManager = null;
-	}
-
-
-	// ********** connection profiles **********
-
-	public ConnectionProfile buildConnectionProfile(String name, DatabaseFinder finder) {
-		for (IConnectionProfile dtpProfile : this.dtpProfileManager.getProfiles()) {
-			if (dtpProfile.getName().equals(name)) {
-				return new DTPConnectionProfileWrapper(dtpProfile, finder);
-			}
-		}
-		return null;
-	}
-
-	public ConnectionProfile buildConnectionProfile(String name) {
-		return this.buildConnectionProfile(name, DatabaseFinder.Simple.instance());
-	}
-
-	public Iterator<String> connectionProfileNames() {
-		return new TransformationIterator<IConnectionProfile, String>(this.dtpConnectionProfiles()) {
-			@Override
-			protected String transform(IConnectionProfile dtpProfile) {
-				 return dtpProfile.getName();
-			}
-		};
-	}
-
-	private Iterator<IConnectionProfile> dtpConnectionProfiles() {
-		return new ArrayIterator<IConnectionProfile>(this.dtpProfileManager.getProfiles());
-	}
-
-
-	// ********** listeners **********
-
-	public void addConnectionProfileListener(ConnectionProfileListener listener) {
-		this.profileListener.addConnectionProfileListener(listener);
-	}
-
-	public void removeConnectionProfileListener(ConnectionProfileListener listener) {
-		this.profileListener.removeConnectionProfileListener(listener);
-	}
-
-
-	// ********** listener **********
-
-	/**
-	 * Forward events to the factory's listeners.
-	 */
-	private class LocalProfileListener implements IProfileListener1 {
-		private ListenerList<ConnectionProfileListener> listenerList = new ListenerList<ConnectionProfileListener>(ConnectionProfileListener.class);
-
-		LocalProfileListener() {
-			super();
-		}
-
-		void addConnectionProfileListener(ConnectionProfileListener listener) {
-			this.listenerList.add(listener);
-		}
-
-		void removeConnectionProfileListener(ConnectionProfileListener listener) {
-			this.listenerList.remove(listener);
-		}
-
-		// ********** IProfileListener implementation **********
-
-		public void profileAdded(IConnectionProfile dtpProfile) {
-			String name = dtpProfile.getName();
-			for (ConnectionProfileListener listener : this.listenerList.getListeners()) {
-				listener.connectionProfileAdded(name);
-			}
-		}
-
-		public void profileChanged(IConnectionProfile dtpProfile, String oldName, String oldDescription, Boolean oldAutoConnect) {
-			String newName = dtpProfile.getName();
-			if ( ! newName.equals(oldName)) {
-				for (ConnectionProfileListener listener : this.listenerList.getListeners()) {
-					listener.connectionProfileRenamed(oldName, newName);
-				}
-			}
-		}
-
-		public void profileChanged(IConnectionProfile dtpProfile) {
-			// this method shouldn't be called on IProfileListener1
-			throw new UnsupportedOperationException();
-		}
-
-		public void profileDeleted(IConnectionProfile dtpProfile) {
-			String name = dtpProfile.getName();
-			for (ConnectionProfileListener listener : this.listenerList.getListeners()) {
-				listener.connectionProfileRemoved(name);
-			}
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPConnectionProfileWrapper.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPConnectionProfileWrapper.java
deleted file mode 100644
index 55afabf5c9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPConnectionProfileWrapper.java
+++ /dev/null
@@ -1,557 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db.internal;
-
-import java.text.Collator;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.datatools.connectivity.ConnectEvent;
-import org.eclipse.datatools.connectivity.IConnectionProfile;
-import org.eclipse.datatools.connectivity.IManagedConnection;
-import org.eclipse.datatools.connectivity.IManagedConnectionOfflineListener;
-import org.eclipse.datatools.connectivity.drivers.DriverManager;
-import org.eclipse.datatools.connectivity.drivers.jdbc.IJDBCDriverDefinitionConstants;
-import org.eclipse.datatools.connectivity.sqm.core.connection.ConnectionInfo;
-import org.eclipse.datatools.sqltools.core.DatabaseIdentifier;
-import org.eclipse.datatools.sqltools.core.profile.ProfileUtil;
-import org.eclipse.jpt.db.ConnectionListener;
-import org.eclipse.jpt.db.ConnectionProfile;
-import org.eclipse.jpt.db.DatabaseFinder;
-import org.eclipse.jpt.db.DatabaseObject;
-import org.eclipse.jpt.utility.internal.ListenerList;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- *  Wrap a DTP ConnectionProfile
- */
-final class DTPConnectionProfileWrapper
-	implements DTPDatabaseObject, ConnectionProfile
-{
-	// the wrapped DTP connection profile
-	private final IConnectionProfile dtpConnectionProfile;
-
-	// finder supplied by the JPA platform (determines case-sensitivity, etc.)
-	private final DatabaseFinder finder;
-
-	// callback passed to the finder
-	private final DatabaseFinder.DefaultCallback databaseFinderCallback;
-
-	// the DTP managed connection we listen to
-	private final IManagedConnection dtpManagedConnection;
-
-	// forward events from the DTP managed connection above;
-	// we listen and propagate events iff we have listeners ourselves
-	private final LocalConnectionListener connectionListener;
-
-	// lazy-initialized, and deleted at disconnect
-	private DTPDatabaseWrapper database;
-
-
-	// ********** constants **********
-
-	private static final String LIVE_DTP_CONNECTION_TYPE = "java.sql.Connection";  //$NON-NLS-1$
-
-	private static final String OFFLINE_DTP_CONNECTION_TYPE = ConnectionInfo.class.getName();
-
-	private static final String DATABASE_PRODUCT_PROP_ID = "org.eclipse.datatools.connectivity.server.version";  //$NON-NLS-1$
-
-
-	// ********** constructor **********
-
-	DTPConnectionProfileWrapper(IConnectionProfile dtpConnectionProfile, DatabaseFinder finder) {
-		super();
-		this.dtpConnectionProfile = dtpConnectionProfile;
-		this.finder = finder;
-		this.databaseFinderCallback = new DatabaseFinderCallback();
-		this.dtpManagedConnection = this.buildDTPManagedConnection();
-		this.connectionListener = new LocalConnectionListener();
-		// don't listen to the managed connection yet
-	}
-
-	private IManagedConnection buildDTPManagedConnection() {
-		String connectionType = this.dtpConnectionProfile.supportsWorkOfflineMode() ?
-				OFFLINE_DTP_CONNECTION_TYPE : LIVE_DTP_CONNECTION_TYPE;
-		return this.dtpConnectionProfile.getManagedConnection(connectionType);
-	}
-
-
-	// ********** DatabaseObject implementation **********
-
-	public String getName() {
-		return this.dtpConnectionProfile.getName();
-	}
-
-	public String getIdentifier(String javaIdentifier) {
-		// connection profiles do not have "identifiers"
-		throw new UnsupportedOperationException();
-	}
-
-	public String getIdentifier() {
-		// connection profiles do not have "identifiers"
-		throw new UnsupportedOperationException();
-	}
-
-
-	// ********** DTPDatabaseObject implementation **********
-
-	public DTPConnectionProfileWrapper getConnectionProfile() {
-		return this;
-	}
-
-	public synchronized DTPDatabaseWrapper getDatabase() {
-		if (this.database == null) {
-			this.database = this.buildDatabase();
-		}
-		return this.database;
-	}
-
-
-	// ********** ConnectionProfile implementation **********
-
-	// ***** properties
-	public String getProviderID() {
-		return this.dtpConnectionProfile.getProviderId();
-	}
-
-	public String getInstanceID() {
-		return this.dtpConnectionProfile.getInstanceID();
-	}
-
-	public String getDatabaseName() {
-		return this.getProperty(IJDBCDriverDefinitionConstants.DATABASE_NAME_PROP_ID);
-	}
-
-	public String getDatabaseProduct() {
-		return this.getProperty(DATABASE_PRODUCT_PROP_ID);
-	}
-
-	public String getDatabaseVendor() {
-		return this.getProperty(IJDBCDriverDefinitionConstants.DATABASE_VENDOR_PROP_ID);
-	}
-
-	public String getDatabaseVersion() {
-		return this.getProperty(IJDBCDriverDefinitionConstants.DATABASE_VERSION_PROP_ID);
-	}
-
-	public String getDriverClassName() {
-		return this.getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID);
-	}
-
-	public String getURL() {
-		return this.getProperty(IJDBCDriverDefinitionConstants.URL_PROP_ID);
-	}
-
-	/**
-	 * Returns the user name.
-	 * Allows user name composed by more than one word.
-	 * If the user name contains a keyword, it returns the first word only.
-	 */
-	public String getUserName() {
-		String userName = this.getProperty(IJDBCDriverDefinitionConstants.USERNAME_PROP_ID);
-		userName = userName.trim(); 
-		String[] names =  userName.split("\\s+");	//$NON-NLS-1$
-		if(names.length == 3) { // 208946 handle username like "sys as sysdba" on Oracle
-		    if(this.nameIsKeyword(names[1])) {
-		    	return names[0];
-		    }
-		}
-		return userName;
-	}
-
-	public String getUserPassword() {
-		return this.getProperty(IJDBCDriverDefinitionConstants.PASSWORD_PROP_ID);
-	}
-
-	public String getDriverDefinitionID() {
-		return this.getProperty(DRIVER_DEFINITION_PROP_ID);
-	}
-
-	public String getDriverJarList() {
-		return DriverManager.getInstance().getDriverInstanceByID(this.getDriverDefinitionID()).getJarList();
-	}
-
-	public String getDriverName() {
-		return DriverManager.getInstance().getDriverInstanceByID(this.getDriverDefinitionID()).getName();
-	}
-
-	// ***** connection
-	public boolean isActive() {
-		return this.isConnected() || this.isWorkingOffline();
-	}
-
-	public boolean isInactive() {
-		return ! this.isActive();
-	}
-
-	public boolean isConnected() {
-		return this.dtpManagedConnection.isConnected()
-				&& ! this.dtpManagedConnection.isWorkingOffline();
-	}
-
-	public boolean isDisconnected() {
-		return ! this.isConnected();
-	}
-
-	public void connect() {
-		if (this.isDisconnected()) {
-			this.checkStatus(this.dtpConnectionProfile.connect());
-		}
-	}
-	
-	public void disconnect() {
-		this.checkStatus(this.dtpConnectionProfile.disconnect());
-	}
-
-	// ***** off-line support
-	public boolean isWorkingOffline() {
-		return this.dtpManagedConnection.isWorkingOffline();
-	}
-
-	public boolean supportsWorkOfflineMode() {
-		return this.dtpConnectionProfile.supportsWorkOfflineMode();
-	}
-
-	public IStatus saveWorkOfflineData() {
-		return this.dtpConnectionProfile.saveWorkOfflineData();
-	}
-	
-	public boolean canWorkOffline() {
-		return this.dtpConnectionProfile.canWorkOffline();
-	}
-
-	public IStatus workOffline() {
-		return this.dtpConnectionProfile.workOffline();
-	}
-	
-	// ***** listeners
-	public synchronized void addConnectionListener(ConnectionListener listener) {
-		if (this.hasNoListeners()) {  // first listener added
-			this.startListening();
-		}
-		this.connectionListener.addConnectionListener(listener);
-	}
-
-	private void startListening() {
-		this.dtpManagedConnection.addConnectionListener(this.connectionListener);
-		if (this.database != null) {  // don't trigger database creation
-			if (this.isConnected()) {  // DTP does not change when off-line
-				this.database.startListening();
-			}
-		}
-	}
-
-	public synchronized void removeConnectionListener(ConnectionListener listener) {
-		this.connectionListener.removeConnectionListener(listener);
-		if (this.hasNoListeners()) {  // last listener removed
-			this.stopListening();
-		}
-	}
-
-	private void stopListening() {
-		if (this.database != null) {  // don't trigger database creation
-			if (this.isConnected()) {  // DTP does not change when off-line
-				this.database.stopListening();
-			}
-		}
-		this.dtpManagedConnection.removeConnectionListener(this.connectionListener);
-	}
-
-	boolean hasNoListeners() {
-		return this.connectionListener.hasNoListeners();
-	}
-
-	boolean hasAnyListeners() {
-		return this.connectionListener.hasAnyListeners();
-	}
-
-
-	// ********** internal methods **********
-
-	private void checkStatus(IStatus status) {
-		if (status.isOK()) {
-			return;
-		}
-		if (status.isMultiStatus()) {
-			for (IStatus child : status.getChildren()) {
-				this.checkStatus(child);  // recurse, looking for the first error
-			}
-		}
-		throw new RuntimeException(status.getMessage(), status.getException());
-	}
-
-	private DTPDatabaseWrapper buildDatabase() {
-		if (this.isInactive()) {
-			return null;
-		}
-
-		if (this.isWorkingOffline()) {
-			ConnectionInfo connectionInfo = (ConnectionInfo) this.dtpManagedConnection.getConnection().getRawConnection();
-			return new DTPDatabaseWrapper(this, connectionInfo.getSharedDatabase());
-		}
-
-		// TODO see DTP bug 202306
-		// pass connect=true in to ProfileUtil.getDatabase()
-		// there is a bug mentioned in a comment: 
-		//     "during the profile connected event notification, 
-		//     IManagedConnection is connected while IConnectionProfile is not"
-		// so, some hackery here to handle hackery there
-		return new DTPDatabaseWrapper(this, ProfileUtil.getDatabase(new DatabaseIdentifier(this.getName(), this.getDatabaseName()), true));
-	}
-
-	synchronized void clearDatabase() {
-		if (this.database != null) {
-			if (this.isConnected()) {  // DTP does not change when off-line
-				this.database.stopListening();
-			}
-			this.database = null;
-		}
-	}
-
-	/**
-	 * This is called whenever we need to find a component by identifier
-	 * (e.g. Table.getColumnForIdentifier(String)). We channel all the calls to here
-	 * and then we delegate to the JPA platform-supplied "database finder".
-	 */
-	<T extends DatabaseObject> T selectDatabaseObjectForIdentifier(T[] databaseObjects, String identifier) {
-		return this.finder.selectDatabaseObjectForIdentifier(databaseObjects, identifier, this.databaseFinderCallback);
-	}
-
-	/**
-	 * The default "database finder" calls back to here so we can delegate to
-	 * the database, which contains all the information necessary to properly
-	 * match identifiers.
-	 */
-	<T extends DatabaseObject> T selectDatabaseObjectForIdentifier_(T[] databaseObjects, String identifier) {
-		// the database should not be null here - call its internal method
-		return this.database.selectDatabaseObjectForIdentifier_(databaseObjects, identifier);
-	}
-
-	void databaseChanged(DTPDatabaseWrapper db) {
-		this.connectionListener.databaseChanged(db);
-	}
-
-	void catalogChanged(DTPCatalogWrapper catalog) {
-		this.connectionListener.catalogChanged(catalog);
-	}
-
-	void schemaChanged(DTPSchemaWrapper schema) {
-		this.connectionListener.schemaChanged(schema);
-	}
-
-	void sequenceChanged(DTPSequenceWrapper sequence) {
-		this.connectionListener.sequenceChanged(sequence);
-	}
-
-	void tableChanged(DTPTableWrapper table) {
-		this.connectionListener.tableChanged(table);
-	}
-
-	void columnChanged(DTPColumnWrapper column) {
-		this.connectionListener.columnChanged(column);
-	}
-
-	void foreignKeyChanged(DTPForeignKeyWrapper foreignKey) {
-		this.connectionListener.foreignKeyChanged(foreignKey);
-	}
-
-	private String getProperty(String propertyName) {
-		return this.dtpConnectionProfile.getBaseProperties().getProperty(propertyName);
-	}
-
-	private boolean nameIsKeyword(String name) {
-		return name.equalsIgnoreCase("as");  //$NON-NLS-1$
-	}
-
-
-	// ********** Comparable implementation **********
-
-	public int compareTo(ConnectionProfile connectionProfile) {
-		return Collator.getInstance().compare(this.getName(), connectionProfile.getName());
-	}
-
-
-	// ********** overrides **********
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.getName());
-	}
-
-
-	// ********** DTP connection listener **********
-
-	/**
-	 * This listener translates and forwards IManagedConnectionListener and
-	 * IManagedConnectionOfflineListener events to ConnectionListeners.
-	 */
-	class LocalConnectionListener implements IManagedConnectionOfflineListener {
-		private ListenerList<ConnectionListener> listenerList = new ListenerList<ConnectionListener>(ConnectionListener.class);
-
-		LocalConnectionListener() {
-			super();
-		}
-
-		void addConnectionListener(ConnectionListener listener) {
-			this.listenerList.add(listener);
-		}
-
-		void removeConnectionListener(ConnectionListener listener) {
-			this.listenerList.remove(listener);
-		}
-
-		boolean hasNoListeners() {
-			return this.listenerList.isEmpty();
-		}
-
-		boolean hasAnyListeners() {
-			return ! this.listenerList.isEmpty();
-		}
-
-
-		// ********** IManagedConnectionListener implementation **********
-
-		// off-line or inactive => live
-		public void opened(ConnectEvent event) {
-			// do not build the database here - it is built on-demand
-			// forward event to listeners
-			for (ConnectionListener listener : this.listenerList.getListeners()) {
-				listener.opened(DTPConnectionProfileWrapper.this);
-			}
-		}
-
-		/**
-		 * This method is never called from the base DTP code.
-		 * Perhaps DTP extenders call it....
-		 * @see ManagedConnection#fireModifiedEvent(Object)
-		 *     which is never called...
-		 */
-		public void modified(ConnectEvent event) {
-			// forward event to listeners
-			for (ConnectionListener listener : this.listenerList.getListeners()) {
-				listener.modified(DTPConnectionProfileWrapper.this);
-			}
-		}
-
-		public boolean okToClose(ConnectEvent event) {
-			// forward event to listeners
-			for (ConnectionListener listener : this.listenerList.getListeners()) {
-				if ( ! listener.okToClose(DTPConnectionProfileWrapper.this)) {
-					return false;
-				}
-			}
-			return true;
-		}
-
-		public void aboutToClose(ConnectEvent event) {
-			// forward event to listeners
-			for (ConnectionListener listener : this.listenerList.getListeners()) {
-				listener.aboutToClose(DTPConnectionProfileWrapper.this);
-			}
-		}
-
-		// live or off-line => inactive
-		public void closed(ConnectEvent event) {
-			// clear the database
-			DTPConnectionProfileWrapper.this.clearDatabase();
-			// forward event to listeners
-			for (ConnectionListener listener : this.listenerList.getListeners()) {
-				listener.closed(DTPConnectionProfileWrapper.this);
-			}
-		}
-
-
-		// ********** IManagedConnectionOfflineListener implementation **********
-
-		// live => off-line
-		public boolean okToDetach(ConnectEvent event) {
-			// convert the event to an "ok to close" event;
-			// we are "closing" the live connection
-			return this.okToClose(event);
-		}
-		
-		// live => off-line
-		public void aboutToDetach(ConnectEvent event) {
-			// convert the event to a "close" event;
-			// we are "closing" the live connection
-			this.closed(event);
-		}
-
-		// inactive or live => off-line
-		public void workingOffline(ConnectEvent event) {
-			// convert the event to an "open" event;
-			// we are "opening" the off-line connection
-			this.opened(event);
-		}
-
-		// off-line => live
-		public void aboutToAttach(ConnectEvent event) {
-			// convert the event to an "close" event;
-			// we are "closing" the off-line connection
-			this.closed(event);
-		}
-
-
-		// ********** internal methods **********
-
-		void databaseChanged(DTPDatabaseWrapper db) {
-			for (ConnectionListener listener : this.listenerList.getListeners()) {
-				listener.databaseChanged(DTPConnectionProfileWrapper.this, db);
-			}
-		}
-
-		void catalogChanged(DTPCatalogWrapper catalog) {
-			for (ConnectionListener listener : this.listenerList.getListeners()) {
-				listener.catalogChanged(DTPConnectionProfileWrapper.this, catalog);
-			}
-		}
-
-		void schemaChanged(DTPSchemaWrapper schema) {
-			for (ConnectionListener listener : this.listenerList.getListeners()) {
-				listener.schemaChanged(DTPConnectionProfileWrapper.this, schema);
-			}
-		}
-
-		void sequenceChanged(DTPSequenceWrapper sequence) {
-			for (ConnectionListener listener : this.listenerList.getListeners()) {
-				listener.sequenceChanged(DTPConnectionProfileWrapper.this, sequence);
-			}
-		}
-
-		void tableChanged(DTPTableWrapper table) {
-			for (ConnectionListener listener : this.listenerList.getListeners()) {
-				listener.tableChanged(DTPConnectionProfileWrapper.this, table);
-			}
-		}
-
-		void columnChanged(DTPColumnWrapper column) {
-			for (ConnectionListener listener : this.listenerList.getListeners()) {
-				listener.columnChanged(DTPConnectionProfileWrapper.this, column);
-			}
-		}
-
-		void foreignKeyChanged(DTPForeignKeyWrapper foreignKey) {
-			for (ConnectionListener listener : this.listenerList.getListeners()) {
-				listener.foreignKeyChanged(DTPConnectionProfileWrapper.this, foreignKey);
-			}
-		}
-
-	}
-
-
-	// ********** default DatabaseFinder **********
-
-	class DatabaseFinderCallback implements DatabaseFinder.DefaultCallback {
-		public <T extends DatabaseObject> T selectDatabaseObjectForIdentifier(T[] databaseObjects, String identifier) {
-			// call back to the internal method
-			return DTPConnectionProfileWrapper.this.selectDatabaseObjectForIdentifier_(databaseObjects, identifier);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPDatabaseObject.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPDatabaseObject.java
deleted file mode 100644
index c976fe4b39..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPDatabaseObject.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db.internal;
-
-import org.eclipse.jpt.db.DatabaseObject;
-
-/**
- * DTP database object
- */
-public interface DTPDatabaseObject extends DatabaseObject {
-
-	/**
-	 * covariant override
-	 */
-	DTPConnectionProfileWrapper getConnectionProfile();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPDatabaseObjectWrapper.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPDatabaseObjectWrapper.java
deleted file mode 100644
index 86d2d2cce3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPDatabaseObjectWrapper.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 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.db.internal;
-
-import org.eclipse.datatools.connectivity.sqm.core.rte.ICatalogObject;
-import org.eclipse.datatools.connectivity.sqm.core.rte.ICatalogObjectListener;
-import org.eclipse.datatools.connectivity.sqm.core.rte.RefreshManager;
-import org.eclipse.jpt.db.DatabaseObject;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- *  DTP Catalog Object Wrapper base class
- */
-abstract class DTPDatabaseObjectWrapper
-	implements DTPDatabaseObject
-{
-	// we need a way to get to the connection profile
-	private final DTPDatabaseObject parent;
-
-	// listen for the "catalog object" being refreshed
-	private final ICatalogObjectListener catalogObjectListener;
-
-	// listen for this DTP catalog object to refresh
-	final ICatalogObject catalogObject;
-
-
-	// ********** construction/initialization **********
-
-	DTPDatabaseObjectWrapper(DTPDatabaseObject parent, Object dtpObject) {
-		super();
-		this.parent = parent;
-		if (this.getConnectionProfile().isConnected()) {
-			// we only listen to "live" connections (as opposed to "off-line" connections);
-			// and the model is rebuilt when the connection connects or disconnects
-			this.catalogObject = (ICatalogObject) dtpObject;
-			this.catalogObjectListener = this.buildCatalogObjectListener();
-			if (this.getConnectionProfile().hasAnyListeners()) {
-				this.startListening();
-			}
-		} else {
-			this.catalogObject = null;
-			this.catalogObjectListener = null;
-		}
-	}
-
-	private ICatalogObjectListener buildCatalogObjectListener() {
-		return new ICatalogObjectListener() {
-			public void notifyChanged(ICatalogObject dmElement, int eventType) {
-				if (dmElement == DTPDatabaseObjectWrapper.this.catalogObject) {
-					// 'eventType' doesn't seem to be very useful, so drop it
-					DTPDatabaseObjectWrapper.this.catalogObjectChanged();
-				}
-			}
-		};
-	}
-
-	// typically, notify the connection profile something has changed
-	void catalogObjectChanged() {
-		this.clear();
-	}
-
-	/**
-	 * The DTP object has changed, clear the wrapper's state so it will be
-	 * synchronized on-demand.
-	 */
-	abstract void clear();
-
-
-
-	// ********** queries **********
-
-	DTPDatabaseObject getParent() {
-		return this.parent;
-	}
-
-	public DTPConnectionProfileWrapper getConnectionProfile() {
-		return this.parent.getConnectionProfile();
-	}
-
-	public DTPDatabaseWrapper getDatabase() {
-		return this.getConnectionProfile().getDatabase();
-	}
-
-	/**
-	 * This is called by whenever we need to find a component by identifier
-	 * (e.g. Table.getColumnForIdentifier(String)). We channel all the calls to the
-	 * connection profile, which then delegates to the JPA platform-supplied
-	 * "database finder".
-	 */
-	<T extends DatabaseObject> T selectDatabaseObjectForIdentifier(T[] databaseObjects, String identifier) {
-		return this.getConnectionProfile().selectDatabaseObjectForIdentifier(databaseObjects, identifier);
-	}
-
-	/**
-	 * Convenience method.
-	 */
-	<T extends DatabaseObject> T selectDatabaseObjectNamed(T[] databaseObjects, String name) {
-		for (T dbObject : databaseObjects) {
-			if (dbObject.getName().equals(name)) {
-				return dbObject;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Examples:
-	 * Oracle etc.
-	 *     Table(FOO) vs. "Foo" => null
-	 *     Table(BAR) vs. "Foo" => "BAR"
-	 *     Table(Foo) vs. "Foo" => "\"Foo\""
-	 *     Table(Bar) vs. "Foo" => "\"Bar\""
-	 *     
-	 * PostgreSQL etc.
-	 *     Table(foo) vs. "Foo" => null
-	 *     Table(bar) vs. "Foo" => "bar"
-	 *     Table(Foo) vs. "Foo" => "\"Foo\""
-	 *     Table(Bar) vs. "Foo" => "\"Bar\""
-	 *     
-	 * SQL Server etc.
-	 *     Table(Foo) vs. "Foo" => null
-	 *     Table(foo) vs. "Foo" => "foo"
-	 *     Table(bar) vs. "Foo" => "bar"
-	 *     Table(Bar) vs. "Foo" => "Bar"
-	 */
-	public String getIdentifier(String defaultName) {
-		return this.getDatabase().convertNameToIdentifier(this.getName(), defaultName);
-	}
-
-	/**
-	 * Examples:
-	 * Oracle etc.
-	 *     Table(FOO) => "FOO"
-	 *     Table(Foo) => "\"Foo\""
-	 *     Table(foo) => "\"foo\""
-	 *     Table(foo++) => "\"foo++\""
-	 *     Table(f"o) => "\"f\"\"o++\"" (i.e. "f""o")
-	 *     
-	 * PostgreSQL etc.
-	 *     Table(FOO) => "\"FOO\""
-	 *     Table(Foo) => "\"Foo\""
-	 *     Table(foo) => "foo"
-	 *     Table(foo++) => "\"foo++\""
-	 *     Table(f"o) => "\"f\"\"o++\"" (i.e. "f""o")
-	 *     
-	 * SQL Server etc.
-	 *     Table(FOO) => "FOO"
-	 *     Table(Foo) => "Foo"
-	 *     Table(foo) => "foo"
-	 *     Table(foo++) => "\"foo++\""
-	 *     Table(f"o) => "\"f\"\"o++\"" (i.e. "f""o")
-	 */
-	public String getIdentifier() {
-		return this.getDatabase().convertNameToIdentifier(this.getName());
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.getName());
-	}
-
-
-	// ********** listening to DTP database object **********
-
-	// this should only be called when the connection profile is "live" and has listeners
-	void startListening() {
-		this.checkListener();
-		RefreshManager.getInstance().AddListener(this.catalogObject, this.catalogObjectListener);
-	}
-
-	// this should only be called when the connection profile is "live" and has no listeners
-	void stopListening() {
-		this.checkListener();
-        RefreshManager.getInstance().removeListener(this.catalogObject, this.catalogObjectListener);
-	}
-
-	private void checkListener() {
-		if (this.catalogObjectListener == null) {
-			throw new IllegalStateException("the catalog listener is null");  //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPDatabaseWrapper.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPDatabaseWrapper.java
deleted file mode 100644
index 71f7dc4f35..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPDatabaseWrapper.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 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.db.internal;
-
-import java.text.Collator;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.datatools.connectivity.sqm.core.definition.DatabaseDefinition;
-import org.eclipse.datatools.connectivity.sqm.internal.core.RDBCorePlugin;
-import org.eclipse.jpt.db.Catalog;
-import org.eclipse.jpt.db.Database;
-import org.eclipse.jpt.db.DatabaseObject;
-import org.eclipse.jpt.db.internal.vendor.Vendor;
-import org.eclipse.jpt.db.internal.vendor.VendorRepository;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-
-/**
- * Wrap a DTP Database.
- * 
- * Catalogs vs. Schemata:
- * Typically, if a DTP database does not support "catalogs",
- * o.e.datatools.modelbase.sql.schema.Database#getCatalogs() will return a
- * single catalog without a name (actually, it's an empty string). This catalog
- * will contain all the database's schemata. We try to ignore this catalog and
- * return the schemata from the database directly.
- * 
- * Catalog Note 1:
- * As of Jan 2009, the DTP MySQL driver is not consistent with this pattern.
- * A DTP MySQL database has *no* catalogs; it holds a single schema
- * directly, and that schema has the same name as the database. See bug 249013.
- * 
- * Catalog Note 2:
- * As of Jan 2009, the PostgreSQL JDBC driver complicates this pattern a bit.
- * Even though PostgreSQL does not support "catalogs", its JDBC driver
- * returns a single catalog that has the same name as the database specified
- * in the JDBC connection URL. The DTP PostgreSQL driver simply replicates this
- * behavior. Unfortunately, this catalog can be unnamed; i.e. its name is an
- * empty string....
- * 
- * (Yet Another) Note:
- * We use "name" when dealing with the unmodified name of a database object
- * as supplied by the database itself (i.e. it is not delimited and it is always
- * case-sensitive).
- * We use "identifier" when dealing with a string representation of a database
- * object name (i.e. it may be delimited and, depending on the vendor, it may
- * be case-insensitive).
- */
-final class DTPDatabaseWrapper
-	extends DTPSchemaContainerWrapper
-	implements Database
-{
-	// the wrapped DTP database
-	private final org.eclipse.datatools.modelbase.sql.schema.Database dtpDatabase;
-
-	// vendor-specific behavior
-	private final Vendor vendor;
-
-	// lazy-initialized, sorted
-	private DTPCatalogWrapper[] catalogs;
-
-
-	// ********** constructor **********
-
-	DTPDatabaseWrapper(DTPConnectionProfileWrapper connectionProfile, org.eclipse.datatools.modelbase.sql.schema.Database dtpDatabase) {
-		super(connectionProfile, dtpDatabase);
-		this.dtpDatabase = dtpDatabase;
-		this.vendor = VendorRepository.instance().getVendor(this.getVendorName());
-	}
-
-
-	// ********** DTPWrapper implementation **********
-
-	/* TODO
-	 * We might want to listen to the "virtual" catalog; but that's probably
-	 * not necessary since there is not easy way for the user to refresh it
-	 * (i.e. it is not displayed in the DTP UI).
-	 */
-	@Override
-	synchronized void catalogObjectChanged() {
-		super.catalogObjectChanged();
-		this.getConnectionProfile().databaseChanged(this);
-	}
-
-	@Override
-	public DTPDatabaseWrapper getDatabase() {
-		return this;
-	}
-
-
-	// ********** DTPSchemaContainerWrapper implementation **********
-
-	@Override
-	List<org.eclipse.datatools.modelbase.sql.schema.Schema> getDTPSchemata() {
-		return this.vendor.getSchemas(this.dtpDatabase);
-	}
-
-	@Override
-	DTPSchemaWrapper getSchema(org.eclipse.datatools.modelbase.sql.schema.Schema dtpSchema) {
-		return this.getSchema_(dtpSchema);
-	}
-
-	DTPSchemaWrapper getSchemaFromCatalogs(org.eclipse.datatools.modelbase.sql.schema.Schema dtpSchema) {
-		return this.getCatalog(dtpSchema.getCatalog()).getSchema_(dtpSchema);
-	}
-
-	/**
-	 * this is only called from a schema when the database is the schema
-	 * container, so we know we don't have any catalogs
-	 */
-	@Override
-	DTPTableWrapper getTable(org.eclipse.datatools.modelbase.sql.tables.Table dtpTable) {
-		return this.getTable_(dtpTable);
-	}
-
-	/**
-	 * this is only called from a catalog, so we know we have catalogs;
-	 * i.e. the search has to descend through catalogs, then to schemata
-	 */
-	DTPTableWrapper getTableFromCatalogs(org.eclipse.datatools.modelbase.sql.tables.Table dtpTable) {
-		return this.getCatalog(dtpTable.getSchema().getCatalog()).getTable_(dtpTable);
-	}
-
-	/**
-	 * this is only called from a schema when the database is the schema
-	 * container, so we know we don't have any catalogs
-	 */
-	@Override
-	DTPColumnWrapper getColumn(org.eclipse.datatools.modelbase.sql.tables.Column dtpColumn) {
-		return this.getColumn_(dtpColumn);
-	}
-
-	/**
-	 * this is only called from a catalog, so we know we have catalogs;
-	 * i.e. the search has to descend through catalogs, then to schemata
-	 */
-	DTPColumnWrapper getColumnFromCatalogs(org.eclipse.datatools.modelbase.sql.tables.Column dtpColumn) {
-		return this.getCatalog(dtpColumn.getTable().getSchema().getCatalog()).getColumn_(dtpColumn);
-	}
-
-
-	// ********** DatabaseObject implementation **********
-
-	public String getName() {
-		return this.dtpDatabase.getName();
-	}
-
-
-	// ********** Database implementation **********
-
-	public String getVendorName() {
-		return this.dtpDatabase.getVendor();
-	}
-
-	public String getVersion() {
-		return this.dtpDatabase.getVersion();
-	}
-
-	// override to make method public since it's in the Database interface
-	@Override
-	public <T extends DatabaseObject> T selectDatabaseObjectForIdentifier(T[] databaseObjects, String identifier) {
-		return super.selectDatabaseObjectForIdentifier(databaseObjects, identifier);
-	}
-
-	// ***** catalogs
-
-	public boolean supportsCatalogs() {
-		return this.vendor.supportsCatalogs(this.dtpDatabase);
-	}
-
-	public Iterator<Catalog> catalogs() {
-		return new ArrayIterator<Catalog>(this.getCatalogs());
-	}
-
-	private Iterator<DTPCatalogWrapper> catalogWrappers() {
-		return new ArrayIterator<DTPCatalogWrapper>(this.getCatalogs());
-	}
-
-	private synchronized DTPCatalogWrapper[] getCatalogs() {
-		if (this.catalogs == null) {
-			this.catalogs = this.buildCatalogs();
-		}
-		return this.catalogs;
-	}
-
-	private DTPCatalogWrapper[] buildCatalogs() {
-		List<org.eclipse.datatools.modelbase.sql.schema.Catalog> dtpCatalogs = this.getDTPCatalogs();
-		DTPCatalogWrapper[] result = new DTPCatalogWrapper[dtpCatalogs.size()];
-		for (int i = result.length; i-- > 0;) {
-			result[i] = new DTPCatalogWrapper(this, dtpCatalogs.get(i));
-		}
-		return CollectionTools.sort(result);
-	}
-
-	private List<org.eclipse.datatools.modelbase.sql.schema.Catalog> getDTPCatalogs() {
-		return this.vendor.getCatalogs(this.dtpDatabase);
-	}
-
-	public int catalogsSize() {
-		return this.getCatalogs().length;
-	}
-
-	/**
-	 * return the catalog for the specified DTP catalog
-	 */
-	DTPCatalogWrapper getCatalog(org.eclipse.datatools.modelbase.sql.schema.Catalog dtpCatalog) {
-		for (DTPCatalogWrapper catalog : this.getCatalogs()) {
-			if (catalog.wraps(dtpCatalog)) {
-				return catalog;
-			}
-		}
-		throw new IllegalArgumentException("invalid DTP catalog: " + dtpCatalog);  //$NON-NLS-1$
-	}
-
-	public DTPCatalogWrapper getCatalogNamed(String name) {
-		return this.selectDatabaseObjectNamed(this.getCatalogs(), name);
-	}
-
-	public Iterator<String> sortedCatalogIdentifiers() {
-		// the catalogs are already sorted
-		return new TransformationIterator<DTPCatalogWrapper, String>(this.catalogWrappers()) {
-			@Override
-			protected String transform(DTPCatalogWrapper next) {
-				 return next.getIdentifier();
-			}
-		};
-	}
-
-	public DTPCatalogWrapper getCatalogForIdentifier(String identifier) {
-		return this.selectDatabaseObjectForIdentifier(this.getCatalogs(), identifier);
-	}
-
-	public synchronized DTPCatalogWrapper getDefaultCatalog() {
-		return this.getCatalogForIdentifiers(this.getDefaultCatalogIdentifiers());
-	}
-
-	private List<String> getDefaultCatalogIdentifiers() {
-		return this.vendor.getDefaultCatalogIdentifiers(this.dtpDatabase, this.getConnectionProfile().getUserName());
-	}
-
-	/**
-	 * Return the first catalog found.
-	 */
-	private DTPCatalogWrapper getCatalogForIdentifiers(List<String> identifiers) {
-		for (String identifier : identifiers) {
-			DTPCatalogWrapper catalog = this.getCatalogForIdentifier(identifier);
-			if (catalog != null) {
-				return catalog;
-			}
-		}
-		return null;
-	}
-
-	// ***** schemata
-
-	List<String> getDefaultSchemaIdentifiers() {
-		return this.vendor.getDefaultSchemaIdentifiers(this.dtpDatabase, this.getConnectionProfile().getUserName());
-	}
-
-
-	// ********** names vs. identifiers **********
-
-	/**
-	 * Convert the specified name to an identifier. Return null if the resulting
-	 * identifier matches the specified default name.
-	 */
-	String convertNameToIdentifier(String name, String defaultName) {
-		return this.vendor.convertNameToIdentifier(name, defaultName);
-	}
-
-	/**
-	 * Convert the specified name to an identifier.
-	 */
-	public String convertNameToIdentifier(String name) {
-		return this.vendor.convertNameToIdentifier(name);
-	}
-
-	/**
-	 * Return the database object identified by the specified identifier. If
-	 * the identifier is "delimited" (typically with double-quotes), it will be
-	 * used without any folding. If the name is "normal" (i.e. not delimited),
-	 * it will be folded to the appropriate case (typically uppercase).
-	 * 
-	 * Since the database has the appropriate state to compare identifiers and
-	 * names, the connection profile delegates to here when using the default
-	 * "database finder".
-	 */
-	<T extends DatabaseObject> T selectDatabaseObjectForIdentifier_(T[] databaseObjects, String identifier) {
-		return this.selectDatabaseObjectNamed(databaseObjects, this.convertIdentifierToName(identifier));
-	}
-
-	/**
-	 * Convert the specified identifier to a name.
-	 */
-	String convertIdentifierToName(String identifier) {
-		return this.vendor.convertIdentifierToName(identifier);
-	}
-
-
-	// ********** Comparable implementation **********
-
-	public int compareTo(Database database) {
-		return Collator.getInstance().compare(this.getName(), database.getName());
-	}
-
-
-	// ********** internal methods **********
-
-	DatabaseDefinition getDTPDefinition() {
-		return RDBCorePlugin.getDefault().getDatabaseDefinitionRegistry().getDefinition(this.dtpDatabase);
-	}
-
-
-	// ********** listening **********
-
-	@Override
-	synchronized void startListening() {
-		if (this.catalogs != null) {
-			this.startCatalogs();
-		}
-		super.startListening();
-	}
-
-	private void startCatalogs() {
-		for (DTPCatalogWrapper catalog : this.catalogs) {
-			catalog.startListening();
-		}
-	}
-
-	@Override
-	synchronized void stopListening() {
-		if (this.catalogs != null) {
-			this.stopCatalogs();
-		}
-		super.stopListening();
-	}
-
-	private void stopCatalogs() {
-		for (DTPCatalogWrapper catalog : this.catalogs) {
-			catalog.stopListening();
-		}
-	}
-
-
-	// ********** clear **********
-
-	@Override
-	void clear() {
-		if (this.catalogs != null) {
-			this.clearCatalogs();
-		}
-		super.clear();
-	}
-
-	private void clearCatalogs() {
-		this.stopCatalogs();
-		for (DTPCatalogWrapper catalog : this.catalogs) {
-			catalog.clear();
-		}
-		this.catalogs = null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPForeignKeyWrapper.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPForeignKeyWrapper.java
deleted file mode 100644
index 10e9df6dd2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPForeignKeyWrapper.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db.internal;
-
-import java.text.Collator;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.db.ForeignKey;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-
-/**
- *  Wrap a DTP ForeignKey
- */
-final class DTPForeignKeyWrapper
-	extends DTPDatabaseObjectWrapper
-	implements ForeignKey
-{
-	// the wrapped DTP foreign key
-	private final org.eclipse.datatools.modelbase.sql.constraints.ForeignKey dtpForeignKey;
-
-	// lazy-initialized
-	private DTPTableWrapper referencedTable;
-
-	// lazy-initialized
-	private LocalColumnPair[] columnPairs;
-
-	// lazy-initialized - but it can be 'null' so we use a flag
-	private String defaultAttributeName;
-	private boolean defaultAttributeNameCalculated = false;
-
-
-	// ********** constructor **********
-
-	DTPForeignKeyWrapper(DTPTableWrapper baseTable, org.eclipse.datatools.modelbase.sql.constraints.ForeignKey dtpForeignKey) {
-		super(baseTable, dtpForeignKey);
-		this.dtpForeignKey = dtpForeignKey;
-	}
-
-
-	// ********** DTPWrapper implementation **********
-
-	@Override
-	synchronized void catalogObjectChanged() {
-		super.catalogObjectChanged();
-		this.getConnectionProfile().foreignKeyChanged(this);
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.getName() + ": " + Arrays.asList(this.getColumnPairs()));  //$NON-NLS-1$
-	}
-
-
-	// ********** ForeignKey implementation **********
-
-	public String getName() {
-		return this.dtpForeignKey.getName();
-	}
-
-	public DTPTableWrapper getBaseTable() {
-		return (DTPTableWrapper) this.getParent();
-	}
-
-	public synchronized DTPTableWrapper getReferencedTable() {
-		if (this.referencedTable == null) {
-			this.referencedTable = this.getBaseTable().getTable(this.dtpForeignKey.getUniqueConstraint().getBaseTable());
-		}
-		return this.referencedTable;
-	}
-
-	public boolean referencesSingleColumnPrimaryKey() {
-		if (this.columnPairsSize() != 1) {
-			return false;
-		}
-		if (this.getReferencedTable().primaryKeyColumnsSize() != 1) {
-			return false;
-		}
-		return this.getColumnPair().getReferencedColumn() == this.getReferencedTable().getPrimaryKeyColumn();
-	}
-
-	// ***** column pairs
-
-	public Iterator<ColumnPair> columnPairs() {
-		return new ArrayIterator<ColumnPair>(this.getColumnPairs());
-	}
-
-	public LocalColumnPair getColumnPair() {
-		LocalColumnPair[] pairs = this.getColumnPairs();
-		if (pairs.length != 1) {
-			throw new IllegalStateException("multiple column pairs: " + pairs.length);  //$NON-NLS-1$
-		}
-		return pairs[0];
-	}
-
-	private Iterator<LocalColumnPair> localColumnPairs() {
-		return new ArrayIterator<LocalColumnPair>(this.getColumnPairs());
-	}
-
-	private synchronized LocalColumnPair[] getColumnPairs() {
-		if (this.columnPairs == null) {
-			this.columnPairs = this.buildColumnPairs();
-		}
-		return this.columnPairs;
-	}
-
-	private LocalColumnPair[] buildColumnPairs() {
-		List<org.eclipse.datatools.modelbase.sql.tables.Column> baseColumns = this.getDTPBaseColumns();
-		int size = baseColumns.size();
-		List<org.eclipse.datatools.modelbase.sql.tables.Column> refColumns = this.getDTPReferenceColumns();
-		if (refColumns.size() != size) {
-			throw new IllegalStateException(this.getBaseTable().getName() + '.' + this.getName() +
-								" - mismatched sizes: " + size + " vs. " + refColumns.size());  //$NON-NLS-1$  //$NON-NLS-2$
-		}
-		LocalColumnPair[] result = new LocalColumnPair[baseColumns.size()];
-		for (int i = baseColumns.size(); i-- > 0; ) {
-			result[i] = new LocalColumnPair(
-								this.getBaseTable().getColumn(baseColumns.get(i)),
-								this.getBaseTable().getColumn(refColumns.get(i))
-						);
-		}
-		return result;
-	}
-
-	// minimize scope of suppressed warnings
-	@SuppressWarnings("unchecked")
-	private List<org.eclipse.datatools.modelbase.sql.tables.Column> getDTPBaseColumns() {
-		return this.dtpForeignKey.getMembers();
-	}
-
-	// minimize scope of suppressed warnings
-	@SuppressWarnings("unchecked")
-	private List<org.eclipse.datatools.modelbase.sql.tables.Column> getDTPReferenceColumns() {
-		return this.dtpForeignKey.getUniqueConstraint().getMembers();
-	}
-
-	public int columnPairsSize() {
-		return this.getColumnPairs().length;
-	}
-
-	public Iterator<Column> baseColumns() {
-		return new TransformationIterator<LocalColumnPair, Column>(this.localColumnPairs()) {
-			@Override
-			protected Column transform(LocalColumnPair pair) {
-				return pair.getBaseColumn();
-			}
-		};
-	}
-
-	boolean baseColumnsContains(Column column) {
-		return CollectionTools.contains(this.baseColumns(), column);
-	}
-
-	public Iterator<Column> nonPrimaryKeyBaseColumns() {
-		return new FilteringIterator<Column, Column>(this.baseColumns()) {
-			@Override
-			protected boolean accept(Column column) {
-				return ! column.isPartOfPrimaryKey();
-			}
-		};
-	}
-
-	public Iterator<Column> referencedColumns() {
-		return new TransformationIterator<LocalColumnPair, Column>(this.localColumnPairs()) {
-			@Override
-			protected Column transform(LocalColumnPair columnPair) {
-				return columnPair.getReferencedColumn();
-			}
-		};
-	}
-
-	// ***** attribute name
-
-	public String getAttributeName() {
-		String defaultName = this.getDefaultAttributeName();
-		return (defaultName != null) ? defaultName : this.getNonDefaultAttributeName();
-	}
-
-	public synchronized String getDefaultAttributeName() {
-		if ( ! this.defaultAttributeNameCalculated) {
-			this.defaultAttributeNameCalculated = true;
-			this.defaultAttributeName = this.buildDefaultAttributeName();
-		}
-		return this.defaultAttributeName;
-	}
-
-	private String buildDefaultAttributeName() {
-		if ( ! this.referencesSingleColumnPrimaryKey()) {
-			return null;
-		}
-		LocalColumnPair columnPair = this.getColumnPair();
-		String baseColName = columnPair.getBaseColumn().getName();
-		String refColName = columnPair.getReferencedColumn().getName();
-		if (baseColName.length() <= (refColName.length() + 1)) {
-			return null;
-		}
-		if ( ! baseColName.endsWith(refColName)) {
-			return null;
-		}
-		int _index = baseColName.length() - refColName.length() - 1;
-		if (baseColName.charAt(_index) != '_') {
-			return null;
-		}
-		return baseColName.substring(0, _index);
-	}
-
-	/**
-	 * If this is a simple (single-column) foreign key, use the name of the
-	 * single base column to build a name. If this is a compound foreign key,
-	 * return the name of the referenced table.
-	 */
-	// TODO if there is only one FK to a given table, use the table's name instead of the column's name?
-	private String getNonDefaultAttributeName() {
-		return (this.columnPairsSize() == 1) ?
-						this.getNonDefaultAttributeNameFromBaseColumn()
-					:
-						this.getReferencedTable().getName();
-	}
-
-	/**
-	 * The underscore check is helpful when the referenced column is NOT the
-	 * primary key of the referenced table (i.e. it has only a UNIQUE constraint).
-	 *     ForeignKey(EMP.CUBICLE_ID => CUBICLE.ID) => "CUBICLE"
-	 *     ForeignKey(EMP.CUBICLEID => CUBICLE.ID) => "CUBICLE"
-	 *     ForeignKey(EMP.CUBICLE_PK => CUBICLE.ID) => "CUBICLE_PK"
-	 */
-	private String getNonDefaultAttributeNameFromBaseColumn() {
-		LocalColumnPair columnPair = this.getColumnPair();
-		String baseColName = columnPair.getBaseColumn().getName();
-		String refColName = columnPair.getReferencedColumn().getName();
-		int len = baseColName.length();
-		int refLen = refColName.length();
-		if ((len > refLen) && baseColName.endsWith(refColName)) {
-			len = len - refLen;
-			if ((len > 1) && baseColName.charAt(len - 1) == '_') {
-				len = len - 1;
-			}
-		}
-		return baseColName.substring(0, len);
-	}
-
-	/**
-	 * Examples:
-	 * Oracle etc.
-	 *     ForeignKey(FOO_ID => ID) vs. "foo" => null
-	 *     ForeignKey(FOO_ID => FOO_ID) vs. "foo" => "FOO_ID"
-	 *     ForeignKey(FOO => ID) vs. "foo" => "FOO"
-	 *     ForeignKey(Foo_ID => ID) vs. "foo" => "\"Foo_ID\""
-	 *     
-	 * PostgreSQL etc.
-	 *     ForeignKey(foo_id => id) vs. "foo" => null
-	 *     ForeignKey(foo_id => foo_id) vs. "foo" => "foo_id"
-	 *     ForeignKey(foo => id) vs. "foo" => "foo"
-	 *     ForeignKey(Foo_ID => ID) vs. "foo" => "\"Foo_ID\""
-	 *     
-	 * SQL Server etc.
-	 *     ForeignKey(foo_ID => ID) vs. "foo" => null
-	 *     ForeignKey(FOO_ID => FOO_ID) vs. "foo" => "FOO_ID"
-	 *     ForeignKey(FOO => ID) vs. "foo" => "FOO"
-	 *     ForeignKey(Foo_ID => ID) vs. "foo" => "Foo_ID"
-	 */
-	public String getJoinColumnAnnotationIdentifier(String attributeName) {
-		String baseColumnName = this.getColumnPair().getBaseColumn().getName();
-		String defaultBaseColumnName = attributeName + '_' + this.getReferencedTable().getPrimaryKeyColumn().getName();
-		return this.getDatabase().convertNameToIdentifier(baseColumnName, defaultBaseColumnName);
-	}
-
-
-	// ********** Comparable implementation **********
-
-	public int compareTo(ForeignKey foreignKey) {
-		return Collator.getInstance().compare(this.getName(), foreignKey.getName());
-	}
-
-
-	// ********** internal methods **********
-
-	boolean wraps(org.eclipse.datatools.modelbase.sql.constraints.ForeignKey foreignKey) {
-		return this.dtpForeignKey == foreignKey;
-	}
-
-	@Override
-	void clear() {
-		// the foreign key does not "contain" any other objects,
-		// so we don't need to forward the #clear()
-		this.defaultAttributeNameCalculated = false;
-		this.defaultAttributeName = null;
-		this.columnPairs =  null;
-		this.referencedTable = null;
-	}
-
-
-	// ********** column pair implementation **********
-
-	private static class LocalColumnPair implements ColumnPair {
-		private final DTPColumnWrapper baseColumn;
-		private final DTPColumnWrapper referencedColumn;
-
-		LocalColumnPair(DTPColumnWrapper baseColumn, DTPColumnWrapper referencedColumn) {
-			super();
-			if ((baseColumn == null) || (referencedColumn == null)) {
-				throw new NullPointerException();
-			}
-			this.baseColumn = baseColumn;
-			this.referencedColumn = referencedColumn;
-		}
-
-		public DTPColumnWrapper getBaseColumn() {
-			return this.baseColumn;
-		}
-
-		public DTPColumnWrapper getReferencedColumn() {
-			return this.referencedColumn;
-		}
-
-		public int compareTo(ColumnPair columnPair) {
-			return Collator.getInstance().compare(this.getBaseColumn().getName(), columnPair.getBaseColumn().getName());
-		}
-
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this, this.baseColumn.getName() + "=>" + this.referencedColumn.getName());  //$NON-NLS-1$
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPSchemaContainerWrapper.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPSchemaContainerWrapper.java
deleted file mode 100644
index a8dabea711..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPSchemaContainerWrapper.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 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.db.internal;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.db.SchemaContainer;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-
-/**
- * Coalesce behavior for a schema container (i.e. database or catalog).
- */
-abstract class DTPSchemaContainerWrapper
-	extends DTPDatabaseObjectWrapper
-	implements SchemaContainer
-{
-	// lazy-initialized
-	private DTPSchemaWrapper[] schemata;
-
-
-	// ********** constructor **********
-
-	DTPSchemaContainerWrapper(DTPDatabaseObject parent, Object dtpSchemaContainer) {
-		super(parent, dtpSchemaContainer);
-	}
-
-
-	// ********** DTPWrapper implementation **********
-
-	@Override
-	synchronized void catalogObjectChanged() {
-		super.catalogObjectChanged();
-	}
-
-
-	// ********** abstract methods **********
-
-	/**
-	 * return the schema container's DTP schemata
-	 */
-	abstract List<org.eclipse.datatools.modelbase.sql.schema.Schema> getDTPSchemata();
-
-	/**
-	 * return the schema for the specified DTP schema
-	 */
-	abstract DTPSchemaWrapper getSchema(org.eclipse.datatools.modelbase.sql.schema.Schema dtpSchema);
-
-	/**
-	 * assume the schema container (database or catalog) contains
-	 * the specified schema
-	 */
-	DTPSchemaWrapper getSchema_(org.eclipse.datatools.modelbase.sql.schema.Schema dtpSchema) {
-		for (DTPSchemaWrapper schema : this.getSchemata()) {
-			if (schema.wraps(dtpSchema)) {
-				return schema;
-			}
-		}
-		throw new IllegalArgumentException("invalid DTP schema: " + dtpSchema);  //$NON-NLS-1$
-	}
-
-	/**
-	 * return the table for the specified DTP table;
-	 * this is only called from a schema (to its container)
-	 */
-	abstract DTPTableWrapper getTable(org.eclipse.datatools.modelbase.sql.tables.Table dtpTable);
-
-	/**
-	 * assume the schema container contains the specified table
-	 */
-	DTPTableWrapper getTable_(org.eclipse.datatools.modelbase.sql.tables.Table dtpTable) {
-		return this.getSchema_(dtpTable.getSchema()).getTable_(dtpTable);
-	}
-
-	/**
-	 * return the column for the specified DTP column;
-	 * this is only called from a schema (to its container)
-	 */
-	abstract DTPColumnWrapper getColumn(org.eclipse.datatools.modelbase.sql.tables.Column dtpColumn);
-
-	/**
-	 * assume the schema container contains the specified column
-	 */
-	DTPColumnWrapper getColumn_(org.eclipse.datatools.modelbase.sql.tables.Column dtpColumn) {
-		return this.getTable_(dtpColumn.getTable()).getColumn_(dtpColumn);
-	}
-
-
-	// ********** schemata **********
-
-	public Iterator<Schema> schemata() {
-		return new ArrayIterator<Schema>(this.getSchemata());
-	}
-
-	Iterator<DTPSchemaWrapper> schemaWrappers() {
-		return new ArrayIterator<DTPSchemaWrapper>(this.getSchemata());
-	}
-
-	synchronized DTPSchemaWrapper[] getSchemata() {
-		if (this.schemata == null) {
-			this.schemata = this.buildSchemata();
-		}
-		return this.schemata;
-	}
-
-	private DTPSchemaWrapper[] buildSchemata() {
-		List<org.eclipse.datatools.modelbase.sql.schema.Schema> dtpSchemata = this.getDTPSchemata();
-		DTPSchemaWrapper[] result = new DTPSchemaWrapper[dtpSchemata.size()];
-		for (int i = result.length; i-- > 0; ) {
-			result[i] = new DTPSchemaWrapper(this, dtpSchemata.get(i));
-		}
-		return CollectionTools.sort(result);
-	}
-
-	public int schemataSize() {
-		return this.getSchemata().length;
-	}
-
-	public DTPSchemaWrapper getSchemaNamed(String name) {
-		return this.selectDatabaseObjectNamed(this.getSchemata(), name);
-	}
-
-	public Iterator<String> sortedSchemaIdentifiers() {
-		// the schemata are already sorted
-		return new TransformationIterator<DTPSchemaWrapper, String>(this.schemaWrappers()) {
-			@Override
-			protected String transform(DTPSchemaWrapper next) {
-				 return next.getIdentifier();
-			}
-		};
-	}
-
-	public DTPSchemaWrapper getSchemaForIdentifier(String identifier) {
-		return this.selectDatabaseObjectForIdentifier(this.getSchemata(), identifier);
-	}
-
-	public DTPSchemaWrapper getDefaultSchema() {
-		return this.getSchemaForIdentifiers(this.getDatabase().getDefaultSchemaIdentifiers());
-	}
-
-	/**
-	 * Return the first schema found.
-	 */
-	DTPSchemaWrapper getSchemaForIdentifiers(List<String> identifiers) {
-		for (String identifier : identifiers) {
-			DTPSchemaWrapper schema = this.getSchemaForIdentifier(identifier);
-			if (schema != null) {
-				return schema;
-			}
-		}
-		return null;
-	}
-
-
-	// ********** listening **********
-
-	@Override
-	synchronized void startListening() {
-		if (this.schemata != null) {
-			this.startSchemata();
-		}
-		super.startListening();
-	}
-
-	private void startSchemata() {
-		for (DTPSchemaWrapper schema : this.schemata) {
-			schema.startListening();
-		}
-	}
-
-	@Override
-	synchronized void stopListening() {
-		if (this.schemata != null) {
-			this.stopSchemata();
-		}
-		super.stopListening();
-	}
-
-	private void stopSchemata() {
-		for (DTPSchemaWrapper schema : this.schemata) {
-			schema.stopListening();
-		}
-	}
-
-
-	// ********** clear **********
-
-	@Override
-	synchronized void clear() {
-		if (this.schemata != null) {
-			this.clearSchemata();
-		}
-	}
-
-	private void clearSchemata() {
-		this.stopSchemata();
-		for (DTPSchemaWrapper schema : this.schemata) {
-			schema.clear();
-		}
-		this.schemata = null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPSchemaWrapper.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPSchemaWrapper.java
deleted file mode 100644
index 0ed313e0e6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPSchemaWrapper.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db.internal;
-
-import java.text.Collator;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.db.Sequence;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-
-/**
- *  Wrap a DTP Schema
- */
-final class DTPSchemaWrapper
-	extends DTPDatabaseObjectWrapper
-	implements Schema
-{
-	// the wrapped DTP schema
-	private final org.eclipse.datatools.modelbase.sql.schema.Schema dtpSchema;
-
-	// lazy-initialized
-	private DTPTableWrapper[] tables;
-
-	// lazy-initialized
-	private DTPSequenceWrapper[] sequences;
-
-
-	// ********** constructor **********
-
-	DTPSchemaWrapper(DTPSchemaContainerWrapper container, org.eclipse.datatools.modelbase.sql.schema.Schema dtpSchema) {
-		super(container, dtpSchema);
-		this.dtpSchema = dtpSchema;
-	}
-
-
-	// ********** DTPWrapper implementation **********
-
-	@Override
-	synchronized void catalogObjectChanged() {
-		super.catalogObjectChanged();
-		this.getConnectionProfile().schemaChanged(this);
-	}
-
-
-	// ********** Schema implementation **********
-
-	public String getName() {
-		return this.dtpSchema.getName();
-	}
-
-	public DTPSchemaContainerWrapper getContainer() {
-		return (DTPSchemaContainerWrapper) this.getParent();
-	}
-
-	// ***** tables
-
-	public Iterator<Table> tables() {
-		return new ArrayIterator<Table>(this.getTables());
-	}
-
-	private Iterator<DTPTableWrapper> tableWrappers() {
-		return new ArrayIterator<DTPTableWrapper>(this.getTables());
-	}
-
-	private synchronized DTPTableWrapper[] getTables() {
-		if (this.tables == null) {
-			this.tables = this.buildTables();
-		}
-		return this.tables;
-	}
-
-	private DTPTableWrapper[] buildTables() {
-		List<org.eclipse.datatools.modelbase.sql.tables.Table> dtpTables = this.getDTPTables();
-		DTPTableWrapper[] result = new DTPTableWrapper[dtpTables.size()];
-		for (int i = result.length; i-- > 0;) {
-			result[i] = new DTPTableWrapper(this, dtpTables.get(i));
-		}
-		return CollectionTools.sort(result);
-	}
-
-	// minimize scope of suppressed warnings
-	@SuppressWarnings("unchecked")
-	private List<org.eclipse.datatools.modelbase.sql.tables.Table> getDTPTables() {
-		return this.dtpSchema.getTables();
-	}
-
-	public int tablesSize() {
-		return this.getTables().length;
-	}
-
-	/**
-	 * return the table for the specified DTP table
-	 */
-	DTPTableWrapper getTable(org.eclipse.datatools.modelbase.sql.tables.Table dtpTable) {
-		// try to short-circuit the search
-		return this.wraps(dtpTable.getSchema()) ?
-						this.getTable_(dtpTable)
-					:
-						this.getContainer().getTable(dtpTable);
-	}
-
-	/**
-	 * assume the schema contains the specified table
-	 */
-	DTPTableWrapper getTable_(org.eclipse.datatools.modelbase.sql.tables.Table dtpTable) {
-		for (DTPTableWrapper table : this.getTables()) {
-			if (table.wraps(dtpTable)) {
-				return table;
-			}
-		}
-		throw new IllegalArgumentException("invalid DTP table: " + dtpTable);  //$NON-NLS-1$
-	}
-
-	public DTPTableWrapper getTableNamed(String name) {
-		return this.selectDatabaseObjectNamed(this.getTables(), name);
-	}
-
-	public Iterator<String> sortedTableIdentifiers() {
-		// the tables are already sorted
-		return new TransformationIterator<DTPTableWrapper, String>(this.tableWrappers()) {
-			@Override
-			protected String transform(DTPTableWrapper table) {
-				 return table.getIdentifier();
-			}
-		};
-	}
-
-	public DTPTableWrapper getTableForIdentifier(String identifier) {
-		return this.selectDatabaseObjectForIdentifier(this.getTables(), identifier);
-	}
-
-	// ***** sequences
-
-	public Iterator<Sequence> sequences() {
-		return new ArrayIterator<Sequence>(this.getSequences());
-	}
-
-	private Iterator<DTPSequenceWrapper> sequenceWrappers() {
-		return new ArrayIterator<DTPSequenceWrapper>(this.getSequences());
-	}
-
-	private synchronized DTPSequenceWrapper[] getSequences() {
-		if (this.sequences == null) {
-			this.sequences = this.buildSequences();
-		}
-		return this.sequences;
-	}
-
-	private DTPSequenceWrapper[] buildSequences() {
-		List<org.eclipse.datatools.modelbase.sql.schema.Sequence> dtpSequences = this.getDTPSequences();
-		DTPSequenceWrapper[] result = new DTPSequenceWrapper[dtpSequences.size()];
-		for (int i = result.length; i-- > 0;) {
-			result[i] = new DTPSequenceWrapper(this, dtpSequences.get(i));
-		}
-		return CollectionTools.sort(result);
-	}
-
-	// minimize scope of suppressed warnings
-	@SuppressWarnings("unchecked")
-	private List<org.eclipse.datatools.modelbase.sql.schema.Sequence> getDTPSequences() {
-		return this.dtpSchema.getSequences();
-	}
-
-	public int sequencesSize() {
-		return this.getSequences().length;
-	}
-
-	public DTPSequenceWrapper getSequenceNamed(String name) {
-		return this.selectDatabaseObjectNamed(this.getSequences(), name);
-	}
-
-	public Iterator<String> sortedSequenceIdentifiers() {
-		// the sequences are already sorted
-		return new TransformationIterator<DTPSequenceWrapper, String>(this.sequenceWrappers()) {
-			@Override
-			protected String transform(DTPSequenceWrapper sequence) {
-				 return sequence.getIdentifier();
-			}
-		};
-	}
-
-	public DTPSequenceWrapper getSequenceForIdentifier(String identifier) {
-		return this.selectDatabaseObjectForIdentifier(this.getSequences(), identifier);
-	}
-
-
-	// ********** Comparable implementation **********
-
-	public int compareTo(Schema schema) {
-		return Collator.getInstance().compare(this.getName(), schema.getName());
-	}
-
-
-	// ********** internal methods **********
-
-	boolean wraps(org.eclipse.datatools.modelbase.sql.schema.Schema schema) {
-		return this.dtpSchema == schema;
-	}
-
-	/**
-	 * return the column for the specified DTP column
-	 */
-	DTPColumnWrapper getColumn(org.eclipse.datatools.modelbase.sql.tables.Column dtpColumn) {
-		// try to short-circuit the search
-		return this.wraps(dtpColumn.getTable().getSchema()) ?
-						this.getColumn_(dtpColumn)
-					:
-						this.getContainer().getColumn(dtpColumn);
-	}
-
-	/**
-	 * assume the schema contains the specified column
-	 */
-	DTPColumnWrapper getColumn_(org.eclipse.datatools.modelbase.sql.tables.Column dtpColumn) {
-		return this.getTable_(dtpColumn.getTable()).getColumn_(dtpColumn);
-	}
-
-
-	// ********** listening **********
-
-	@Override
-	synchronized void startListening() {
-		if (this.sequences != null) {
-			this.startSequences();
-		}
-		if (this.tables != null) {
-			this.startTables();
-		}
-		super.startListening();
-	}
-
-	private void startSequences() {
-		for (DTPSequenceWrapper sequence : this.sequences) {
-			sequence.startListening();
-		}
-	}
-
-	private void startTables() {
-		for (DTPTableWrapper table : this.tables) {
-			table.startListening();
-		}
-	}
-
-	@Override
-	synchronized void stopListening() {
-		if (this.sequences != null) {
-			this.stopSequences();
-		}
-		if (this.tables != null) {
-			this.stopTables();
-		}
-		super.stopListening();
-	}
-
-	private void stopSequences() {
-		for (DTPSequenceWrapper sequence : this.sequences) {
-			sequence.stopListening();
-		}
-	}
-
-	private void stopTables() {
-		for (DTPTableWrapper table : this.tables) {
-			table.stopListening();
-		}
-	}
-
-
-	// ********** clear **********
-
-	@Override
-	synchronized void clear() {
-		if (this.sequences != null) {
-			this.clearSequences();
-		}
-		if (this.tables != null) {
-			this.clearTables();
-		}
-	}
-
-	private void clearSequences() {
-		this.stopSequences();
-		for (DTPSequenceWrapper sequence : this.sequences) {
-			sequence.clear();
-		}
-		this.sequences = null;
-	}
-
-	private void clearTables() {
-		this.stopTables();
-		for (DTPTableWrapper table : this.tables) {
-			table.clear();
-		}
-		this.tables = null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPSequenceWrapper.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPSequenceWrapper.java
deleted file mode 100644
index 6b0b76a506..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPSequenceWrapper.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db.internal;
-
-import java.text.Collator;
-import org.eclipse.jpt.db.Sequence;
-
-/**
- *  Wrap a DTP Sequence
- */
-final class DTPSequenceWrapper
-	extends DTPDatabaseObjectWrapper
-	implements Sequence
-{
-	// the wrapped DTP sequence
-	private final org.eclipse.datatools.modelbase.sql.schema.Sequence dtpSequence;
-
-
-	// ********** constructor **********
-
-	DTPSequenceWrapper(DTPSchemaWrapper schema, org.eclipse.datatools.modelbase.sql.schema.Sequence dtpSequence) {
-		super(schema, dtpSequence);
-		this.dtpSequence = dtpSequence;
-	}
-
-
-	// ********** DTPWrapper implementation **********
-
-	@Override
-	synchronized void catalogObjectChanged() {
-		super.catalogObjectChanged();
-		this.getConnectionProfile().sequenceChanged(this);
-	}
-
-
-	// ********** Sequence implementation **********
-
-	public String getName() {
-		return this.dtpSequence.getName();
-	}
-
-	public DTPSchemaWrapper getSchema() {
-		return (DTPSchemaWrapper) this.getParent();
-	}
-
-
-	// ********** Comparable implementation **********
-
-	public int compareTo(Sequence sequence) {
-		return Collator.getInstance().compare(this.getName(), sequence.getName());
-	}
-
-
-	// ********** internal methods **********
-
-	boolean wraps(org.eclipse.datatools.modelbase.sql.schema.Sequence sequence) {
-		return this.dtpSequence == sequence;
-	}
-
-	@Override
-	void clear() {
-		// no state to clear
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPTableWrapper.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPTableWrapper.java
deleted file mode 100644
index da8f333510..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/DTPTableWrapper.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.db.internal;
-
-import java.text.Collator;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.datatools.modelbase.sql.constraints.PrimaryKey;
-import org.eclipse.datatools.modelbase.sql.tables.BaseTable;
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.db.ForeignKey;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-
-/**
- *  Wrap a DTP Table
- */
-final class DTPTableWrapper
-	extends DTPDatabaseObjectWrapper
-	implements Table
-{
-	// the wrapped DTP table
-	private final org.eclipse.datatools.modelbase.sql.tables.Table dtpTable;
-
-	// lazy-initialized
-	private DTPColumnWrapper[] columns;
-
-	// lazy-initialized
-	private DTPColumnWrapper[] primaryKeyColumns;
-
-	// lazy-initialized
-	private DTPForeignKeyWrapper[] foreignKeys;
-
-
-	private static final DTPColumnWrapper[] EMPTY_COLUMNS = new DTPColumnWrapper[0];
-	private static final DTPForeignKeyWrapper[] EMPTY_FOREIGN_KEYS = new DTPForeignKeyWrapper[0];
-
-
-	// ********** constructor **********
-
-	DTPTableWrapper(DTPSchemaWrapper schema, org.eclipse.datatools.modelbase.sql.tables.Table dtpTable) {
-		super(schema, dtpTable);
-		this.dtpTable = dtpTable;
-	}
-
-
-	// ********** DTPWrapper implementation **********
-
-	@Override
-	synchronized void catalogObjectChanged() {
-		super.catalogObjectChanged();
-		this.getConnectionProfile().tableChanged(this);
-	}
-
-
-	// ********** Table implementation **********
-
-	public String getName() {
-		return this.dtpTable.getName();
-	}
-
-	public DTPSchemaWrapper getSchema() {
-		return (DTPSchemaWrapper) this.getParent();
-	}
-
-	// ***** columns
-
-	public Iterator<Column> columns() {
-		return new ArrayIterator<Column>(this.getColumns());
-	}
-
-	private Iterator<DTPColumnWrapper> columnWrappers() {
-		return new ArrayIterator<DTPColumnWrapper>(this.getColumns());
-	}
-
-	private synchronized DTPColumnWrapper[] getColumns() {
-		if (this.columns == null) {
-			this.columns = this.buildColumns();
-		}
-		return this.columns;
-	}
-
-	private DTPColumnWrapper[] buildColumns() {
-		List<org.eclipse.datatools.modelbase.sql.tables.Column> dtpColumns = this.getDTPColumns();
-		DTPColumnWrapper[] result = new DTPColumnWrapper[dtpColumns.size()];
-		for (int i = result.length; i-- > 0;) {
-			result[i] = new DTPColumnWrapper(this, dtpColumns.get(i));
-		}
-		return CollectionTools.sort(result);
-	}
-
-	// minimize scope of suppressed warnings
-	@SuppressWarnings("unchecked")
-	private List<org.eclipse.datatools.modelbase.sql.tables.Column> getDTPColumns() {
-		return this.dtpTable.getColumns();
-	}
-
-	public int columnsSize() {
-		return this.getColumns().length;
-	}
-
-	public DTPColumnWrapper getColumnNamed(String name) {
-		return this.selectDatabaseObjectNamed(this.getColumns(), name);
-	}
-
-	/**
-	 * return the column for the specified DTP column
-	 */
-	DTPColumnWrapper getColumn(org.eclipse.datatools.modelbase.sql.tables.Column dtpColumn) {
-		// try to short-circuit the search
-		return this.wraps(dtpColumn.getTable()) ?
-						this.getColumn_(dtpColumn)
-					:
-						this.getSchema().getColumn(dtpColumn);
-	}
-
-	/**
-	 * assume the table contains the specified column
-	 */
-	DTPColumnWrapper getColumn_(org.eclipse.datatools.modelbase.sql.tables.Column dtpColumn) {
-		for (DTPColumnWrapper column : this.getColumns()) {
-			if (column.wraps(dtpColumn)) {
-				return column;
-			}
-		}
-		throw new IllegalArgumentException("invalid DTP column: " + dtpColumn);  //$NON-NLS-1$
-	}
-
-	public Iterator<String> sortedColumnIdentifiers() {
-		// the columns are already sorted
-		return new TransformationIterator<DTPColumnWrapper, String>(this.columnWrappers()) {
-			@Override
-			protected String transform(DTPColumnWrapper next) {
-				 return next.getIdentifier();
-			}
-		};
-	}
-
-	public DTPColumnWrapper getColumnForIdentifier(String identifier) {
-		return this.selectDatabaseObjectForIdentifier(this.getColumns(), identifier);
-	}
-
-	// ***** primaryKeyColumns
-
-	public Iterator<Column> primaryKeyColumns() {
-		return new ArrayIterator<Column>(this.getPrimaryKeyColumns());
-	}
-
-	public DTPColumnWrapper getPrimaryKeyColumn() {
-		DTPColumnWrapper[] pkColumns = this.getPrimaryKeyColumns();
-		if (pkColumns.length != 1) {
-			throw new IllegalStateException("multiple primary key columns: " + pkColumns.length);  //$NON-NLS-1$
-		}
-		return pkColumns[0];
-	}
-
-	private synchronized DTPColumnWrapper[] getPrimaryKeyColumns() {
-		if (this.primaryKeyColumns == null) {
-			this.primaryKeyColumns = this.buildPrimaryKeyColumns();
-		}
-		return this.primaryKeyColumns;
-	}
-
-	private DTPColumnWrapper[] buildPrimaryKeyColumns() {
-		if ( ! (this.dtpTable instanceof BaseTable)) {
-			return EMPTY_COLUMNS;
-		}
-		PrimaryKey pk = ((BaseTable) this.dtpTable).getPrimaryKey();
-		if (pk == null) {
-			// no PK was defined
-			return EMPTY_COLUMNS;
-		}
-		List<org.eclipse.datatools.modelbase.sql.tables.Column> pkColumns = this.getColumns(pk);
-		DTPColumnWrapper[] result = new DTPColumnWrapper[pkColumns.size()];
-		for (int i = result.length; i-- > 0;) {
-			result[i] = this.getColumn(pkColumns.get(i));
-		}
-		return result;
-	}
-
-	// minimize scope of suppressed warnings
-	@SuppressWarnings("unchecked")
-	private List<org.eclipse.datatools.modelbase.sql.tables.Column> getColumns(PrimaryKey pk) {
-		return pk.getMembers();
-	}
-
-	public int primaryKeyColumnsSize() {
-		return this.getPrimaryKeyColumns().length;
-	}
-
-	boolean primaryKeyColumnsContains(Column column) {
-		return CollectionTools.contains(this.getPrimaryKeyColumns(), column);
-	}
-
-	// ***** foreignKeys
-
-	public Iterator<ForeignKey> foreignKeys() {
-		return new ArrayIterator<ForeignKey>(this.getForeignKeys());
-	}
-
-	private synchronized DTPForeignKeyWrapper[] getForeignKeys() {
-		if (this.foreignKeys == null) {
-			this.foreignKeys = this.buildForeignKeys();
-		}
-		return this.foreignKeys;
-	}
-
-	private DTPForeignKeyWrapper[] buildForeignKeys() {
-		if ( ! (this.dtpTable instanceof BaseTable)) {
-			return EMPTY_FOREIGN_KEYS;
-		}
-		List<org.eclipse.datatools.modelbase.sql.constraints.ForeignKey> dtpForeignKeys = this.getDTPForeignKeys();
-		DTPForeignKeyWrapper[] result = new DTPForeignKeyWrapper[dtpForeignKeys.size()];
-		for (int i = result.length; i-- > 0;) {
-			result[i] = new DTPForeignKeyWrapper(this, dtpForeignKeys.get(i));
-		}
-		return result;
-	}
-
-	@SuppressWarnings("unchecked")
-	private List<org.eclipse.datatools.modelbase.sql.constraints.ForeignKey> getDTPForeignKeys() {
-		return ((BaseTable) this.dtpTable).getForeignKeys();
-	}
-
-	public int foreignKeysSize() {
-		return this.getForeignKeys().length;
-	}
-
-	/**
-	 * return whether the specified column is a base column for at least one
-	 * of the the table's foreign keys
-	 */
-	boolean foreignKeyBaseColumnsContains(Column column) {
-		for (DTPForeignKeyWrapper fkWrapper : this.getForeignKeys()) {
-			if (fkWrapper.baseColumnsContains(column)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	// ***** join table
-
-	public boolean isPossibleJoinTable() {
-		if (this.getForeignKeys().length != 2) {
-			return false;  // the table must have exactly 2 foreign keys
-		}
-		for (Column column : this.getColumns()) {
-			if ( ! this.foreignKeyBaseColumnsContains(column)) {
-				return false;  // all the table's columns must belong to one (or both) of the 2 foreign keys
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * If the table name is FOO_BAR and it joins tables FOO and BAR,
-	 * return the foreign key to FOO;
-	 * if the table name is BAR_FOO and it joins tables FOO and BAR,
-	 * return the foreign key to BAR;
-	 * otherwise simply return the first foreign key in the array.
-	 */
-	public ForeignKey getJoinTableOwningForeignKey() {
-		ForeignKey fk0 = this.getForeignKeys()[0];
-		String name0 = fk0.getReferencedTable().getName();
-
-		ForeignKey fk1 = this.getForeignKeys()[1];
-		String name1 = fk1.getReferencedTable().getName();
-
-		return this.getName().equals(name1 + '_' + name0) ? fk1 : fk0;
-	}
-
-	public ForeignKey getJoinTableNonOwningForeignKey() {
-		ForeignKey fk0 = this.getForeignKeys()[0];
-		ForeignKey fk1 = this.getForeignKeys()[1];
-		ForeignKey ofk = this.getJoinTableOwningForeignKey();
-		return (ofk == fk0) ? fk1 : fk0;
-	}
-
-	/**
-	 * Hmmm....
-	 * We might want to go to the platform to allow a vendor-specific
-	 * comparison here;
-	 * but, since all the names are coming directly from the database
-	 * (i.e. there are no conversions to Java identifiers etc.), it seems
-	 * like we can just compare them directly and ignore case-sensitivity
-	 * issues....  ~bjv
-	 */
-	public boolean joinTableNameIsDefault() {
-		return this.getName().equals(this.buildDefaultJoinTableName());
-	}
-
-	private String buildDefaultJoinTableName() {
-		return this.getJoinTableOwningTable().getName()
-					+ '_'
-					+ this.getJoinTableNonOwningTable().getName();
-	}
-
-	private Table getJoinTableOwningTable() {
-		return this.getJoinTableOwningForeignKey().getReferencedTable();
-	}
-
-	private Table getJoinTableNonOwningTable() {
-		return this.getJoinTableNonOwningForeignKey().getReferencedTable();
-	}
-
-
-	// ********** Comparable implementation **********
-
-	public int compareTo(Table table) {
-		return Collator.getInstance().compare(this.getName(), table.getName());
-	}
-
-
-	// ********** internal methods **********
-
-	boolean wraps(org.eclipse.datatools.modelbase.sql.tables.Table table) {
-		return this.dtpTable == table;
-	}
-
-	/**
-	 * return the table for the specified DTP table
-	 */
-	DTPTableWrapper getTable(org.eclipse.datatools.modelbase.sql.tables.Table table) {
-		// try to short-circuit the search
-		return this.wraps(table) ? this : this.getSchema().getTable(table);
-	}
-
-
-	// ********** listening **********
-
-	@Override
-	synchronized void startListening() {
-		if (this.foreignKeys != null) {
-			this.startForeignKeys();
-		}
-		if (this.columns != null) {
-			this.startColumns();
-		}
-		super.startListening();
-	}
-
-	private void startForeignKeys() {
-		for (DTPForeignKeyWrapper foreignKey : this.foreignKeys) {
-			foreignKey.startListening();
-		}
-	}
-
-	private void startColumns() {
-		for (DTPColumnWrapper column : this.columns) {
-			column.startListening();
-		}
-	}
-
-	@Override
-	synchronized void stopListening() {
-		if (this.foreignKeys != null) {
-			this.stopForeignKeys();
-		}
-		if (this.columns != null) {
-			this.stopColumns();
-		}
-		super.stopListening();
-	}
-
-	private void stopForeignKeys() {
-		for (DTPForeignKeyWrapper foreignKey : this.foreignKeys) {
-			foreignKey.stopListening();
-		}
-	}
-
-	private void stopColumns() {
-		for (DTPColumnWrapper column : this.columns) {
-			column.stopListening();
-		}
-	}
-
-
-	// ********** clear **********
-
-	@Override
-	void clear() {
-		if (this.foreignKeys != null) {
-			this.clearForeignKeys();
-		}
-
-		// the table does not "contain" the pk columns, so no need to forward #clear()
-		this.primaryKeyColumns = null;
-
-		if (this.columns != null) {
-			this.clearColumns();
-		}
-	}
-
-	private void clearForeignKeys() {
-		this.stopForeignKeys();
-		for (DTPForeignKeyWrapper foreignKey : this.foreignKeys) {
-			foreignKey.clear();
-		}
-    	this.foreignKeys = null;
-	}
-
-	private void clearColumns() {
-		this.stopColumns();
-		for (DTPColumnWrapper column : this.columns) {
-			column.clear();
-		}
-    	this.columns = null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/AbstractVendor.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/AbstractVendor.java
deleted file mode 100644
index dbb1a7839a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/AbstractVendor.java
+++ /dev/null
@@ -1,280 +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.db.internal.vendor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.datatools.modelbase.sql.schema.Catalog;
-import org.eclipse.datatools.modelbase.sql.schema.Database;
-import org.eclipse.datatools.modelbase.sql.schema.Schema;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * Consolidate the behavior common to the typical vendors.
- */
-abstract class AbstractVendor
-	implements Vendor
-{
-
-	AbstractVendor() {
-		super();
-	}
-
-	public abstract String getDTPVendorName();
-
-
-	// ********** catalog and schema support **********
-
-	abstract CatalogStrategy getCatalogStrategy();
-
-	public boolean supportsCatalogs(Database database) {
-		return this.getCatalogStrategy().supportsCatalogs(database);
-	}
-
-	public List<Catalog> getCatalogs(Database database) {
-		return this.getCatalogStrategy().getCatalogs(database);
-	}
-
-	public List<Schema> getSchemas(Database database) {
-		try {
-			return this.getCatalogStrategy().getSchemas(database);
-		} catch (Exception ex) {
-			throw new RuntimeException("vendor: " + this, ex); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Typically, the name of the default catalog is the user name.
-	 */
-	public List<String> getDefaultCatalogIdentifiers(Database database, String userName) {
-		ArrayList<String> identifiers = new ArrayList<String>();
-		this.addDefaultCatalogIdentifiersTo(database, userName, identifiers);
-		return identifiers;
-	}
-
-	void addDefaultCatalogIdentifiersTo(@SuppressWarnings("unused") Database database, String userName, ArrayList<String> identifiers) {
-		identifiers.add(userName);
-	}
-
-	/**
-	 * Typically, the name of the default schema is the user name.
-	 */
-	public List<String> getDefaultSchemaIdentifiers(Database database, String userName) {
-		ArrayList<String> identifiers = new ArrayList<String>();
-		this.addDefaultSchemaIdentifiersTo(database, userName, identifiers);
-		return identifiers;
-	}
-
-	void addDefaultSchemaIdentifiersTo(@SuppressWarnings("unused") Database database, String userName, ArrayList<String> identifiers) {
-		identifiers.add(userName);
-	}
-
-
-	// ********** folding strategy used to convert names and identifiers **********
-
-	/**
-	 * The SQL spec says a "normal" (non-delimited) identifier should be
-	 * folded to uppercase; but some databases do otherwise (e.g. Sybase).
-	 */
-	abstract FoldingStrategy getFoldingStrategy();
-
-
-	// ********** name -> identifier **********
-
-	public String convertNameToIdentifier(String name, String defaultName) {
-		return this.nameRequiresDelimiters(name) ? this.delimitName(name)
-						: this.normalNamesMatch(name, defaultName) ? null : name;
-	}
-
-	public String convertNameToIdentifier(String name) {
-		return this.nameRequiresDelimiters(name) ? this.delimitName(name) : name;
-	}
-
-	/**
-	 * Return whether the specified database object name must be delimited
-	 * when used in an SQL statement.
-	 * If the name has any "special" characters (as opposed to letters,
-	 * digits, and other allowed characters [e.g. underscores]), it requires
-	 * delimiters.
-	 * If the name is mixed case and the database folds undelimited names
-	 * (to either uppercase or lowercase), it requires delimiters.
-	 */
-	boolean nameRequiresDelimiters(String name) {
-		return (name.length() == 0)  //  an empty string must be delimited(?)
-					|| this.nameContainsAnyNonNormalCharacters(name)
-					|| this.nameIsNotFolded(name);
-	}
-
-	/**
-	 * Return whether the specified name contains any "non-normal" characters
-	 * that require the name to be delimited.
-	 * Pre-condition: the specified name is not empty
-	 */
-	boolean nameContainsAnyNonNormalCharacters(String name) {
-		char[] string = name.toCharArray();
-		if (this.characterIsNonNormalNameStart(string[0])) {
-			return true;
-		}
-		for (int i = string.length; i-- > 1; ) {  // note: stop at 1
-			if (this.characterIsNonNormalNamePart(string[i])) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Return whether the specified character is "non-normal" for the first
-	 * character of a name.
-	 * Typically, databases are more restrictive about what characters can
-	 * be used to *start* an identifier (as opposed to the characters
-	 * allowed for the remainder of the identifier).
-	 */
-	boolean characterIsNonNormalNameStart(char c) {
-		return ! this.characterIsNormalNameStart(c);
-	}
-
-	/**
-	 * Return whether the specified character is "normal" for the first
-	 * character of a name.
-	 * The first character of an identifier can be:
-	 *   - a letter
-	 *   - any of the extended, vendor-specific, "normal" start characters
-	 */
-	boolean characterIsNormalNameStart(char c) {
-		// all vendors allow a letter
-		return Character.isLetter(c)
-				|| this.characterIsExtendedNormalNameStart(c);
-	}
-
-	boolean characterIsExtendedNormalNameStart(char c) {
-		return arrayContains(this.getExtendedNormalNameStartCharacters(), c);
-	}
-
-	/**
-	 * Return the "normal" characters, beyond letters, for the
-	 * first character of a name.
-	 * Return null if there are no "extended" characters.
-	 */
-	char[] getExtendedNormalNameStartCharacters() {
-		return null;
-	}
-
-	/**
-	 * Return whether the specified character is "non-normal" for the second
-	 * and subsequent characters of a name.
-	 */
-	boolean characterIsNonNormalNamePart(char c) {
-		return ! this.characterIsNormalNamePart(c);
-	}
-
-	/**
-	 * Return whether the specified character is "normal" for the second and
-	 * subsequent characters of a name.
-	 * The second and subsequent characters of a "normal" name can be:
-	 *   - a letter
-	 *   - a digit
-	 *   - any of the extended, vendor-specific, "normal" start characters
-	 *   - any of the extended, vendor-specific, "normal" part characters
-	 */
-	boolean characterIsNormalNamePart(char c) {
-		// all vendors allow a letter or digit
-		return Character.isLetterOrDigit(c)
-				|| this.characterIsExtendedNormalNameStart(c)
-				|| this.characterIsExtendedNormalNamePart(c);
-	}
-
-	boolean characterIsExtendedNormalNamePart(char c) {
-		return arrayContains(this.getExtendedNormalNamePartCharacters(), c);
-	}
-
-	/**
-	 * Return the "normal" characters, beyond letters and digits and the
-	 * "normal" first characters, for the second and subsequent characters
-	 * of an identifier. Return null if there are no additional characters.
-	 */
-	char[] getExtendedNormalNamePartCharacters() {
-		return null;
-	}
-
-	/**
-	 * Return whether the specified name is not folded to the database's
-	 * case, requiring it to be delimited.
-	 */
-	boolean nameIsNotFolded(String name) {
-		return ! this.getFoldingStrategy().nameIsFolded(name);
-	}
-
-	/**
-	 * Return whether the specified "normal" names match.
-	 */
-	boolean normalNamesMatch(String name1, String name2) {
-		return this.normalIdentifiersAreCaseSensitive() ?
-						name1.equals(name2)
-					:
-						name1.equalsIgnoreCase(name2);
-	}
-
-	/**
-	 * Typically, "normal" identifiers are case-insensitive.
-	 */
-	boolean normalIdentifiersAreCaseSensitive() {
-		return this.getFoldingStrategy().normalIdentifiersAreCaseSensitive();
-	}
-
-	/**
-	 * Wrap the specified name in delimiters (typically double-quotes),
-	 * converting it to an identifier.
-	 */
-	String delimitName(String name) {
-		return StringTools.quote(name);
-	}
-
-
-	// ********** identifier -> name **********
-
-	// not sure how to handle an empty string:
-	// both "" and "\"\"" are converted to "" ...
-	// convert "" to 'null' since empty strings must be delimited?
-	public String convertIdentifierToName(String identifier) {
-		return (identifier == null) ? null :
-					this.identifierIsDelimited(identifier) ?
-						StringTools.undelimit(identifier)
-					:
-						this.getFoldingStrategy().fold(identifier);
-	}
-
-	/**
-	 * Return whether the specified identifier is "delimited".
-	 * The SQL-92 spec says identifiers should be delimited by
-	 * double-quotes; but some databases allow otherwise (e.g. Sybase).
-	 */
-	boolean identifierIsDelimited(String identifier) {
-		return StringTools.stringIsQuoted(identifier);
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public String toString() {
-		return this.getDTPVendorName();
-	}
-
-	/**
-	 * static convenience method - array null check
-	 */
-	static boolean arrayContains(char[] array, char c) {
-		return (array != null) && CollectionTools.contains(array, c);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/CatalogStrategy.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/CatalogStrategy.java
deleted file mode 100644
index 9c7a4b59c8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/CatalogStrategy.java
+++ /dev/null
@@ -1,38 +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.db.internal.vendor;
-
-import java.util.List;
-
-import org.eclipse.datatools.modelbase.sql.schema.Catalog;
-import org.eclipse.datatools.modelbase.sql.schema.Database;
-import org.eclipse.datatools.modelbase.sql.schema.Schema;
-
-/**
- * Handle the variety of catalog (and schema) configurations generated by DTP.
- */
-interface CatalogStrategy {
-
-	/**
-	 * Return whether the DTP database has real catalogs.
-	 */
-	boolean supportsCatalogs(Database database);
-
-	/**
-	 * Return the specified database's catalogs.
-	 */
-	List<Catalog> getCatalogs(Database database);
-
-	/**
-	 * Return the specified database's schemas.
-	 */
-	List<Schema> getSchemas(Database database);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/DB2.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/DB2.java
deleted file mode 100644
index 259d039185..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/DB2.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.db.internal.vendor;
-
-class DB2
-	extends AbstractVendor
-{
-	private final String dtpVendorName;
-
-	private static final Vendor UDB = new DB2("DB2 UDB"); //$NON-NLS-1$
-	private static final Vendor UDB_I_SERIES = new DB2("DB2 UDB iSeries"); //$NON-NLS-1$
-	private static final Vendor UDB_Z_SERIES = new DB2("DB2 UDB zSeries"); //$NON-NLS-1$
-
-	static Vendor udb() {
-		return UDB;
-	}
-
-	static Vendor udbISeries() {
-		return UDB_I_SERIES;
-	}
-
-	static Vendor udbZSeries() {
-		return UDB_Z_SERIES;
-	}
-
-	/**
-	 * Ensure only static instances.
-	 */
-	private DB2(String dtpVendorName) {
-		super();
-		this.dtpVendorName = dtpVendorName;
-	}
-
-	@Override
-	public String getDTPVendorName() {
-		return this.dtpVendorName;
-	}
-
-	@Override
-	CatalogStrategy getCatalogStrategy() {
-		return UnknownCatalogStrategy.instance();  // not verified yet...
-	}
-
-	@Override
-	FoldingStrategy getFoldingStrategy() {
-		return UpperCaseFoldingStrategy.instance();
-	}
-
-	@Override
-	char[] getExtendedNormalNamePartCharacters() {
-		return EXTENDED_NORMAL_NAME_PART_CHARACTERS;
-	}
-	private static final char[] EXTENDED_NORMAL_NAME_PART_CHARACTERS = new char[] { '_' };
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Derby.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Derby.java
deleted file mode 100644
index de3421e60a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Derby.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.db.internal.vendor;
-
-import java.util.ArrayList;
-
-import org.eclipse.datatools.modelbase.sql.schema.Database;
-
-class Derby
-	extends AbstractVendor
-{
-	// singleton
-	private static final Vendor INSTANCE = new Derby();
-
-	/**
-	 * Return the singleton.
-	 */
-	static Vendor instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private Derby() {
-		super();
-	}
-
-	@Override
-	public String getDTPVendorName() {
-		return "Derby"; //$NON-NLS-1$
-	}
-
-	@Override
-	CatalogStrategy getCatalogStrategy() {
-		return FauxCatalogStrategy.instance();
-	}
-
-	@Override
-	FoldingStrategy getFoldingStrategy() {
-		return UpperCaseFoldingStrategy.instance();
-	}
-
-	@Override
-	void addDefaultSchemaIdentifiersTo(Database database, String userName, ArrayList<String> identifiers) {
-		identifiers.add(this.buildDefaultSchemaIdentifier(userName));
-	}
-
-	/**
-	 * The default user name on Derby is "APP".
-	 */
-	private String buildDefaultSchemaIdentifier(String userName) {
-		return ((userName != null) && (userName.length() != 0)) ? userName : DEFAULT_USER_NAME;
-	}
-	private static final String DEFAULT_USER_NAME = "APP";  //$NON-NLS-1$
-
-	@Override
-	char[] getExtendedNormalNamePartCharacters() {
-		return EXTENDED_NORMAL_NAME_PART_CHARACTERS;
-	}
-	private static final char[] EXTENDED_NORMAL_NAME_PART_CHARACTERS = new char[] { '_' };
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/FauxCatalogStrategy.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/FauxCatalogStrategy.java
deleted file mode 100644
index b5b5b4218d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/FauxCatalogStrategy.java
+++ /dev/null
@@ -1,73 +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.db.internal.vendor;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.datatools.modelbase.sql.schema.Catalog;
-import org.eclipse.datatools.modelbase.sql.schema.Database;
-import org.eclipse.datatools.modelbase.sql.schema.Schema;
-
-/**
- * Catalog strategy for DTP databases that build a "virtual" catalog (that has
- * no name) because the underlying JDBC driver does not return any catalogs
- * (e.g. Oracle).
- * @see java.sql.DatabaseMetaData#getCatalogs()
- */
-class FauxCatalogStrategy
-	implements CatalogStrategy
-{
-	// singleton
-	private static final CatalogStrategy INSTANCE = new FauxCatalogStrategy();
-
-	/**
-	 * Return the singleton.
-	 */
-	static CatalogStrategy instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private FauxCatalogStrategy() {
-		super();
-	}
-
-	public boolean supportsCatalogs(Database database) {
-		return false;
-	}
-
-	public List<Catalog> getCatalogs(Database database) {
-		return Collections.emptyList();
-	}
-
-	@SuppressWarnings("unchecked")
-	public List<Schema> getSchemas(Database database) {
-		return this.getFauxCatalog(database.getCatalogs()).getSchemas();
-	}
-
-	private Catalog getFauxCatalog(List<Catalog> catalogs) {
-		if (catalogs == null) {
-			throw new IllegalStateException();
-		}
-		if (catalogs.size() != 1) {
-			throw new IllegalStateException("not a single catalog: " + catalogs.size()); //$NON-NLS-1$
-		}
-
-		Catalog catalog = catalogs.get(0);
-		if (catalog.getName().length() != 0) {
-			throw new IllegalStateException("illegal name: " + catalog.getName()); //$NON-NLS-1$
-		}
-		return catalog;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/FoldingStrategy.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/FoldingStrategy.java
deleted file mode 100644
index 9527f568e2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/FoldingStrategy.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.db.internal.vendor;
-
-/**
- * Handle database-specific identifier-folding issues.
- */
-interface FoldingStrategy {
-
-	/**
-	 * Fold the specified name.
-	 */
-	String fold(String name);
-
-	/**
-	 * Return whether the specified database object name is already folded,
-	 * meaning, if it has no special characters, it requires no delimiters.
-	 */
-	boolean nameIsFolded(String name);
-
-	/**
-	 * Return whether the database is case-sensitive when using "normal"
-	 * (i.e. non-delimited) identifiers.
-	 */
-	boolean normalIdentifiersAreCaseSensitive();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/HSQLDB.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/HSQLDB.java
deleted file mode 100644
index 1b43bf89b9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/HSQLDB.java
+++ /dev/null
@@ -1,57 +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.db.internal.vendor;
-
-import java.util.ArrayList;
-
-import org.eclipse.datatools.modelbase.sql.schema.Database;
-
-class HSQLDB
-	extends AbstractVendor
-{
-	// singleton
-	private static final Vendor INSTANCE = new HSQLDB();
-
-	/**
-	 * Return the singleton.
-	 */
-	static Vendor instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private HSQLDB() {
-		super();
-	}
-
-	@Override
-	public String getDTPVendorName() {
-		return "HSQLDB"; //$NON-NLS-1$
-	}
-
-	@Override
-	CatalogStrategy getCatalogStrategy() {
-		return UnknownCatalogStrategy.instance();  // not verified yet...
-	}
-
-	@Override
-	FoldingStrategy getFoldingStrategy() {
-		return UpperCaseFoldingStrategy.instance();
-	}
-
-	@Override
-	void addDefaultSchemaIdentifiersTo(Database database, String userName, ArrayList<String> identifiers) {
-		identifiers.add(PUBLIC_SCHEMA_NAME);
-	}
-	private static final String PUBLIC_SCHEMA_NAME = "PUBLIC";  //$NON-NLS-1$
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Informix.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Informix.java
deleted file mode 100644
index 200c4b2de4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Informix.java
+++ /dev/null
@@ -1,59 +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.db.internal.vendor;
-
-class Informix
-	extends AbstractVendor
-{
-	// singleton
-	private static final Vendor INSTANCE = new Informix();
-
-	/**
-	 * Return the singleton.
-	 */
-	static Vendor instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private Informix() {
-		super();
-	}
-
-	@Override
-	public String getDTPVendorName() {
-		return "Informix"; //$NON-NLS-1$
-	}
-
-	@Override
-	CatalogStrategy getCatalogStrategy() {
-		return UnknownCatalogStrategy.instance();  // not verified yet...
-	}
-
-	@Override
-	FoldingStrategy getFoldingStrategy() {
-		return LowerCaseFoldingStrategy.instance();
-	}
-
-	@Override
-	char[] getExtendedNormalNameStartCharacters() {
-		return EXTENDED_NORMAL_NAME_START_CHARACTERS;
-	}
-	private static final char[] EXTENDED_NORMAL_NAME_START_CHARACTERS = new char[] { '_' };
-
-	@Override
-	char[] getExtendedNormalNamePartCharacters() {
-		return EXTENDED_NORMAL_NAME_PART_CHARACTERS;
-	}
-	private static final char[] EXTENDED_NORMAL_NAME_PART_CHARACTERS = new char[] { '$' };
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/LowerCaseFoldingStrategy.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/LowerCaseFoldingStrategy.java
deleted file mode 100644
index 833c70f1d2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/LowerCaseFoldingStrategy.java
+++ /dev/null
@@ -1,57 +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.db.internal.vendor;
-
-import org.eclipse.jpt.utility.internal.ClassTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * Fold "normal" identifiers to lower case.
- * Ignore the case of "normal" identifiers.
- */
-class LowerCaseFoldingStrategy
-	implements FoldingStrategy
-{
-
-	// singleton
-	private static final FoldingStrategy INSTANCE = new LowerCaseFoldingStrategy();
-
-	/**
-	 * Return the singleton.
-	 */
-	static FoldingStrategy instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private LowerCaseFoldingStrategy() {
-		super();
-	}
-
-	public String fold(String name) {
-		return name.toLowerCase();
-	}
-
-	public boolean nameIsFolded(String name) {
-		return StringTools.stringIsLowercase(name);
-	}
-
-	public boolean normalIdentifiersAreCaseSensitive() {
-		return false;
-	}
-
-	@Override
-	public String toString() {
-		return ClassTools.toStringClassNameForObject(this);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/MaxDB.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/MaxDB.java
deleted file mode 100644
index 7d0818c7d8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/MaxDB.java
+++ /dev/null
@@ -1,59 +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.db.internal.vendor;
-
-class MaxDB
-	extends AbstractVendor
-{
-	// singleton
-	private static final Vendor INSTANCE = new MaxDB();
-
-	/**
-	 * Return the singleton.
-	 */
-	static Vendor instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private MaxDB() {
-		super();
-	}
-
-	@Override
-	public String getDTPVendorName() {
-		return "MaxDB"; //$NON-NLS-1$
-	}
-
-	@Override
-	CatalogStrategy getCatalogStrategy() {
-		return UnknownCatalogStrategy.instance();  // not verified yet...
-	}
-
-	@Override
-	FoldingStrategy getFoldingStrategy() {
-		return UpperCaseFoldingStrategy.instance();
-	}
-
-	@Override
-	char[] getExtendedNormalNameStartCharacters() {
-		return EXTENDED_NORMAL_NAME_START_CHARACTERS;
-	}
-	private static final char[] EXTENDED_NORMAL_NAME_START_CHARACTERS = new char[] { '#', '@', '$' };
-
-	@Override
-	char[] getExtendedNormalNamePartCharacters() {
-		return EXTENDED_NORMAL_NAME_PART_CHARACTERS;
-	}
-	private static final char[] EXTENDED_NORMAL_NAME_PART_CHARACTERS = new char[] { '_' };
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/MySQL.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/MySQL.java
deleted file mode 100644
index a0847f0c56..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/MySQL.java
+++ /dev/null
@@ -1,109 +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.db.internal.vendor;
-
-import java.util.ArrayList;
-
-import org.eclipse.datatools.modelbase.sql.schema.Database;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-class MySQL
-	extends AbstractVendor
-{
-	// singleton
-	private static final Vendor INSTANCE = new MySQL();
-
-	/**
-	 * Return the singleton.
-	 */
-	static Vendor instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private MySQL() {
-		super();
-	}
-
-	@Override
-	public String getDTPVendorName() {
-		return "MySql"; //$NON-NLS-1$
-	}
-
-	/**
-	 * The DTP model for MySQL has a database that contains no catalogs;
-	 * but, instead, directly holds a single schema with the same name as
-	 * the database. (This is hard-coded in MySqlCatalogDatabase.getSchemas().)
-	 * Although you can qualify identifiers with a database name
-	 * in MySQL, only the database specified at login seems to be available
-	 * in the DTP model....
-	 * 
-	 * NB: In MySQL DDL, SCHEMA is a synonym for DATABASE; but the JDBC
-	 * method DatabaseMetaData.getSchemas() returns an empty list,
-	 * while getCatalogs() returns a list of the available databases.
-	 * You can also use the JDBC method Connection.setCatalog(String) to
-	 * set the default database.
-	 */
-	@Override
-	CatalogStrategy getCatalogStrategy() {
-		return NoCatalogStrategy.instance();
-	}
-
-	/**
-	 * MySQL is a bit unusual, so we force exact matches.
-	 * (e.g. MySQL folds database and table names to lowercase on Windows
-	 * by default; but that default can be changed by the
-	 * 'lower_case_table_names' system variable. This is because databases are
-	 * stored as directories and tables are stored as files in the underlying
-	 * O/S; and the case-sensitivity of the names is determined by the behavior
-	 * of filenames on the O/S. Then, to complicate things,
-	 * none of the other identifiers, like table and column names, are folded;
-	 * but they are case-insensitive, unless delimited. See
-	 * http://dev.mysql.com/doc/refman/6.0/en/identifier-case-sensitivity.html.)
-	 */
-	@Override
-	FoldingStrategy getFoldingStrategy() {
-		return NonFoldingStrategy.instance();
-	}
-
-	@Override
-	void addDefaultSchemaIdentifiersTo(Database database, String userName, ArrayList<String> identifiers) {
-		identifiers.add(database.getName());  // hmmm... ~bjv
-	}
-
-	/**
-	 * MySQL is the only vendor that allows a digit.
-	 * Although, the name cannnot be *all* digits.
-	 */
-	@Override
-	boolean characterIsNormalNameStart(char c) {
-		return Character.isDigit(c) || super.characterIsNormalNameStart(c);
-	}
-
-	@Override
-	char[] getExtendedNormalNameStartCharacters() {
-		return EXTENDED_NORMAL_NAME_START_CHARACTERS;
-	}
-	private static final char[] EXTENDED_NORMAL_NAME_START_CHARACTERS = new char[] { '_', '$' };
-
-	/**
-	 * By default, MySQL delimits identifiers with backticks (`); but it
-	 * can also be configured to use double-quotes.
-	 */
-	@Override
-	boolean identifierIsDelimited(String identifier) {
-		return StringTools.stringIsDelimited(identifier, BACKTICK)
-					|| super.identifierIsDelimited(identifier);
-	}
-	private static final char BACKTICK = '`';
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/NoCatalogStrategy.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/NoCatalogStrategy.java
deleted file mode 100644
index a7fb79d9ba..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/NoCatalogStrategy.java
+++ /dev/null
@@ -1,56 +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.db.internal.vendor;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.datatools.modelbase.sql.schema.Catalog;
-import org.eclipse.datatools.modelbase.sql.schema.Database;
-import org.eclipse.datatools.modelbase.sql.schema.Schema;
-
-/**
- * Catalog strategy for DTP databases that do not have catalogs
- * (e.g. MySQL see bug 249013).
- */
-class NoCatalogStrategy
-	implements CatalogStrategy
-{
-	// singleton
-	private static final CatalogStrategy INSTANCE = new NoCatalogStrategy();
-
-	/**
-	 * Return the singleton.
-	 */
-	static CatalogStrategy instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private NoCatalogStrategy() {
-		super();
-	}
-
-	public boolean supportsCatalogs(Database database) {
-		return false;
-	}
-
-	public List<Catalog> getCatalogs(Database database) {
-		return Collections.emptyList();
-	}
-
-	@SuppressWarnings("unchecked")
-	public List<Schema> getSchemas(Database database) {
-		return database.getSchemas();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/NonFoldingStrategy.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/NonFoldingStrategy.java
deleted file mode 100644
index e63c1ad71d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/NonFoldingStrategy.java
+++ /dev/null
@@ -1,66 +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.db.internal.vendor;
-
-import org.eclipse.jpt.utility.internal.ClassTools;
-
-/**
- * Do not fold "normal" identifiers.
- * Respect the case of "normal" identifiers.
- */
-class NonFoldingStrategy
-	implements FoldingStrategy
-{
-
-	// singleton
-	private static final FoldingStrategy INSTANCE = new NonFoldingStrategy();
-
-	/**
-	 * Return the singleton.
-	 */
-	static FoldingStrategy instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private NonFoldingStrategy() {
-		super();
-	}
-
-	/**
-	 * Since identifiers are not folded to upper- or lower-case, the name is
-	 * already "folded".
-	 */
-	public String fold(String name) {
-		return name;
-	}
-
-	/**
-	 * Since identifiers are not folded to upper- or lower-case, the name is
-	 * already "folded".
-	 * (Non-folding databases do not require delimiters around mixed-case
-	 * "normal" identifiers.)
-	 */
-	public boolean nameIsFolded(String name) {
-		return true;
-	}
-
-	public boolean normalIdentifiersAreCaseSensitive() {
-		return true;
-	}
-
-	@Override
-	public String toString() {
-		return ClassTools.toStringClassNameForObject(this);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Oracle.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Oracle.java
deleted file mode 100644
index cb04f9f36c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Oracle.java
+++ /dev/null
@@ -1,53 +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.db.internal.vendor;
-
-class Oracle
-	extends AbstractVendor
-{
-	// singleton
-	private static final Vendor INSTANCE = new Oracle();
-
-	/**
-	 * Return the singleton.
-	 */
-	static Vendor instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private Oracle() {
-		super();
-	}
-
-	@Override
-	public String getDTPVendorName() {
-		return "Oracle"; //$NON-NLS-1$
-	}
-
-	@Override
-	CatalogStrategy getCatalogStrategy() {
-		return FauxCatalogStrategy.instance();
-	}
-
-	@Override
-	FoldingStrategy getFoldingStrategy() {
-		return UpperCaseFoldingStrategy.instance();
-	}
-
-	@Override
-	char[] getExtendedNormalNamePartCharacters() {
-		return EXTENDED_NORMAL_NAME_PART_CHARACTERS;
-	}
-	private static final char[] EXTENDED_NORMAL_NAME_PART_CHARACTERS = new char[] { '_', '$', '#' };
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/PostgreSQL.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/PostgreSQL.java
deleted file mode 100644
index 8e6a2db12d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/PostgreSQL.java
+++ /dev/null
@@ -1,93 +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.db.internal.vendor;
-
-import java.util.ArrayList;
-
-import org.eclipse.datatools.modelbase.sql.schema.Catalog;
-import org.eclipse.datatools.modelbase.sql.schema.Database;
-
-class PostgreSQL
-	extends AbstractVendor
-{
-	// singleton
-	private static final Vendor INSTANCE = new PostgreSQL();
-
-	/**
-	 * Return the singleton.
-	 */
-	static Vendor instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private PostgreSQL() {
-		super();
-	}
-
-	@Override
-	public String getDTPVendorName() {
-		return "postgres"; //$NON-NLS-1$
-	}
-
-	/**
-	 * The PostgreSQL JDBC driver returns a single catalog from the call to
-	 * DatabaseMetaData.getCatalogs() that has the same name as the
-	 * database initially specified by the connection (in the JDBC URL).
-	 * DTP uses this configuration unmodified. Unfortunately, the DTP
-	 * database's name is not the same as the PostgreSQL database's
-	 * name.
-	 */
-	@Override
-	CatalogStrategy getCatalogStrategy() {
-		return SimpleCatalogStrategy.instance();
-	}
-
-	@Override
-	FoldingStrategy getFoldingStrategy() {
-		return LowerCaseFoldingStrategy.instance();
-	}
-
-	/**
-	 * The PostgreSQL database holds a single catalog that has the same name as
-	 * the database.
-	 */
-	@Override
-	void addDefaultCatalogIdentifiersTo(Database database, String userName, ArrayList<String> identifiers) {
-		identifiers.add(((Catalog) database.getCatalogs().get(0)).getName());
-	}
-
-	/**
-	 * PostgreSQL has a "schema search path". The default is:
-	 *     "$user",public
-	 * If "$user" is not found, return "public".
-	 */
-	@Override
-	void addDefaultSchemaIdentifiersTo(Database database, String userName, ArrayList<String> identifiers) {
-		super.addDefaultSchemaIdentifiersTo(database, userName, identifiers);
-		identifiers.add(PUBLIC_SCHEMA_NAME);
-	}
-	private static final String PUBLIC_SCHEMA_NAME = "public";  //$NON-NLS-1$
-
-	@Override
-	char[] getExtendedNormalNameStartCharacters() {
-		return EXTENDED_NORMAL_NAME_START_CHARACTERS;
-	}
-	private static final char[] EXTENDED_NORMAL_NAME_START_CHARACTERS = new char[] { '_' };
-
-	@Override
-	char[] getExtendedNormalNamePartCharacters() {
-		return EXTENDED_NORMAL_NAME_PART_CHARACTERS;
-	}
-	private static final char[] EXTENDED_NORMAL_NAME_PART_CHARACTERS = new char[] { '$' };
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/SQLServer.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/SQLServer.java
deleted file mode 100644
index 9de6b76543..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/SQLServer.java
+++ /dev/null
@@ -1,87 +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.db.internal.vendor;
-
-import java.util.ArrayList;
-
-import org.eclipse.datatools.modelbase.sql.schema.Database;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-class SQLServer
-	extends AbstractVendor
-{
-	// singleton
-	private static final Vendor INSTANCE = new SQLServer();
-
-	/**
-	 * Return the singleton.
-	 */
-	static Vendor instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private SQLServer() {
-		super();
-	}
-
-	@Override
-	public String getDTPVendorName() {
-		return "SQL Server"; //$NON-NLS-1$
-	}
-
-	@Override
-	CatalogStrategy getCatalogStrategy() {
-		return SimpleCatalogStrategy.instance();
-	}
-
-	/**
-	 * By default, SQL Server identifiers are case-sensitive, even without
-	 * delimiters. This can depend on the collation setting....
-	 */
-	@Override
-	FoldingStrategy getFoldingStrategy() {
-		return NonFoldingStrategy.instance();
-	}
-
-	/**
-	 * The default schema on SQL Server for any database (catalog) is 'dbo'.
-	 */
-	@Override
-	void addDefaultSchemaIdentifiersTo(Database database, String userName, ArrayList<String> identifiers) {
-		identifiers.add(DEFAULT_SCHEMA_NAME);
-	}
-	private static final String DEFAULT_SCHEMA_NAME = "dbo";  //$NON-NLS-1$
-
-	@Override
-	char[] getExtendedNormalNameStartCharacters() {
-		return EXTENDED_NORMAL_NAME_START_CHARACTERS;
-	}
-	private static final char[] EXTENDED_NORMAL_NAME_START_CHARACTERS = new char[] { '_', '@', '#' };
-
-	@Override
-	char[] getExtendedNormalNamePartCharacters() {
-		return EXTENDED_NORMAL_NAME_PART_CHARACTERS;
-	}
-	private static final char[] EXTENDED_NORMAL_NAME_PART_CHARACTERS = new char[] { '$' };
-
-	/**
-	 * By default, SQL Server delimits identifiers with brackets ([]); but it
-	 * can also be configured to use double-quotes.
-	 */
-	@Override
-	boolean identifierIsDelimited(String identifier) {
-		return StringTools.stringIsBracketed(identifier)
-					|| super.identifierIsDelimited(identifier);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/SimpleCatalogStrategy.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/SimpleCatalogStrategy.java
deleted file mode 100644
index 8a1a04129e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/SimpleCatalogStrategy.java
+++ /dev/null
@@ -1,57 +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.db.internal.vendor;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.datatools.modelbase.sql.schema.Catalog;
-import org.eclipse.datatools.modelbase.sql.schema.Database;
-import org.eclipse.datatools.modelbase.sql.schema.Schema;
-
-/**
- * Catalog strategy for DTP databases that simply model the catalogs returned
- * by the underlying JDBC driver (e.g. Sybase).
- * @see java.sql.DatabaseMetaData#getCatalogs()
- */
-class SimpleCatalogStrategy
-	implements CatalogStrategy
-{
-	// singleton
-	private static final CatalogStrategy INSTANCE = new SimpleCatalogStrategy();
-
-	/**
-	 * Return the singleton.
-	 */
-	static CatalogStrategy instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private SimpleCatalogStrategy() {
-		super();
-	}
-
-	public boolean supportsCatalogs(Database database) {
-		return true;
-	}
-
-	@SuppressWarnings("unchecked")
-	public List<Catalog> getCatalogs(Database database) {
-		return database.getCatalogs();
-	}
-
-	public List<Schema> getSchemas(Database database) {
-		return Collections.emptyList();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Sybase.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Sybase.java
deleted file mode 100644
index 8dcfcbac48..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Sybase.java
+++ /dev/null
@@ -1,103 +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.db.internal.vendor;
-
-import java.util.ArrayList;
-
-import org.eclipse.datatools.modelbase.sql.schema.Database;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-class Sybase
-	extends AbstractVendor
-{
-	private final String dtpVendorName;
-
-	static final Vendor ASA = new Sybase("Sybase_ASA"); //$NON-NLS-1$
-	static final Vendor ASE = new Sybase("Sybase_ASE"); //$NON-NLS-1$
-
-	static Vendor asa() {
-		return ASA;
-	}
-
-	static Vendor ase() {
-		return ASE;
-	}
-
-	/**
-	 * Ensure only static instances.
-	 */
-	private Sybase(String dtpVendorName) {
-		super();
-		this.dtpVendorName = dtpVendorName;
-	}
-
-	@Override
-	public String getDTPVendorName() {
-		return this.dtpVendorName;
-	}
-
-	@Override
-	CatalogStrategy getCatalogStrategy() {
-		return SimpleCatalogStrategy.instance();
-	}
-
-	/**
-	 * By default, Sybase identifiers are case-sensitive, even without
-	 * delimiters. This can depend on the collation setting....
-	 */
-	@Override
-	FoldingStrategy getFoldingStrategy() {
-		return NonFoldingStrategy.instance();
-	}
-
-	/**
-	 * The typical default schema on Sybase for any database (catalog) is
-	 * 'dbo'.
-	 * 
-	 * Actually, the default schema is more like a search path:
-	 * The server looks for a schema object (e.g table) first in the user's
-	 * schema, the it look for the schema object in the database owner's
-	 * schema (dbo). As a result, it's really not possible to specify
-	 * the "default" schema without knowing the schema object we are
-	 * looking for.
-	 * 
-	 * (Note: the current 'user' is not the same thing as the current
-	 * 'login' - see sp_adduser and sp_addlogin; so we probably can't
-	 * use ConnectionProfile#getUserName().)
-	 */
-	@Override
-	void addDefaultSchemaIdentifiersTo(Database database, String userName, ArrayList<String> identifiers) {
-		identifiers.add(DEFAULT_SCHEMA_NAME);
-	}
-	private static final String DEFAULT_SCHEMA_NAME = "dbo";  //$NON-NLS-1$
-
-	@Override
-	char[] getExtendedNormalNameStartCharacters() {
-		return EXTENDED_NORMAL_NAME_START_CHARACTERS;
-	}
-	private static final char[] EXTENDED_NORMAL_NAME_START_CHARACTERS = new char[] { '_', '@' };
-
-	@Override
-	char[] getExtendedNormalNamePartCharacters() {
-		return EXTENDED_NORMAL_NAME_PART_CHARACTERS;
-	}
-	private static final char[] EXTENDED_NORMAL_NAME_PART_CHARACTERS = new char[] { '$', '¥', '£', '#' };
-
-	/**
-	 * By default, Sybase delimits identifiers with brackets ([]); but it
-	 * can also be configured to use double-quotes.
-	 */
-	@Override
-	boolean identifierIsDelimited(String identifier) {
-		return StringTools.stringIsBracketed(identifier)
-					|| super.identifierIsDelimited(identifier);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/UnknownCatalogStrategy.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/UnknownCatalogStrategy.java
deleted file mode 100644
index ea9a729e35..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/UnknownCatalogStrategy.java
+++ /dev/null
@@ -1,87 +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.db.internal.vendor;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.datatools.modelbase.sql.schema.Catalog;
-import org.eclipse.datatools.modelbase.sql.schema.Database;
-import org.eclipse.datatools.modelbase.sql.schema.Schema;
-
-/**
- * Catalog strategy for unknown DTP databases.
- * @see java.sql.DatabaseMetaData#getCatalogs()
- */
-class UnknownCatalogStrategy
-	implements CatalogStrategy
-{
-	// singleton
-	private static final CatalogStrategy INSTANCE = new UnknownCatalogStrategy();
-
-	/**
-	 * Return the singleton.
-	 */
-	static CatalogStrategy instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private UnknownCatalogStrategy() {
-		super();
-	}
-
-	@SuppressWarnings("unchecked")
-	public boolean supportsCatalogs(Database database) {
-		List<Catalog> catalogs = database.getCatalogs();
-		if ((catalogs == null) || catalogs.isEmpty()) {
-			return false;
-		}
-
-		return this.getFauxCatalog(catalogs) == null;
-	}
-
-	@SuppressWarnings("unchecked")
-	public List<Catalog> getCatalogs(Database database) {
-		List<Catalog> catalogs = database.getCatalogs();
-		// if there are no catalogs, the database must hold the schemata directly
-		if ((catalogs == null) || catalogs.isEmpty()) {
-			return Collections.emptyList();
-		}
-
-		Catalog fauxCatalog = this.getFauxCatalog(catalogs);
-		return (fauxCatalog == null) ? catalogs : Collections.<Catalog>emptyList();
-	}
-
-	@SuppressWarnings("unchecked")
-	public List<Schema> getSchemas(Database database) {
-		List<Catalog> catalogs = database.getCatalogs();
-		// if there are no catalogs, the database must hold the schemata directly
-		if ((catalogs == null) || catalogs.isEmpty()) {
-			return database.getSchemas();
-		}
-
-		Catalog fauxCatalog = this.getFauxCatalog(catalogs);
-		return (fauxCatalog != null) ? fauxCatalog.getSchemas() : Collections.emptyList();
-	}
-
-	private Catalog getFauxCatalog(List<Catalog> catalogs) {
-		if (catalogs.size() == 1) {
-			Catalog catalog = catalogs.get(0);
-			if (catalog.getName().equals("")) { //$NON-NLS-1$
-				return catalog;
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/UnrecognizedVendor.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/UnrecognizedVendor.java
deleted file mode 100644
index f5751232ff..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/UnrecognizedVendor.java
+++ /dev/null
@@ -1,58 +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.db.internal.vendor;
-
-/**
- * 
- */
-class UnrecognizedVendor
-	extends AbstractVendor
-{
-	// singleton
-	private static final Vendor INSTANCE = new UnrecognizedVendor();
-
-	/**
-	 * Return the singleton.
-	 */
-	static Vendor instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private UnrecognizedVendor() {
-		super();
-	}
-
-	@Override
-	public String getDTPVendorName() {
-		return "Unrecognized Vendor"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Not sure what to do here....
-	 * Assume the DTP database is organized into one or more catalogs and
-	 * the schemata are contained by those catalogs. This appears to be the
-	 * default way DTP builds models these days (i.e. a database with at
-	 * least one catalog, instead of the database holding schemata
-	 * directly).
-	 */
-	@Override
-	CatalogStrategy getCatalogStrategy() {
-		return UnknownCatalogStrategy.instance();
-	}
-
-	@Override
-	FoldingStrategy getFoldingStrategy() {
-		return UpperCaseFoldingStrategy.instance();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/UpperCaseFoldingStrategy.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/UpperCaseFoldingStrategy.java
deleted file mode 100644
index 748d4dd162..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/UpperCaseFoldingStrategy.java
+++ /dev/null
@@ -1,57 +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.db.internal.vendor;
-
-import org.eclipse.jpt.utility.internal.ClassTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * Fold "normal" identifiers to upper case.
- * Ignore the case of "normal" identifiers.
- */
-class UpperCaseFoldingStrategy
-	implements FoldingStrategy
-{
-
-	// singleton
-	private static final FoldingStrategy INSTANCE = new UpperCaseFoldingStrategy();
-
-	/**
-	 * Return the singleton.
-	 */
-	static FoldingStrategy instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private UpperCaseFoldingStrategy() {
-		super();
-	}
-
-	public String fold(String name) {
-		return name.toUpperCase();
-	}
-
-	public boolean nameIsFolded(String name) {
-		return StringTools.stringIsUppercase(name);
-	}
-
-	public boolean normalIdentifiersAreCaseSensitive() {
-		return false;
-	}
-
-	@Override
-	public String toString() {
-		return ClassTools.toStringClassNameForObject(this);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Vendor.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Vendor.java
deleted file mode 100644
index c73d774eb0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Vendor.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.db.internal.vendor;
-
-import java.util.List;
-
-import org.eclipse.datatools.modelbase.sql.schema.Catalog;
-import org.eclipse.datatools.modelbase.sql.schema.Database;
-import org.eclipse.datatools.modelbase.sql.schema.Schema;
-
-/**
- * Delegate vendor-specific behavior to implementations of this interface:
- *   - catalog support
- *   - default catalog and schema
- *   - converting names to identifiers and vice-versa
- * 
- * Note:
- * We use "name" when dealing with the unmodified name of a database object
- * as supplied by the database itself (i.e. it is not delimited and it is always
- * case-sensitive).
- * We use "identifier" when dealing with a string representation of a database
- * object name (i.e. it may be delimited and, depending on the vendor, it may
- * be case-insensitive).
- */
-public interface Vendor {
-
-	/**
-	 * This must match the DTP vendor name.
-	 * @see org.eclipse.datatools.modelbase.sql.schema.Database#getVendor()
-	 */
-	String getDTPVendorName();
-
-	/**
-	 * Return whether the vendor supports "real" catalogs (e.g. Sybase).
-	 */
-	boolean supportsCatalogs(Database database);
-
-	/**
-	 * Return the specified database's catalogs.
-	 */
-	List<Catalog> getCatalogs(Database database);
-
-	/**
-	 * Return the specified database's default catalog identifiers for the
-	 * specified user.
-	 */
-	List<String> getDefaultCatalogIdentifiers(Database database, String userName);
-
-	/**
-	 * Return the specified database's schemas.
-	 */
-	List<Schema> getSchemas(Database database);
-
-	/**
-	 * Return the specified database's default schema identifiers for the
-	 * specified user.
-	 */
-	List<String> getDefaultSchemaIdentifiers(Database database, String userName);
-
-	/**
-	 * Convert the specified database object name to a vendor identifier.
-	 * Return null if the identifier matches the specified default name.
-	 */
-	String convertNameToIdentifier(String name, String defaultName);
-
-	/**
-	 * Convert the specified database object name to a vendor identifier.
-	 */
-	String convertNameToIdentifier(String name);
-
-	/**
-	 * Convert the specified database object identifier to a vendor name.
-	 */
-	String convertIdentifierToName(String identifier);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/VendorRepository.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/VendorRepository.java
deleted file mode 100644
index 468f09ea44..0000000000
--- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/VendorRepository.java
+++ /dev/null
@@ -1,78 +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.db.internal.vendor;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-public class VendorRepository {
-	private final Vendor[] vendors;
-
-	// singleton
-	private static final VendorRepository INSTANCE = new VendorRepository();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static VendorRepository instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private VendorRepository() {
-		super();
-		this.vendors = this.buildVendors();
-	}
-
-	private Vendor[] buildVendors() {
-		ArrayList<Vendor> list = new ArrayList<Vendor>();
-		this.addVendorsTo(list);
-		return list.toArray(new Vendor[list.size()]);
-	}
-
-	private void addVendorsTo(ArrayList<Vendor> list) {
-		this.addVendorTo(DB2.udb(), list);
-		this.addVendorTo(DB2.udbISeries(), list);
-		this.addVendorTo(DB2.udbZSeries(), list);
-		this.addVendorTo(Derby.instance(), list);
-		this.addVendorTo(HSQLDB.instance(), list);
-		this.addVendorTo(Informix.instance(), list);
-		this.addVendorTo(MaxDB.instance(), list);
-		this.addVendorTo(MySQL.instance(), list);
-		this.addVendorTo(Oracle.instance(), list);
-		this.addVendorTo(PostgreSQL.instance(), list);
-		this.addVendorTo(SQLServer.instance(), list);
-		this.addVendorTo(Sybase.asa(), list);
-		this.addVendorTo(Sybase.ase(), list);
-	}
-
-	private void addVendorTo(Vendor vendor, ArrayList<Vendor> list) {
-		String name = vendor.getDTPVendorName();
-		for (Iterator<Vendor> stream = list.iterator(); stream.hasNext(); ) {
-			if (stream.next().getDTPVendorName().equals(name)) {
-				throw new IllegalArgumentException("Duplicate vendor: " + name); //$NON-NLS-1$
-			}
-		}
-		list.add(vendor);
-	}
-
-	public Vendor getVendor(String dtpVendorName) {
-		for (int i = this.vendors.length; i-- > 0;) {
-			Vendor vendor = this.vendors[i];
-			if (vendor.getDTPVendorName().equals(dtpVendorName)) {
-				return vendor;
-			}
-		}
-		return UnrecognizedVendor.instance();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/.project b/jpa/plugins/org.eclipse.jpt.doc.user/.project
deleted file mode 100644
index 61670ff4fc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jpt.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 7f327f0c93..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.jpt.doc.user;singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.help;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.ui.cheatsheets;bundle-version="[3.3.100,4.0.0)"
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/about.htm b/jpa/plugins/org.eclipse.jpt.doc.user/about.htm
deleted file mode 100644
index 6c3af6e2fe..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/about.htm
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:55 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>About this content</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="About this content" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref257" name="sthref257"></a>
-<h1>About this content</h1>
-<p>January, 2008</p>
-<a id="sthref258" name="sthref258"></a>
-<p class="subhead2">License</p>
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <code><a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></code>. For purposes of the EPL, "Program" will mean the Content.</p>
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <code><a href="http://www.eclipse.org">http://www.eclipse.org</a></code>.</p>
-</div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/about.html b/jpa/plugins/org.eclipse.jpt.doc.user/about.html
deleted file mode 100644
index 6c3af6e2fe..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/about.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:55 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>About this content</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="About this content" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref257" name="sthref257"></a>
-<h1>About this content</h1>
-<p>January, 2008</p>
-<a id="sthref258" name="sthref258"></a>
-<p class="subhead2">License</p>
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <code><a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></code>. For purposes of the EPL, "Program" will mean the Content.</p>
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <code><a href="http://www.eclipse.org">http://www.eclipse.org</a></code>.</p>
-</div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/build.properties b/jpa/plugins/org.eclipse.jpt.doc.user/build.properties
deleted file mode 100644
index 4ecd752108..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/build.properties
+++ /dev/null
@@ -1,115 +0,0 @@
-bin.includes = cheatsheets/,\
-               dcommon/,\
-               img/,\
-               META-INF/,\
-               about.html,\
-               build.properties,\
-               concept_mapping.htm,\
-               concept_persistence.htm,\
-               concepts.htm,\
-               concepts001.htm,\
-               concepts002.htm,\
-               concepts003.htm,\
-               contexts.xml,\
-               getting_started.htm,\
-               getting_started001.htm,\
-               getting_started002.htm,\
-               getting_started003.htm,\
-               getting_started004.htm,\
-               index.xml,\
-               legal.htm,\
-               plugin.properties,\
-               plugin.xml,\
-               ref_details_orm.htm,\
-               ref_jpa_facet.htm,\
-               ref_mapping_general.htm,\
-               ref_new_jpa_project.htm,\
-               ref_new_jpa_project_wizard.htm,\
-               ref_persistence_map_view.htm,\
-               ref_persistence_outline.htm,\
-               ref_persistence_perspective.htm,\
-               ref_persistence_prop_view.htm,\
-               ref_primary_key.htm,\
-               ref_project_properties.htm,\
-               reference.htm,\
-               reference001.htm,\
-               reference002.htm,\
-               reference003.htm,\
-               reference004.htm,\
-               reference005.htm,\
-               reference006.htm,\
-               reference007.htm,\
-               reference008.htm,\
-               reference009.htm,\
-               reference010.htm,\
-               reference011.htm,\
-               reference012.htm,\
-               reference013.htm,\
-               reference014.htm,\
-               reference015.htm,\
-               reference016.htm,\
-               reference017.htm,\
-               reference018.htm,\
-               task_add_persistence.htm,\
-               task_additonal_tables.htm,\
-               task_create_new_project.htm,\
-               task_generate_entities.htm,\
-               task_inheritance.htm,\
-               task_manage_orm.htm,\
-               task_manage_persistence.htm,\
-               task_mapping.htm,\
-               tasks.htm,\
-               tasks001.htm,\
-               tasks002.htm,\
-               tasks003.htm,\
-               tasks004.htm,\
-               tasks005.htm,\
-               tasks006.htm,\
-               tasks007.htm,\
-               tasks008.htm,\
-               tasks009.htm,\
-               tasks010.htm,\
-               tasks011.htm,\
-               tasks012.htm,\
-               tasks013.htm,\
-               tasks014.htm,\
-               tasks015.htm,\
-               tasks016.htm,\
-               tasks017.htm,\
-               tasks018.htm,\
-               tasks019.htm,\
-               tasks020.htm,\
-               tasks021.htm,\
-               tasks022.htm,\
-               tips_and_tricks.htm,\
-               toc.xml,\
-               whats_new.htm,\
-               whats_new001.htm,\
-               whats_new002.htm,\
-               whats_new003.htm,\
-               about.htm,\
-               reference019.htm,\
-               reference020.htm,\
-               reference021.htm,\
-               reference022.htm,\
-               reference023.htm,\
-               reference024.htm,\
-               reference025.htm,\
-               reference026.htm,\
-               reference027.htm,\
-               reference028.htm,\
-               reference030.htm,\
-               reference029.htm,\
-               reference031.htm,\
-               reference032.htm,\
-               reference033.htm,\
-               reference034.htm,\
-               tasks023.htm,\
-               tasks024.htm,\
-               tasks025.htm,\
-               whats_new004.htm,\
-               whats_new005.htm,\
-               whats_new006.htm,\
-               whats_new007.htm,\
-               whats_new008.htm
-generateSourceBundle=false
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/add_persistence.xml b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/add_persistence.xml
deleted file mode 100644
index 6dbeedbeca..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/add_persistence.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cheatsheet title="Create a JPA Project">
-   <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
-      <description>
-         This cheat sheet will automatically launch wizards, perform actions, and guide you through the steps to create a JPA project. 
-
-To learn more about using cheat sheets, or to see a list of available cheat sheets, click Help (?). 
-To start work working on this cheat sheet click the &quot;Click to Begin&quot; button below. 
-
-Let&apos;s get started!
-      </description>
-   </intro>
-   <item title="Setup the Environment" dialog="false" skip="true" href="/org.eclipse.datatools.doc.user/c_database_development_setup.html">
-      <description>
-         Your environment must be set up before you can perform the steps in this cheat sheet. 
-
-Create a database profile and connect to the database.
-
-The Database Connection dialog automatically appears when you click the &quot;Click to Perform&quot; button.
-      </description>
-      <command serialization="org.eclipse.datatools.sqltools.sqleditor.attachProfileAction" confirm="false">
-      </command>
-   </item>
-   <item title="Create a JPA Project" dialog="false" skip="false" href="/org.eclipse.jpt.doc.user/task_create_new_project.htm">
-      <description>
-         Use the New Project Wizard to create a JPA project. 
-Select <b>File-&gt;New-&gt;Project...</b> and choose <b>JPA-&gt;JPA Project</b> in the list. 
-
-On the first page of the wizard, enter a project name and location, select your target runtime, and select a predefined project configuration.
-
-Click <b>Next</b> to display the next page of the wizard.
-
-The &quot;New JPA Project&quot; wizard is automatically displayed when you click the &quot;Click to Perform&quot; button.
-      </description>
-      <action class="org.eclipse.jdt.internal.ui.wizards.OpenProjectWizardAction" pluginId="org.eclipse.jdt.ui" confirm="false">
-      </action>
-   </item>
-   <item title="Select Project Facet" dialog="false" skip="false" href="/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html">
-      <description>
-         Use the Project Facet page to select a predefined project configuration or specific specific facets to include in the project. 
-
-Click &quot;Next&quot; to display the next page of the wizard.
-      </description>
-   </item>
-   <item title="Specify the JPA Facet" dialog="false" skip="false" href="/org.eclipse.jdt.doc.user/ref_jpa_facet.htm">
-      <description>
-         Use the JPA Facet page to specify the the vendor-specific JPA platform, the database connection to use, and the specific JPA implementation library. 
-
-You can also specify if Dali should create an orm.xml file.
-
-If you do not have an active database connection, click <b>Add Connections</b> to create one. 
-
-If you do not have a defined JPA implementation library, click <b>Configure default JPA implementation library</b> or <b>Configure user libraries</b> to define one. 
-
-Click <b>Finish</b> to complete the wizard and open the open the project.
-      </description>
-   </item>
-   <item title="Finish" dialog="false" skip="false">
-      <description>
-         Congratulations! You have successfully created a JPA project. Complete the additional cheat sheets to add Java persistent entities and map those entities to database tables.
-      </description>
-   </item>
-</cheatsheet>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/create_entity.xml b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/create_entity.xml
deleted file mode 100644
index b64e8afdee..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/create_entity.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cheatsheet title="Create a Persistent Entity">
-	<intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
-		<description>
-This cheat sheet will automatically launch wizards, perform actions, and guide you through the steps to add a Java persistent entity to your Java project. 
-To learn more about using cheat sheets or to see a list of available cheat sheets, click Help (?). 
-To start work working on this cheat sheet, click the <b>Click to Begin</b> button below. 
-Let's get started!
-  </description>
-	</intro>
-	<item title="Create a JPA Project" skip="true">
-		<description>
-To create a Persistent entity, you must create a JPA project. If you already have a JPA project, you may skip this step by clicking the "Click to Skip" button.
-If not, select <b>File->New->Project...</b> and choose <b>JPA->JPA Project</b> in the list. Complete each page of the Create JPA Project wizard to create a new JPA project.
-      </description>
-	</item>
-	<item title="Open the JPA Development Perspective" skip="true" href="/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm">
-		<action pluginId="org.eclipse.ui.cheatsheets" class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" param1="org.eclipse.jpt.ui.PersistencePerspective"/>
-		<description>
-When working with JPA  persistence, you should use the Persistence perspective. If you already have the Persistence perspective active, you may skip this step by clicking the "Click to Skip" button. 
-If not, select <b>Window->Open Perspective->Other</b> in the menubar at the top of the workbench. In the Select Perspectives dialog, select <b>JPA Development</b> and click OK. This step changes the perspective to set up the Eclipse workbench for JPA development.
-You can click the "Click to Perform" button to have the "Persistence" perspective opened automatically.
-   </description>
-	</item>
-	<item title="Create a Java Class">
-		<description>
-The next step is to create a new Java class. In the main toolbar again, click on <b>New Java Class</b> button (or the link below).
-The Java editor will automatically open showing your new class.      
-     </description>
-	</item>
-	<item title="Create a Persistent Entity">
-		<description>
-Finally we will make the Java class a persistent entity.
-In the JPA Structure view select the Java class. 
-In the JPA Details view, use the "Map As" field to select <b>Entity</b>. Dali automatically adds the @Entity annotation to the class in the Java editor. 
-Use the Table, Catalog, and Schema fields to associate the entity with a specific table in the database.
-     </description>
-	</item>
-	<item title="Finish">
-		<description>
-Congratulations! You have successfully added a JPA entity to your JPA project. Complete the additional cheat sheets to map the entity's fields to database tables.
-  </description>
-	</item>
-</cheatsheet>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml
deleted file mode 100644
index 63307f226e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cheatsheet title="Map a Java Persistent Entity">
-   <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
-      <description>
-         This cheat sheet will automatically launch wizards, perform actions, and guide you through the steps to map the fields of a JPA entity entity to your database.
-
-To learn more about using cheat sheets or to see a list of available cheat sheets, click Help (?). 
-To start work working on this cheat sheet, click the &quot;Click to Begin&quot; button below. 
-
-Let&apos;s get started!
-      </description>
-   </intro>
-   <item title="Setup the Environment" dialog="false" skip="true" href="/org.eclipse.datatools.doc.user/c_database_development_setup.html">
-      <description>
-         Your environment must be set up before you can perform the steps in this cheat sheet. 
-
-Create a database profile and connect to the database.
-
-If you already have (and are connected to) a database connection, you  may skip this step by clicking the &quot;Click to Skip&quot; button.
-
-The Database Connection dialog automatically appears when you click the &quot;Click to Perform&quot; button.
-      </description>
-      <command serialization="org.eclipse.datatools.sqltools.sqleditor.attachProfileAction" confirm="false">
-      </command>
-   </item>
-   <item title="Create a JPA Project" dialog="false" skip="true" href="/org.eclipse.jpt.doc.user/task_create_new_project.htm">
-      <description>
-         Use the New Project Wizard to create a JPA project. 
-Select <b>File-&gt;New-&gt;Project...</b> and choose <b>JPA-&gt;JPA Project</b> in the list. 
-
-Complete each page of the wizard to create a new JPA project.
-
-The &quot;New JPA Project&quot; wizard is automatically displayed when you click the &quot;Click to Perform&quot; button.
-
-If you already have a JPA project, you  may skip this step by clicking the &quot;Click to Skip&quot; button.
-      </description>
-      <action class="org.eclipse.jdt.internal.ui.wizards.OpenProjectWizardAction" pluginId="org.eclipse.jdt.ui" confirm="false">
-      </action>
-   </item>
-   <item title="Open the JPA Development Perspective" dialog="false" skip="true" href="/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm">
-      <description>
-         When working with JPA  persistence, you should use the Persistence perspective. If you already have the Persistence perspective active, you may skip this step by clicking the &quot;Click to Skip&quot; button. 
-If not, select <b>Window-&gt;Open Perspective-&gt;Other</b> in the menubar at the top of the workbench. In the Select Perspectives dialog, select <b>JPA Development</b> and click OK. This step changes the perspective to set up the Eclipse workbench for JPA development.
-You can click the &quot;Click to Perform&quot; button to have the &quot;Persistence&quot; perspective opened automatically.
-      </description>
-      <action class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" pluginId="org.eclipse.ui.cheatsheets" confirm="false" param1="org.eclipse.jpt.ui.PersistencePerspective">
-      </action>
-   </item>
-   <item title="Create a Java Class" dialog="false" skip="false">
-      <description>
-         The next step is to create a new Java class. In the main toolbar again, click on <b>New Java Class</b> button (or the link below).
-The Java editor will automatically open showing your new class.
-      </description>
-   </item>
-   <item title="Create a Persistent Entity" dialog="false" skip="false">
-      <description>
-         Finally we will make the Java class a persistent entity.
-In the JPA Structure view select the Java class. 
-In the JPA Details view, use the &quot;Map As&quot; field to select <b>Entity</b>. Dali automatically adds the @Entity annotation to the class in the Java editor. 
-Use the Table, Catalog, and Schema fields to associate the entity with a specific table in the database.
-      </description>
-   </item>
-   <item title="Add Fields to the Class" dialog="false" skip="true">
-      <description>
-         Now you will add some fields to the entity to map to rows in the database table.   
-
-If your persistent entity already has fields to map, you may skip this step by clicking the &quot;Click to Skip&quot; button. If not, use the Java editor to add fields to the entity.
-      </description>
-      <action class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" pluginId="org.eclipse.ui.cheatsheets" confirm="false" param1="org.eclipse.dali.ui.PersistencePerspective">
-      </action>
-   </item>
-   <item title="Create the Mapping" dialog="false" skip="false" href="/org.eclipse.dali.doc.user/ref_entity_page.htm">
-      <description>
-         Now you are ready to map the entity fields to columns in the database table. In the Package Explorer, select the Java class. 
-
-In the JPA Structure view, expand the persistent entity to display the fields. Select a field. 
-
-The JPA Details view displays the information for the field. Use the Map As field to select the Basic mapping. Use the Column field to select a column from the database table.
-      </description>
-      <action class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" pluginId="org.eclipse.ui.cheatsheets" confirm="false" param1="org.eclipse.dali.ui.PersistencePerspective">
-      </action>
-   </item>
-   <item title="Finish" dialog="false" skip="false">
-      <description>
-         Congratulations! You have successfully mapped the fields from a Java persistent entity to a column in a database table.
-      </description>
-   </item>
-</cheatsheet>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm
deleted file mode 100644
index 4063527779..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Understanding OR mappings</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Understanding OR mappings" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABBDJFI" name="BABBDJFI"></a></p>
-<div class="sect1">
-<h1>Understanding OR mappings</h1>
-<p><a id="sthref20" name="sthref20"></a><a id="sthref21" name="sthref21"></a>The Dali OR (object-relational) Mapping Tool allows you to describe how your entity objects <span class="italic">map</span> to the data source (or other objects). This approach isolates persistence information from the object model&ndash;developers are free to design their ideal object model, and DBAs are free to design their ideal schema.</p>
-<p>These mappings transform an object data member type to a corresponding relational database data source representation. These OR mappings can also transform object data members that reference other domain objects stored in other tables in the database and are related through foreign keys.</p>
-<p>You can use these mappings to map simple data types including primitives (such as <code>int</code>), JDK classes (such as <code>String</code>), and large object (LOB) values. You can also use them to transform object data members that reference other domain objects by way of association where data source representations require object identity maintenance (such as sequencing and back references) and possess various types of multiplicity and navigability. The appropriate mapping class is chosen primarily by the cardinality of the relationship.</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-</div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm
deleted file mode 100644
index d1fc4cdf05..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Understanding Java persistence</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Understanding Java persistence" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABCAHIC" name="BABCAHIC"></a></p>
-<div class="sect1">
-<h1>Understanding Java persistence</h1>
-<p><a id="sthref18" name="sthref18"></a><span class="italic">Persistence</span> refers to the ability to store objects in a database and use those objects with transactional integrity. In a J2EE application, data is typically stored and persisted in the data tier, in a relational database.</p>
-<p><a id="sthref19" name="sthref19"></a><span class="italic">Entity beans</span> are enterprise beans that contain persistent data and that can be saved in various persistent data stores. The entity beans represent data from a database; each entity bean carries its own identity. Entity beans can be deployed using <span class="italic">application-managed persistence</span> or <span class="italic">container-managed persistence</span>.</p>
-</div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm
deleted file mode 100644
index 3663d63540..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Concepts</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content=" Concepts" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="sthref17" name="sthref17"></a></p>
-<h1>Concepts</h1>
-<p>This section contains an overview of concepts you should be familiar with when using Dali to create mappings for Java persistent entities.</p>
-<ul>
-<li>
-<p><a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a></p>
-</li>
-<li>
-<p><a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a></p>
-</li>
-<li>
-<p><a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></p>
-</li>
-</ul>
-<p>In addition to these sections, you should review the following resources for additional information:</p>
-<ul>
-<li>
-<p>Eclipse Dali project: <code><a href="http://www.eclipse.org/webtools/dali">http://www.eclipse.org/webtools/dali</a></code></p>
-</li>
-<li>
-<p>Eclipse Web Tools Platform project: <code><a href="http://www.eclipse.org/webtools">http://www.eclipse.org/webtools</a></code></p>
-</li>
-<li>
-<p>JSR 220 EJB 3.0 specification: <code><a href="http://www.jcp.org/en/jsr/detail?id=220">http://www.jcp.org/en/jsr/detail?id=220</a></code></p>
-</li>
-</ul>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm
deleted file mode 100644
index 6a411500ce..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Understanding EJB 3.0 Java Persistence API</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Understanding EJB 3.0 Java Persistence API" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABBGFJG" name="BABBGFJG"></a></p>
-<div class="sect1">
-<h1>Understanding EJB 3.0 Java Persistence API</h1>
-<p>The Java 2 Enterprise Edition(J2EE) Enterprise JavaBeans (EJB) are a component architecture that you use to develop and deploy object-oriented, distributed, enterprise-scale applications. An application written according to the Enterprise JavaBeans architecture is scalable, transactional, and secure.</p>
-<p>The EJB 3.0 Java Persistence API (JPA) improves the EJB architecture by reducing its complexity through the use of metadata (annotations) and specifying programmatic defaults of that metadata.</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm
deleted file mode 100644
index f4751603c3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>The persistence.xml file</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="The persistence.xml file" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CHDHAGIH" name="CHDHAGIH"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref22" name="sthref22"></a>The persistence.xml file</h1>
-<p>The JPA specification requires the use of a <code>persistence.xml</code> file for deployment. This file defines the database and entity manager options, and may contain more than one persistence unit. To enable you to easily edit this information, Dali provides the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>. Alternatively, you can use the Eclipse XML Editor to create and maintain this information. See <a href="task_manage_persistence.htm#CIHDAJID">"Managing the persistence.xml file"</a> for more information.</p>
-<div align="center">
-<div class="inftblnotealso"><br />
-<table class="NoteAlso oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Tip:</p>
-To work with multiple persistence units, comment out all but one persistence unit in <code>persistence.xml</code>.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnotealso" --></div>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a><br />
-<a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a>
-<p>&nbsp;</p>
-</div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm
deleted file mode 100644
index 43fff9a255..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:42 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>The orm.xml file</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="The orm.xml file" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CHDBIJAC" name="CHDBIJAC"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref23" name="sthref23"></a>The orm.xml file</h1>
-<p>Although the JPA specification emphasizes the use of annotations to specify persistence, you can also use the <code>orm.xml</code> file to store this metadata. Dali enables you to create a stub <code>orm.xml</code> file for a JPA project using the <a href="reference005.htm#CIAIJCCE">Mapping File Wizard</a>. See <a href="task_manage_orm.htm#CIHDGDCD">"Managing the orm.xml file"</a> for more information.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-The metadata must match the XSD specification of your selected JPA implementation.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-<p>Dali provides comprehensive support for configuring XML mapping files through the <a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a> that is nearly identical to the annotation-based configuration in the Java source. Alternatively, you can also use the Eclipse XML Editor to create and maintain the metadata information in <code>orm.xml</code>.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-Dali works exclusively with XML mapping files named <code>orm.xml</code>.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_manage_orm.htm#CIHDGDCD">Managing the orm.xml file</a><br />
-<a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a><br />
-<p>&nbsp;</p>
-</div>
-<!-- class="sect2" -->
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml b/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml
deleted file mode 100644
index 34de0ef6d1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml
+++ /dev/null
@@ -1,422 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<contexts>
-	<context id="entity_accessType">
-		<description>Specify how the variable is accessed: Property (default) or Field.</description>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-		<topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
-		<topic label="Understanding persistence" href="concept_persistence.htm"/>
-	</context>
-	<context id="entity_name">
-		<description>The name of this entity. By default, the class name is used as the entity name.</description>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-		<topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
-		<topic label="Understanding persistence" href="concept_persistence.htm"/>
-	</context>
-	<context id="entity_table">
-		<description>The database table assigned to this entity. By default, the class name is used as the database table name.</description>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-		<topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
-		<topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
-		<topic label="Understanding persistence" href="concept_persistence.htm"/>
-	</context>
-	<context id="entity_attributeOverrides">
-		<description>Specify a property or field to be overridden (from the default mappings).</description>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-		<topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
-		<topic label="Understanding persistence" href="concept_persistence.htm"/>
-	</context>
-	<context id="entity_attributeOverridesName">
-		<description>Name of the database column.</description>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-		<topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
-		<topic label="Understanding persistence" href="concept_persistence.htm"/>
-	</context>
-	<context id="entity_attributeOverridesColumn">
-		<description>The database column that overrides a property or field.</description>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-		<topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
-		<topic label="Understanding persistence" href="concept_persistence.htm"/>
-	</context>
-	<context id="entity_attributeOverridesInsertable">
-		<description>Specifies if the column is always included in SQL INSERT statements.</description>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-		<topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
-		<topic label="Understanding persistence" href="concept_persistence.htm"/>
-	</context>
-	<context id="entity_attributeOverridesUpdatable">
-		<description>Specifies if the column is always included in SQL UPDATE statements.</description>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-		<topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
-		<topic label="Understanding persistence" href="concept_persistence.htm"/>
-	</context>
-	<context id="mapping_mapAs">
-		<description>Specify how this attribute maps to the database.</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-		<topic label="Understanding OR mappings" href="concept_mapping.htm"/>
-	</context>
-	<context id="mapping_column">
-		<description>The database column that contains the value for the attribute.</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-		<topic label="Understanding OR mappings" href="concept_mapping.htm"/>
-	</context>
-	<context id="mapping_columnTable">
-		<description>Name of the database table that contains the selected column.</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-		<topic label="Understanding OR mappings" href="concept_mapping.htm"/>
-	</context>
-	<context id="mapping_columnInsertable">
-		<description>Specifies if the column is always included in SQL INSERT statements.</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-		<topic label="Understanding OR mappings" href="concept_mapping.htm"/>
-	</context>
-	<context id="mapping_columnUpdatable">
-		<description>Specifies if the column is always included in SQL UPDATE statements.</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-		<topic label="Understanding OR mappings" href="concept_mapping.htm"/>
-	</context>
-	<context id="mapping_fetchType">
-		<description>Defines how data is loaded from the database: Eager (default) or Lazy</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-		<topic label="Understanding OR mappings" href="concept_mapping.htm"/>
-	</context>
-	<context id="mapping_optional">
-		<description>Specifies if this field is can be null.</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-		<topic label="Understanding OR mappings" href="concept_mapping.htm"/>
-	</context>
-	<context id="mapping_generatedValueStrategy">
-		<description>Determines how the primary key is generated: Auto (default), Sequence, Identity, or Table.</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-		<topic label="Understanding OR mappings" href="concept_mapping.htm"/>
-	</context>
-	<context id="mapping_generatedValueGeneratorName">
-		<description>Unique name of the generator.</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-		<topic label="Understanding OR mappings" href="concept_mapping.htm"/>
-	</context>
-	<context id="mapping_targetEntity">
-		<description>The entity to which this attribute is mapped. </description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-		<topic label="Understanding OR mappings" href="concept_mapping.htm"/>
-	</context>
-	<context id="mapping_cascadeType">
-		<description>Specify which operations are propagated throughout the entity: All, Persist, Merge, or Move.</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-		<topic label="Understanding OR mappings" href="concept_mapping.htm"/>
-	</context>
-	<context id="mapping_mappedBy">
-		<description>The field in the database table that owns the relationship.</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-		<topic label="Understanding OR mappings" href="concept_mapping.htm"/>
-	</context>
-	<context id="mapping_joinColumnName">
-		<description>The name of the database column that contains the foreign key reference for the entity association.</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-		<topic label="Understanding OR mappings" href="concept_mapping.htm"/>
-	</context>
-	<context id="mapping_joinReferencedColumn">
-		<description>Name of the join table that contains the foreign key column.</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-		<topic label="Understanding OR mappings" href="concept_mapping.htm"/>
-	</context>
-	<context id="mapping_embeddedAttributeOverrides">
-		<description>Specify to override the default  mapping of an entity’s attribute.</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-		<topic label="Understanding OR mappings" href="concept_mapping.htm"/>
-	</context>
-	<context id="mapping_embeddedAttributeOverridesColumn">
-		<description>The database column that is being mapped to the entity’s attribute.</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-		<topic label="Understanding OR mappings" href="concept_mapping.htm"/>
-	</context>
-	<context id="entity_mapAs">
-		<description>Specify the type of persistent domain object for the Java class: Persistent, Embedded, or Mapped Superclass.</description>
-		<topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-		<topic label="Understanding persistence" href="concept_persistence.htm"/>
-	</context>
-	<context id="entity_inheritanceStrategy">
-		<description>Specify how an entity may inherit properties from other entities: Single table, One table per class, or Joined tables.</description>
-		<topic label="Specifying inheritance" href="task_inheritance.htm"/>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-	</context>
-	<context id="entity_inheritanceDiscriminatorColumn">
-		<description>Use to specify the name of the discriminator column when using a Single or Joined inheritance strategy.</description>
-		<topic label="Specifying inheritance" href="task_inheritance.htm"/>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-	</context>
-	<context id="entity_inheritanceDiscriminatorType">
-		<description>Use this field to set the discriminator type to CHAR or INTEGER (instead of its default: String). The discriminator value must conform to this type.</description>
-		<topic label="Specifying inheritance" href="task_inheritance.htm"/>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-	</context>
-	<context id="entity_inheritanceDiscriminatorValue">
-		<description>Specify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified discriminator type.</description>
-		<topic label="Specifying inheritance" href="task_inheritance.htm"/>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-	</context>
-	<context id="mapping_orderBy">
-		<description>Specify the default order for objects returned from a query.</description>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-		<topic label="Mapping an Entity" href="task_mapping.htm"/>
-	</context>
-	<context id="mapping_joinTableName">
-		<description>Specify the  name of the database table that defines the foreign key for a many-to-many or a unidirectional one-to-many association. You can configure the join table with a specific catalog or schema, configure one or more join table columns with a unique constraint, and use multiple join columns per entity.</description>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-	</context>
-	<context id="mapping_joinTableJoinColumns">
-		<description>Specify  two or more join columns (that is, a composite primary key).</description>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-	</context>
-	<context id="mapping_joinTableInverseJoinColumns">
-		<description>Specify the join column on the owned (or inverse side) of the association: the owned entity's primary key column. </description>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-	</context>
-	<context id="properties_javaPersistence">
-		<description>Use the Java Persistence options on the Properties page to select the database connection to use with the project.</description>
-		<topic label="Project properties" href="ref_project_properties"/>
-		<topic label="Adding persistence" href="ref_add_persistence.htm"/>
-		<topic label="Understanding persistence" href="concept_persistence.htm"/>
-	</context>
-	<context id="properties_javaPersistenceConnection">
-		<description>The database connection used to map the persistent entities.</description>
-		<topic label="Project properties" href="ref_project_properties"/>
-		<topic label="Understanding persistence" href="concept_persistence.htm"/>
-	</context>
-	<context id="properties_javaPersistenceSchema">
-		<description>The database schema used to map the persistent entities.</description>
-		<topic label="Project properties" href="ref_project_properties"/>
-		<topic label="Understanding persistence" href="concept_persistence.htm"/>
-	</context>
-	<context id="dialog_addPersistence">
-		<description>Use the Add Persistence dialog to define the database connection use to store the persistence entities.</description>
-		<topic label="Adding persistence" href="ref_add_persistence.htm"/>
-		<topic label="Understanding persistence" href="concept_persistence.htm"/>
-	</context>
-	<context id="persistenceOutline">
-		<description>The JPA Structure view displays an outline of the structure (its attributes and mappings) of the entity that is currently selected or opened in the editor.</description>
-		<topic label="JPA Structure view" href="ref_persistence_outline.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-	</context>
-	<context id="dialog_generateEntities">
-		<description>Use the Generate Entities dialog to create Java persistent entities based on your database tables.</description>
-		<topic label="Generating entities from tables" href="task_generate_entities.htm.htm" />
-		<topic label="Project properties" href="ref_project_properties"/>
-	</context>
-	<context id="dialog_generateEntities_source">
-		<description>The project folder name in which to generate the Java persistent entities. Click Browse to select an existing folder.</description>
-		<topic label="Generating entities from tables" href="task_generate_entities.htm"/>
-	</context>
-	<context id="dialog_generateEntities_package">
-		<description>The package in which to generate the Java persistent entities, or click Browse to select an existing package.</description>
-		<topic label="Generating entities from tables" href="task_generate_entities.htm"/>
-	</context>
-	<context id="dialog_generateEntities_tables">
-		<description>Select the tables from which to create Java persistent entities.</description>
-		<topic label="Generating entities from tables" href="task_generate_entities.htm"/>
-		<topic label="Project properties" href="ref_project_properties"/>
-	</context>
-	<context id="dialog_addJavaPersistence">
-		<description>Use this dialog to define the database connection used to store the persistence entities and to create the persistence.xml file.</description>
-		<topic label="Add Persistence dialog" href="ref_add_persistence.htm" />
-		<topic label="Adding persistence to a project" href="task_add_persistence" />
-		<topic label="Managing the persistence.xml file" href="task_manage_persistence.htm" />
-	</context>
-	<context id="dialog_newJPAProject">
-		<description>Use this dialog to define the new JPA project name, its location, target runtime, and other configuration settings.</description>
-		<topic label="New JPA Project page" href="ref_new_jpa_project.htm" />
-		<topic label="New JPA Project wizard" href="ref_new_jpa_project_wizard" />
-		<topic label="Adding persistence to a project" href="task_add_persistence" />
-		<topic label="Creating a new JPA project" href="task_create_new_project.htm" />
-	</context>
-	<context id="dialog_addJavaPersistence_database">
-		<description>Use these fields to define the database connection used to store the persistent entities.</description>
-		<topic label="Add Persistence dialog" href="ref_add_persistence.htm" />
-		<topic label="Adding persistence to a project" href="task_add_persistence" />
-	</context>
-	<context id="dialog_addJavaPersistence_classpath">
-		<description>Use this option to add libraries or JARs that contain the Java Persistence API (JPA) and entities to the project’s Java Build Path.</description>
-		<topic label="Add Persistence dialog" href="ref_add_persistence.htm" />
-		<topic label="Adding persistence to a project" href="task_add_persistence" />
-	</context>
-	<context id="dialog_addJavaPersistence_packaging">
-		<description>Use these fields to create the persistence.xml file. Select the persistence version, the name of the JPA provider, and a unique name to identify the persistence unit.</description>
-		<topic label="Add Persistence dialog" href="ref_add_persistence.htm" />
-		<topic label="Managing the persistence.xml file" href="task_manage_persistence.htm" />
-	</context>
-	<context id="wizard_generateDDL_options ">
-		<description>Use this page to select which script options will be included in the generated script.</description>
-		<topic label="Generating tables (DDL) from entities " href="task_generate_ddl.htm" />
-		<topic label="Options page " href="ref_options.htm" />
-	</context>
-	<context id="wizard_generateDDL_objects ">
-		<description>Use this page to select which elements will be included in the generated script.</description>
-		<topic label="Generating tables (DDL) from entities " href="task_generate_ddl.htm" />
-		<topic label="Objects page " href="ref_objects.htm" />
-	</context>
-	<context id="wizard_generateDDL_save ">
-		<description>Use this page to select the filename and location of the generated script. You can also preview the script and specify to run or continue editing the script after generation.</description>
-		<topic label="Generating tables (DDL) from entities " href="task_generate_ddl.htm" />
-		<topic label="Save and Run DDL page " href="ref_save_and_run.htm" />
-	</context>
-	<context id="wizard_generateDDL_summary ">
-		<description>This page shows the settings that you selected for the generated DDL. To change any option click "Back" or click "Finish" to continue.</description>
-		<topic label="Generating tables (DDL) from entities " href="task_generate_ddl.htm" />
-	</context>
-	<context id="mapping_tableGeneratorName">
-		<description>The name of the table sequence generator. This name is global to to the persistence unit (across all generator types).</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-	</context>
-	<context id="mapping_tableGeneratorTable">
-		<description>The database table that stores the generated ID values. </description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-	</context>
-	<context id="mapping_tableGeneratorPrimaryKeyColumn">
-		<description>The database column of the generator table that stores the generated ID values.</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-	</context>
-	<context id="mapping_tableGeneratorValueColumn">
-		<description>The name for the column that stores the generated ID values.</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-	</context>
-	<context id="mapping_tableGeneratorPrimaryKeyColumnValue">
-		<description>The database column of the generator table that defines the primary key value.</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-	</context>
-	<context id="dialog_databaseAuthorization">
-		<description>Use to connect (log in) to a database connection to use with your Java persistent entities. 
-		You must have a defined database connection (and be connected) to add persistence. </description>
-		<topic label="Add persistence to a Java project" href="task_add_persistence_project.htm"/>
-	</context>
-	<context id="mapping_temporal">
-		<description>Specify if the mapped field contains a Date (java.sql.Date), Time (java.sql.Time), or Timestamp (java.sql.Timestamp) value.</description>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-	</context>
-	<context id="mapping_primaryKeyGeneration">
-		<description>Define how the primary key is generated</description>
-		<topic label="Primary Key Generation information" href="ref_primary_key.htm"/>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-	</context>
-	<context id="mapping_tableGenerator">
-		<description>Specify to use a specific database table for generating the primary key.</description>
-		<topic label="Primary Key Generation information" href="ref_primary_key.htm"/>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-	</context>
-	<context id="mapping_sequenceGenerator">
-		<description>Specify to use a specific sequence for generating the primary key.</description>
-		<topic label="Primary Key Generation information" href="ref_primary_key.htm"/>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-	</context>
-	<context id="mapping_sequenceGeneratorName">
-		<description>Name of the sequence.</description>
-		<topic label="Primary Key Generation information" href="ref_primary_key.htm"/>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-	</context>
-	<context id="mapping_sequenceGeneratorSequence">
-		<description> </description>
-		<topic label="Primary Key Generation information" href="ref_primary_key.htm"/>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-	</context>
-	<context id="mapping_lob">
-		<description>Specify if the field is mapped to java.sql.Clob or java.sql.Blob.</description>
-		<topic label="General information" href="ref_mapping_general.htm"/>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-	</context>
-	<context id="mapping_enumerated">
-		<description>Specify how to persist enumerated constraints if the String value suits your application requirements or to match an existing database schema.</description>
-		<topic label="General information" href="ref_mapping_general.htm"/>
-		<topic label="JPA Details" href="ref_persistence_map_view.htm"/>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-	</context>
-	<context id="dialog_editInverseJoinColumn">
-		<description>.</description>
-		<topic label="Mapping an entity" href="task_mapping.htm"/>
-	</context>
-	<context id="entity_catalog">
-		<description>The database catalog that contains the Table. This field overrides the defaults in the orm.xml file.</description>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-		<topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
-		<topic label="Understanding persistence" href="concept_persistence.htm"/>
-	</context>
-	<context id="entity_schema">
-		<description>The database schema that contains the Table. This field overrides the defaults in the orm.xml file.</description>
-		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
-		<topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
-		<topic label="Understanding persistence" href="concept_persistence.htm"/>
-	</context>
-	<context id="orm_package">
-		<description>The Java package that contains the persistent entities to which the orm.xml file applies.</description>
-		<topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
-		<topic label="JPA Details" href="ref_details_orm.htm"/>
-	</context>
-	<context id="orm_schema">
-		<description>The database schema to use as the default for all entities managed by this persistence unit.</description>
-		<topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
-		<topic label="JPA Details" href="ref_details_orm.htm"/>
-	</context>
-	<context id="orm_catalog">
-		<description>The database catalog to use as the default for all entities managed by this persistence unit.</description>
-		<topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
-		<topic label="JPA Details" href="ref_details_orm.htm"/>
-	</context>
-	<context id="orm_access">
-		<description>The default access method for variables in this project: Property or Field.</description>
-		<topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
-		<topic label="JPA Details" href="ref_details_orm.htm"/>
-	</context>
-	<context id="orm_cascade">
-		<description>Adds cascade-persist to the set of cascade options in entity relationships of the persistence unit.</description>
-		<topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
-		<topic label="JPA Details" href="ref_details_orm.htm"/>
-	</context>
-	<context id="orm_xml">
-		<description>Specifies that the Java classes in this persistence unit are fully specified by their metadata. Any annotations will be ignored.</description>
-		<topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
-		<topic label="JPA Details" href="ref_details_orm.htm"/>
-	</context>
-	<context id="dialog_JPAPlatform">
-		<description>Specify the vendor-specific JPA implementation.Default is Generic..</description>
-		<topic label="JPA Facet page" href="ref_jpa_facet.htm"/>
-	</context>
-	<context id="dialog_createORM">
-		<description>Create an initial orm.xml file. Use this file to specify project and persistence unit defaults.</description>
-		<topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
-		<topic label="JPA Facet page" href="ref_jpa_facet.htm"/>
-	</context>
-
-
-
-
-</contexts>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/css/blafdoc.css b/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/css/blafdoc.css
deleted file mode 100644
index baf6127928..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/css/blafdoc.css
+++ /dev/null
@@ -1,21 +0,0 @@
-@import "../../../PRODUCT_PLUGIN/book.css";
-
-span.control, span.gui-object-action, p.subhead2, span.bold, p.notep1 {
-  font-weight: bold;
-}
-
-span.name, p.titleinfigure, span.italic {
-  font-style: italic;
-}
-
-p.titleinfigure, p.subhead2 {
-  padding-top: 10px;
-}
-
-span.code {
-  font-family: monospace;
-}
-
-span.copyrightlogo {font-size: 0.8em}
-
-.footer {margin-top: 2em;border-top:1px solid #cccccc;padding-top:1em;}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/html/cpyr.htm b/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/html/cpyr.htm
deleted file mode 100644
index 382ec67619..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/html/cpyr.htm
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-<!--  <meta http-equiv="refresh" content="0;url=../../legal.htm"> -->
-</head>
-<body>
-<p><a href="../../legal.htm">License Information</a></p>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm
deleted file mode 100644
index c56c8c0a06..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Getting started</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content=" Getting started" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="sthref2" name="sthref2"></a></p>
-<h1>Getting started</h1>
-<p>This section provides information on getting started with the Java Persistence Tools.</p>
-<ul>
-<li>
-<p><a href="getting_started001.htm#BABEFHCD">Requirements and installation</a></p>
-</li>
-<li>
-<p><a href="getting_started002.htm#BABIGCJA">Dali quick start</a></p>
-</li>
-</ul>
-<p>For additional information, please visit the Dali home page at:</p>
-<p><code><a href="http://www.eclipse.org/webtools/dali/main.php">http://www.eclipse.org/webtools/dali/main.php</a></code>.</p>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm
deleted file mode 100644
index 0236f26b15..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Requirements and installation</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Requirements and installation" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABEFHCD" name="BABEFHCD"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Requirements and installation<a id="sthref3" name="sthref3"></a><a id="sthref4" name="sthref4"></a></h1>
-<p>Before installing Dali, ensure that your environment meets the following <span class="italic">minimum</span> requirements:</p>
-<ul>
-<li>
-<p>Eclipse 3.4 (<code><a href="http://www.eclipse.org/downloads">http://www.eclipse.org/downloads</a></code>)</p>
-</li>
-<li>
-<p>Java Runtime Environment (JRE) 1.5 (<code><a href="http://java.com">http://java.com</a></code>)</p>
-</li>
-<li>
-<p>Eclipse Web Tools Platform (WTP) 3.0 (<code><a href="http://www.eclipse.org/webtools">http://www.eclipse.org/webtools</a></code>)</p>
-</li>
-<li>
-<p>Java Persistence API (JPA) for Java EE 5. The reference implementation can be obtained from:</p>
-</li>
-</ul>
-<pre xml:space="preserve" class="oac_no_warn">
-<code><a href="https://glassfish.dev.java.net/downloads/persistence/JavaPersistence.html">https://glassfish.dev.java.net/downloads/persistence/JavaPersistence.html</a></code>
-</pre>
-<p>Refer to <code><a href="http://www.eclipse.org/webtools/dali/gettingstarted_main.html">http://www.eclipse.org/webtools/dali/gettingstarted_main.html</a></code> for additional installation information.</p>
-<p>Dali is included as part of WTP 2.0. No additional installation or configuration is required.</p>
-<a id="sthref5" name="sthref5"></a>
-<p class="subhead2">Accessibility Features</p>
-<p>Dali supports the standard accessibility features in Eclipse, including the following:</p>
-<ul>
-<li>
-<p>Navigating the user interface using the keyboard.</p>
-</li>
-<li>
-<p>Specifying general accessibility preferences for the editor.</p>
-</li>
-</ul>
-<p>See <a href="../org.eclipse.platform.doc.user/concepts/accessibility/accessmain.htm">Accessibility Features in Eclipse</a> in the <span class="italic">Workbench User Guide</span> for details.</p>
-<a id="sthref6" name="sthref6"></a>
-<p class="subhead2">Help Accessibility</p>
-<p>The documentation and help contains markup to facilitate access by the disabled community. See <a href="../org.eclipse.platform.doc.user/tasks/help_accessibility.htm">Help Accessibility</a> in the <span class="italic">Workbench User Guide</span> for details.</p>
-<p>When using the help, be aware of the following:</p>
-<ul>
-<li>
-<p>Screen readers may not always correctly read the code examples in this document. The conventions for writing code require that closing braces should appear on an otherwise empty line; however, some screen readers may not always read a line of text that consists solely of a bracket or brace.</p>
-</li>
-<li>
-<p>This documentation may contain links to Web sites of other companies or organizations that we do not control. We neither evaluate nor make any representations regarding the accessibility of these Web sites.</p>
-</li>
-</ul>
-</div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm
deleted file mode 100644
index 9d7f54c7cd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Dali quick start</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Dali quick start" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABIGCJA" name="BABIGCJA"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Dali quick start</h1>
-<p><a id="sthref7" name="sthref7"></a>This section includes information to help you quickly start using Dali to create relational mappings between Java persistent entities and database tables.</p>
-<ul>
-<li>
-<p><a href="getting_started003.htm#BABDFHDA">Creating a new JPA project</a></p>
-</li>
-<li>
-<p><a href="getting_started004.htm#BABFGDDG">Creating a Java persistent entity with persistent fields</a></p>
-</li>
-</ul>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="tips_and_tricks.htm#CHDHGHBF">Tips and tricks</a><br />
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm
deleted file mode 100644
index 41907c16c9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Creating a new JPA project</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Creating a new JPA project" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABDFHDA" name="BABDFHDA"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Creating a new JPA project</h1>
-<p><a id="sthref8" name="sthref8"></a>This quick start shows how to create a new JPA project.</p>
-<ol start="1">
-<li>
-<p><span class="bold">Select File &gt; New &gt; Project</span>. The Select a Wizard dialog appears.</p>
-<div align="center">
-<div class="inftblnotealso"><br />
-<table class="NoteAlso oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Tip:</p>
-You can also select the JPA perspective and then select <span class="bold">File &gt; New &gt; JPA Project</span>.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnotealso" --></div>
-</li>
-<li>
-<p>Select <span class="bold">JPA Project</span> and then click <span class="bold">Next</span>. The <a href="ref_new_jpa_project.htm#CACBJAGC">New JPA Project page</a> appears.</p>
-</li>
-<li>
-<p>Enter a <span class="gui-object-action">Project name</span> (such as <code>QuickStart</code>).</p>
-</li>
-<li>
-<p>If needed, select the <span class="bold">Target Runtime</span> (such as <code>Apache Tomcat</code>) and configuration, such as <span class="bold">Utility JPA Project with Java 5.0</span> and then click <span class="bold">Next</span>. The <a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a> appears.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-The Target Runtime is not required for Java SE development.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-</li>
-<li>
-<p>On the JPA Facet dialog, select your vendor-specific JPA platform (or select <span class="bold">Generic</span>), database connection (or create a new connection), JPA implementation library (such as EclipseLink), define how Dali should manage persistent classes, and then click <span class="bold">Finish</span>.</p>
-<div align="center">
-<div class="inftblnotealso"><br />
-<table class="NoteAlso oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Tip:</p>
-Select <span class="bold">Override the Default Schema for Connection</span> if you require a schema other than the one that Dali derives from the connection information, which may be incorrect in some cases. Using this option, you can select a development time schema for defaults and validation.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnotealso" --></div>
-</li>
-</ol>
-<p>Eclipse adds the project to the workbench and opens the JPA perspective.</p>
-<div class="figure"><a id="sthref9" name="sthref9"></a>
-<p class="titleinfigure">Project in Package Explorer</p>
-<img src="img/quickstart_project.png" alt="Package Explorer showing the JPA project." title="Package Explorer showing the JPA project." /><br /></div>
-<!-- class="figure" -->
-<p>Now that you have created a project with persistence, you can continue with <a href="getting_started004.htm#BABFGDDG">Creating a Java persistent entity with persistent fields</a>.</p>
-</div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm
deleted file mode 100644
index e5c2f19db4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm
+++ /dev/null
@@ -1,200 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Creating a Java persistent entity with persistent fields</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Creating a Java persistent entity with persistent fields" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABFGDDG" name="BABFGDDG"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Creating a Java persistent entity with persistent fields</h1>
-<p><a id="sthref10" name="sthref10"></a>This quick start shows how to create a new persistent Java entity. We will create an entity to associate with a database table. You will also need to add the ADDRESS table to your database.</p>
-<ol start="1">
-<li>
-<p>Select the JPA project in the Navigator or Package Explorer and then click <span class="bold">New &gt; Other</span>. The Select a Wizard dialog appears.</p>
-</li>
-<li>
-<p>Select <span class="bold">Entity</span> and then click <span class="bold">Next</span>. The Entity Class page appears.</p>
-</li>
-<li>
-<p>Enter the package name (such as <code>quickstart.demo.model</code>), the class name (such as <code>Address</code>) and then click <span class="bold">Next</span>. The <a href="reference004.htm#CIADECIA">Entity Properties page</a> appears, which enables you to define the persistence fields, which you will map to the columns of a database table.</p>
-</li>
-<li>
-<p><a id="sthref11" name="sthref11"></a><a id="sthref12" name="sthref12"></a>Use the Entity Fields dialog (invoked by clicking <span class="bold">Add</span>) to add persistence fields to the Address class:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-private Long id;
-private String city;
-private String country;
-private String stateOrProvince;
-private String postalCode;
-private String street;
-</pre>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-You will also need to add the following columns to the ADDRESS database table:
-<pre xml:space="preserve" class="oac_no_warn">
-NUMBER(10,0) ADDRESS_ID (primary key)
-VARCHAR2(80) PROVINCE
-VARCHAR2(80) COUNTRY
-VARCHAR2(20) P_CODE
-VARCHAR2(80) STREET
-VARCHAR2(80) CITY
-</pre>
-<pre xml:space="preserve" class="oac_no_warn">
-</pre></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-</li>
-<li>
-<p>Click <span class="bold">Finish</span>. With the Create JPA Entity completed, Eclipse displays the <span class="bold">Address</span> entity in the JPA Structure view.</p>
-<p>Address.java includes the <code>@Entity</code> annotation, the persistence fields, as well as <code>getter</code> and <code>setter</code> methods for each of the fields.</p>
-</li>
-</ol>
-<div class="figure"><a id="sthref13" name="sthref13"></a>
-<p class="titleinfigure">Address Entity in Address.java</p>
-<img src="img/java_editor_address.png" alt="Java editor with the Address entity." title="Java editor with the Address entity." /><br /></div>
-<!-- class="figure" -->
-<p>Eclipse also displays the <span class="bold">Address</span> entity in the JPA Structure view:</p>
-<div class="figure"><a id="sthref14" name="sthref14"></a>
-<p class="titleinfigure">Address Entity in the JPA Structure View</p>
-<img src="img/address_java_JPA_structure_quickstart.png" alt="Address.java in the JPA Structure View." title="Address.java in the JPA Structure View." /><br /></div>
-<!-- class="figure" -->
-<ol start="1">
-<li>
-<p>Select the <span class="gui-object-action">Address</span> class in the Package Explorer view.</p>
-</li>
-<li>
-<p>In the <span class="gui-object-title">JPA Details</span> view, notice that Dali has automatically associated the ADDRESS database table with the entity because they are named identically.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-Depending on your database connection type, you may need to specify the <span class="bold">Schema</span>.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-<div class="figure"><a id="sthref15" name="sthref15"></a>
-<p class="titleinfigure">JPA Details View for Address Entity</p>
-<img src="img/address.java_jpa_details.png" alt="Address.java in the JPA Details view." title="Address.java in the JPA Details view." /><br /></div>
-<!-- class="figure" --></li>
-</ol>
-<div align="center">
-<div class="inftblnotealso"><br />
-<table class="NoteAlso oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Tip:</p>
-After associating the entity with the database table, you should update the <code>persistence.xml</code> file to include this JPA entity.
-<p>Right-click the <code>persistence.xml</code> file in the Package Explorer and select <span class="bold">JPA Tools &gt; Synchronize Classes</span>. Dali adds the following to the <code>persistence.xml</code> file:</p>
-<p><code>&lt;class&gt;quickstart.demo.model.Address&lt;/class&gt;</code></p>
-</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnotealso" --></div>
-<p>Now we are ready to map each fields in the Address class to a column in the database table.</p>
-<ol start="1">
-<li>
-<p>Select the <span class="gui-object-action">id</span> field in the JPA Details view.</p>
-</li>
-<li>
-<p>Right click id and then select <span class="bold">Map As &gt; id</span>.</p>
-</li>
-<li>
-<p>In the JPA Details view, select <span class="bold">ADDRESS_ID</span> in the Name field:</p>
-<div class="figure"><a id="sthref16" name="sthref16"></a>
-<p class="titleinfigure">JPA Details View for the addressId Field</p>
-<img src="img/address_id_details_quickstart.png" alt="The JPA Details view for the Address entity&rsquo;s id attribute." title="The JPA Details view for the Address entity&rsquo;s id attribute." /><br /></div>
-<!-- class="figure" -->
-<p>Eclipse adds the following annotations to the Address entity:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@Id
-@Column(name="ADDRESS_ID")
-</pre></li>
-<li>
-<p>Map each of the following fields (as <span class="bold">Basic</span> mappings) to the appropriate database column:</p>
-<div class="inftblhruleinformal">
-<table class="HRuleInformal" title="This table describes the mappings for each of the fields in the Address entity." summary="This table describes the mappings for each of the fields in the Address entity." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t8">Field</th>
-<th align="left" valign="bottom" id="r1c2-t8">Map As</th>
-<th align="left" valign="bottom" id="r1c3-t8">Database Column</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t8" headers="r1c1-t8">city</td>
-<td align="left" headers="r2c1-t8 r1c2-t8">Basic</td>
-<td align="left" headers="r2c1-t8 r1c3-t8">CITY</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t8" headers="r1c1-t8">country</td>
-<td align="left" headers="r3c1-t8 r1c2-t8">Basic</td>
-<td align="left" headers="r3c1-t8 r1c3-t8">COUNTRY</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t8" headers="r1c1-t8">postalCode</td>
-<td align="left" headers="r4c1-t8 r1c2-t8">Basic</td>
-<td align="left" headers="r4c1-t8 r1c3-t8">P_CODE</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t8" headers="r1c1-t8">provinceOrState</td>
-<td align="left" headers="r5c1-t8 r1c2-t8">Basic</td>
-<td align="left" headers="r5c1-t8 r1c3-t8">PROVINCE</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t8" headers="r1c1-t8">street</td>
-<td align="left" headers="r6c1-t8 r1c2-t8">Basic</td>
-<td align="left" headers="r6c1-t8 r1c3-t8">STREET</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblhruleinformal" --></li>
-</ol>
-<p>Dali automatically maps some fields to the correct database column (such as the city field to the City column) if the names are identical.</p>
-</div>
-<!-- class="sect2" -->
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/address.java_jpa_details.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/address.java_jpa_details.png
deleted file mode 100644
index ed27a5ce29..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/address.java_jpa_details.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/address_id_details_quickstart.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/address_id_details_quickstart.png
deleted file mode 100644
index 7ef40cf6c6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/address_id_details_quickstart.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/address_java_JPA_structure_quickstart.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/address_java_JPA_structure_quickstart.png
deleted file mode 100644
index 1af51a9f9b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/address_java_JPA_structure_quickstart.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/change_connection_profile.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/change_connection_profile.png
deleted file mode 100644
index 46ab05e0aa..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/change_connection_profile.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/column_support_new.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/column_support_new.png
deleted file mode 100644
index 8716e8b33c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/column_support_new.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/convert_java_project_new.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/convert_java_project_new.png
deleted file mode 100644
index 91cda6e6a4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/convert_java_project_new.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_new.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_new.png
deleted file mode 100644
index 69c78a5ffb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_new.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_wizard.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_wizard.png
deleted file mode 100644
index f2c0a6c6ea..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_wizard.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_fields.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_fields.png
deleted file mode 100644
index 52a7fab8db..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_fields.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/details_entitymappings.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/details_entitymappings.png
deleted file mode 100644
index 5bd48850fd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/details_entitymappings.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/entering_query_new.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/entering_query_new.png
deleted file mode 100644
index 98ec0ac5b0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/entering_query_new.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/error_sample.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/error_sample.png
deleted file mode 100644
index 3a4964632c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/error_sample.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_entities.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_entities.png
deleted file mode 100644
index e3cb22b69a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_entities.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/inheritance_join.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/inheritance_join.png
deleted file mode 100644
index 22b6875f4d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/inheritance_join.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/inheritance_single.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/inheritance_single.png
deleted file mode 100644
index 3146482609..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/inheritance_single.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/inheritance_tab.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/inheritance_tab.png
deleted file mode 100644
index a9d721fcc4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/inheritance_tab.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/java_editor_address.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/java_editor_address.png
deleted file mode 100644
index ff7eaa63b0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/java_editor_address.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_wizard_create_fields.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_wizard_create_fields.png
deleted file mode 100644
index 30550ea033..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_wizard_create_fields.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/mapped_entity_type_link.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/mapped_entity_type_link.png
deleted file mode 100644
index d264d09639..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/mapped_entity_type_link.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_file_new.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_file_new.png
deleted file mode 100644
index 3355741af7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_file_new.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_embed.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_embed.png
deleted file mode 100644
index fb3d1b263f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_embed.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_entity.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_entity.png
deleted file mode 100644
index 7a653db355..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_entity.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_superclass.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_superclass.png
deleted file mode 100644
index 6ef54378f0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_superclass.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_basicmappings.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_basicmappings.png
deleted file mode 100644
index 1b0b7ff4bd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_basicmappings.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddableentitymapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddableentitymapping.png
deleted file mode 100644
index 48294edaf6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddableentitymapping.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddedidmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddedidmapping.png
deleted file mode 100644
index abe9dc8d20..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddedidmapping.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddedmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddedmapping.png
deleted file mode 100644
index 44d52b8bc4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddedmapping.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_idmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_idmapping.png
deleted file mode 100644
index fdefb5d781..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_idmapping.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_manytomanymapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_manytomanymapping.png
deleted file mode 100644
index eb8022e16c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_manytomanymapping.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_manytoonemapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_manytoonemapping.png
deleted file mode 100644
index ccacc19f1e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_manytoonemapping.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_mappedentity.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_mappedentity.png
deleted file mode 100644
index 398ea2c11f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_mappedentity.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_mappedsuperclass.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_mappedsuperclass.png
deleted file mode 100644
index fc97ceb1fb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_mappedsuperclass.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_onetomanymapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_onetomanymapping.png
deleted file mode 100644
index 5ddc989dfd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_onetomanymapping.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_onetoonemapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_onetoonemapping.png
deleted file mode 100644
index 74d9bbd66c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_onetoonemapping.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_transientmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_transientmapping.png
deleted file mode 100644
index 750488f49d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_transientmapping.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_versionmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_versionmapping.png
deleted file mode 100644
index a87371215b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_versionmapping.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_facet_task.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_facet_task.png
deleted file mode 100644
index d7ffcdcad9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_facet_task.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_perspective_button.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_perspective_button.png
deleted file mode 100644
index 07425ad08a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_perspective_button.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_project_task.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_project_task.png
deleted file mode 100644
index 61e71bdac8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_project_task.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/ngrelc.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/ngrelc.png
deleted file mode 100644
index 88381a5a80..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/ngrelc.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/ngrelr.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/ngrelr.png
deleted file mode 100644
index 4bbc744806..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/ngrelr.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/ngrelt.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/ngrelt.png
deleted file mode 100644
index 60af21f5ea..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/ngrelt.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/open_persistence_editor.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/open_persistence_editor.png
deleted file mode 100644
index 56911fe5a5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/open_persistence_editor.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_new.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_new.png
deleted file mode 100644
index 6aefae4bab..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_new.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_view.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_view.png
deleted file mode 100644
index 769aa825e5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_view.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_xml_editor.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_xml_editor.png
deleted file mode 100644
index b14dc15936..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_xml_editor.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/project_properties_tasks.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/project_properties_tasks.png
deleted file mode 100644
index 8f6310c59f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/project_properties_tasks.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/quickstart_project.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/quickstart_project.png
deleted file mode 100644
index c7c066427e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/quickstart_project.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/secondary_tables.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/secondary_tables.png
deleted file mode 100644
index e6a9159fd8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/secondary_tables.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_entity.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_entity.png
deleted file mode 100644
index 2cebe90add..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_entity.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_jpa_project.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_jpa_project.png
deleted file mode 100644
index 182350246d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_jpa_project.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_mapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_mapping.png
deleted file mode 100644
index 8862770ac0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_mapping.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/synchornize_classes.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/synchornize_classes.png
deleted file mode 100644
index bede63b968..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/synchornize_classes.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/table_entity.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/table_entity.png
deleted file mode 100644
index 1aa1dbe059..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/table_entity.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/task_entering_query.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/task_entering_query.png
deleted file mode 100644
index 98ec0ac5b0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/task_entering_query.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/index.xml b/jpa/plugins/org.eclipse.jpt.doc.user/index.xml
deleted file mode 100644
index 023c49b07f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/index.xml
+++ /dev/null
@@ -1,544 +0,0 @@
-<?xml version='1.0' encoding='iso-8859-1'?>
-<index version="1.0">
-  <entry keyword="@Basic">
-    <entry keyword="Basic mapping"><topic href="tasks010.htm#sthref99" /></entry>
-  </entry>
-  <entry keyword="@Column">
-    <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref193" /></entry>
-  </entry>
-  <entry keyword="@DiscriminatorColumn">
-    <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref83" /></entry>
-  </entry>
-  <entry keyword="@DiscriminatorValue">
-    <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref85" /></entry>
-  </entry>
-  <entry keyword="@Embeddable">
-    <entry keyword="Embeddable"><topic href="tasks007.htm#sthref68" /></entry>
-  </entry>
-  <entry keyword="@Embedded">
-    <entry keyword="Embedded mapping"><topic href="tasks011.htm#sthref103" /></entry>
-  </entry>
-  <entry keyword="@EmbeddedId">
-    <entry keyword="Embedded ID mapping"><topic href="tasks012.htm#sthref107" /></entry>
-  </entry>
-  <entry keyword="@Entity">
-    <entry keyword="Entity"><topic href="tasks006.htm#sthref61" /></entry>
-  </entry>
-  <entry keyword="@Enumerated">
-    <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref203" /></entry>
-  </entry>
-  <entry keyword="@GeneratedValue">
-    <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref211" /></entry>
-  </entry>
-  <entry keyword="@Id">
-    <entry keyword="ID mapping"><topic href="tasks013.htm#sthref111" /></entry>
-  </entry>
-  <entry keyword="@Inheritance">
-    <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref81" /></entry>
-  </entry>
-  <entry keyword="@JoinColumn">
-    <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref122" /></entry>
-    <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref132" /></entry>
-    <entry keyword="Join Table Information"><topic href="reference014.htm#sthref208" /></entry>
-    <entry keyword="Join Columns Information"><topic href="reference015.htm#sthref210" /></entry>
-  </entry>
-  <entry keyword="@Lob">
-    <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref198" /></entry>
-  </entry>
-  <entry keyword="@ManyToMany">
-    <entry keyword="Many-to-many mapping"><topic href="tasks014.htm#sthref115" /></entry>
-  </entry>
-  <entry keyword="@ManyToOne">
-    <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref120" /></entry>
-  </entry>
-  <entry keyword="@MappedSuperclass">
-    <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref75" /></entry>
-  </entry>
-  <entry keyword="@NamedQuery">
-    <entry keyword="Creating Named Queries"><topic href="tasks009.htm#sthref95" /></entry>
-  </entry>
-  <entry keyword="@OneToMany">
-    <entry keyword="One-to-many mapping"><topic href="tasks016.htm#sthref125" /></entry>
-  </entry>
-  <entry keyword="@OneToOne">
-    <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref129" /></entry>
-  </entry>
-  <entry keyword="@OrderBy">
-    <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref206" /></entry>
-  </entry>
-  <entry keyword="@SequenceGenerator">
-    <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref213" /></entry>
-  </entry>
-  <entry keyword="@Temporal">
-    <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref200" /></entry>
-  </entry>
-  <entry keyword="@Transient">
-    <entry keyword="Transient mapping"><topic href="tasks018.htm#sthref135" /></entry>
-  </entry>
-  <entry keyword="@Version">
-    <entry keyword="Version mapping"><topic href="tasks019.htm#sthref139" /></entry>
-  </entry>
-  <entry keyword="architecture of Dali feature">
-    <entry keyword="Dali Developer Documentation"><topic href="reference034.htm#sthref247" /></entry>
-  </entry>
-  <entry keyword="attribute overrides">
-    <entry keyword="Attribute overrides"><topic href="reference010.htm#sthref180" /></entry>
-  </entry>
-  <entry keyword="Attribute Overrides - in Java Details view">
-    <entry keyword="Attribute overrides"><topic href="reference010.htm#sthref182" /></entry>
-  </entry>
-  <entry keyword="attributes">
-    <entry keyword="JPA Details view">
-      <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref192" /></entry>
-    </entry>
-    <entry keyword="mapping">
-      <entry keyword="Understanding OR mappings"><topic href="concept_mapping.htm#sthref20" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="basic mapping">
-    <entry keyword="@Basic">
-      <entry keyword="Basic mapping"><topic href="tasks010.htm#sthref100" /></entry>
-    </entry>
-    <entry keyword="about">
-      <entry keyword="Basic mapping"><topic href="tasks010.htm#sthref98" /></entry>
-    </entry>
-    <entry keyword="(See also mappings)"></entry>
-  </entry>
-  <entry keyword="classes">
-    <entry keyword="adding persistence to">
-      <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref56" /></entry>
-    </entry>
-    <entry keyword="embeddable">
-      <entry keyword="Embeddable"><topic href="tasks007.htm#sthref67" /></entry>
-    </entry>
-    <entry keyword="entity">
-      <entry keyword="Entity"><topic href="tasks006.htm#sthref59" /></entry>
-    </entry>
-    <entry keyword="mapped superclass">
-      <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref73" /></entry>
-    </entry>
-    <entry keyword="synchronizing">
-      <entry keyword="Synchronizing classes"><topic href="tasks003.htm#sthref43" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="columns">
-    <entry keyword="discriminator">
-      <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref84" /></entry>
-    </entry>
-    <entry keyword="join">
-      <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref121" /></entry>
-      <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref131" /></entry>
-      <entry keyword="Join Table Information"><topic href="reference014.htm#sthref207" /></entry>
-      <entry keyword="Join Columns Information"><topic href="reference015.htm#sthref209" /></entry>
-    </entry>
-    <entry keyword="mapping to">
-      <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref194" /></entry>
-    </entry>
-    <entry keyword="value">
-      <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref86" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="database tables">
-    <entry keyword="generating entities from">
-      <entry keyword="Generating entities from tables"><topic href="tasks020.htm#sthref145" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="database - persistence">
-    <entry keyword="connection">
-      <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref236" /></entry>
-    </entry>
-    <entry keyword="schema">
-      <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref238" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="developer documentation - Dali">
-    <entry keyword="Dali Developer Documentation"><topic href="reference034.htm#sthref246" /></entry>
-  </entry>
-  <entry keyword="eager fetch">
-    <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref196" /></entry>
-  </entry>
-  <entry keyword="embeddable class">
-    <entry keyword="@Embeddable">
-      <entry keyword="Embeddable"><topic href="tasks007.htm#sthref69" /></entry>
-    </entry>
-    <entry keyword="about">
-      <entry keyword="Embeddable"><topic href="tasks007.htm#sthref66" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="embedded ID mapping">
-    <entry keyword="@EmbeddedId">
-      <entry keyword="Embedded ID mapping"><topic href="tasks012.htm#sthref108" /></entry>
-    </entry>
-    <entry keyword="about">
-      <entry keyword="Embedded ID mapping"><topic href="tasks012.htm#sthref106" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="embedded mapping">
-    <entry keyword="@Embedded">
-      <entry keyword="Embedded mapping"><topic href="tasks011.htm#sthref104" /></entry>
-    </entry>
-    <entry keyword="about">
-      <entry keyword="Embedded mapping"><topic href="tasks011.htm#sthref102" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="entities">
-    <entry keyword="@Entity annotation">
-      <entry keyword="Entity"><topic href="tasks006.htm#sthref62" /></entry>
-    </entry>
-    <entry keyword="about">
-      <entry keyword="Understanding Java persistence"><topic href="concept_persistence.htm#sthref19" /></entry>
-    </entry>
-    <entry keyword="creating">
-      <entry keyword="Creating a JPA Entity"><topic href="tasks001.htm#sthref30" /></entry>
-    </entry>
-    <entry keyword="embeddable">
-      <entry keyword="Embeddable"><topic href="tasks007.htm#sthref70" /></entry>
-    </entry>
-    <entry keyword="from tables">
-      <entry keyword="Generating entities from tables"><topic href="tasks020.htm#sthref141" /></entry>
-      <entry keyword="Generate Entities from Tables dialog"><topic href="task_generate_entities.htm#sthref242" /></entry>
-    </entry>
-    <entry keyword="JPA Details view">
-      <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref179" /></entry>
-    </entry>
-    <entry keyword="mapped superclass">
-      <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref76" /></entry>
-    </entry>
-    <entry keyword="mapping">
-      <entry keyword="Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref12" /></entry>
-    </entry>
-    <entry keyword="persistence">
-      <entry keyword="Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref10" /></entry>
-    </entry>
-    <entry keyword="persistent">
-      <entry keyword="Entity"><topic href="tasks006.htm#sthref57" /></entry>
-      <entry keyword="Entity"><topic href="tasks006.htm#sthref63" /></entry>
-    </entry>
-    <entry keyword="secondary tables">
-      <entry keyword="Secondary table information"><topic href="reference011.htm#sthref185" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="enumerated">
-    <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref202" /></entry>
-    <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref204" /></entry>
-  </entry>
-  <entry keyword="error messages - Dali">
-    <entry keyword="Validating mappings and reporting problems"><topic href="tasks022.htm#sthref146" /></entry>
-    <entry keyword="Error messages"><topic href="tasks023.htm#sthref151" /></entry>
-  </entry>
-  <entry keyword="extension points - Dali feature">
-    <entry keyword="Dali Developer Documentation"><topic href="reference034.htm#sthref248" /></entry>
-  </entry>
-  <entry keyword="fetch type">
-    <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref195" /></entry>
-  </entry>
-  <entry keyword="Generate Entities from Tables dialog">
-    <entry keyword="Generating entities from tables"><topic href="tasks020.htm#sthref144" /></entry>
-    <entry keyword="Generate Entities from Tables dialog"><topic href="task_generate_entities.htm#sthref241" /></entry>
-  </entry>
-  <entry keyword="generated values">
-    <entry keyword="ID mappings">
-      <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref212" /></entry>
-    </entry>
-    <entry keyword="sequence">
-      <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref214" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="ID mapping">
-    <entry keyword="@Id">
-      <entry keyword="ID mapping"><topic href="tasks013.htm#sthref112" /></entry>
-    </entry>
-    <entry keyword="about">
-      <entry keyword="ID mapping"><topic href="tasks013.htm#sthref110" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="inheritance">
-    <entry keyword="entity">
-      <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref80" /></entry>
-      <entry keyword="Inheritance information"><topic href="reference012.htm#sthref188" /></entry>
-    </entry>
-    <entry keyword="joined tables">
-      <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref92" /></entry>
-    </entry>
-    <entry keyword="single table">
-      <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref87" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="Inheritance - in Java Details view">
-    <entry keyword="Inheritance information"><topic href="reference012.htm#sthref187" /></entry>
-  </entry>
-  <entry keyword="installation - Dali">
-    <entry keyword="Requirements and installation"><topic href="getting_started001.htm#sthref3" /></entry>
-  </entry>
-  <entry keyword="joined tables - inheritance">
-    <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref93" /></entry>
-  </entry>
-  <entry keyword="JPA Details view">
-    <entry keyword="attributes">
-      <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref190" /></entry>
-    </entry>
-    <entry keyword="entities">
-      <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref177" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="JPA Development perspective">
-    <entry keyword="JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref244" /></entry>
-  </entry>
-  <entry keyword="JPA project">
-    <entry keyword="creating new">
-      <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref26" /></entry>
-    </entry>
-    <entry keyword="platform">
-      <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref235" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="JPA Structure view">
-    <entry keyword="JPA Structure view"><topic href="ref_persistence_outline.htm#sthref216" /></entry>
-  </entry>
-  <entry keyword="lazy fetch">
-    <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref197" /></entry>
-  </entry>
-  <entry keyword="many-to-many mapping">
-    <entry keyword="@ManyToMany">
-      <entry keyword="Many-to-many mapping"><topic href="tasks014.htm#sthref116" /></entry>
-    </entry>
-    <entry keyword="about">
-      <entry keyword="Many-to-many mapping"><topic href="tasks014.htm#sthref114" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="many-to-one mapping">
-    <entry keyword="@ManyToOne">
-      <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref119" /></entry>
-    </entry>
-    <entry keyword="about">
-      <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref118" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="mapped superclass">
-    <entry keyword="@MappedSuperclass">
-      <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref74" /></entry>
-    </entry>
-    <entry keyword="about">
-      <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref72" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="mapping entities">
-    <entry keyword="Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref11" /></entry>
-  </entry>
-  <entry keyword="mappings">
-    <entry keyword="about">
-      <entry keyword="Understanding OR mappings"><topic href="concept_mapping.htm#sthref21" /></entry>
-    </entry>
-    <entry keyword="basic">
-      <entry keyword="Basic mapping"><topic href="tasks010.htm#sthref97" /></entry>
-    </entry>
-    <entry keyword="embedded">
-      <entry keyword="Embedded mapping"><topic href="tasks011.htm#sthref101" /></entry>
-    </entry>
-    <entry keyword="embedded ID">
-      <entry keyword="Embedded ID mapping"><topic href="tasks012.htm#sthref105" /></entry>
-    </entry>
-    <entry keyword="ID">
-      <entry keyword="ID mapping"><topic href="tasks013.htm#sthref109" /></entry>
-    </entry>
-    <entry keyword="many-to-many">
-      <entry keyword="Many-to-many mapping"><topic href="tasks014.htm#sthref113" /></entry>
-    </entry>
-    <entry keyword="many-to-one">
-      <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref117" /></entry>
-    </entry>
-    <entry keyword="one-to-many">
-      <entry keyword="One-to-many mapping"><topic href="tasks016.htm#sthref123" /></entry>
-    </entry>
-    <entry keyword="one-to-one">
-      <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref127" /></entry>
-    </entry>
-    <entry keyword="problems">
-      <entry keyword="Validating mappings and reporting problems"><topic href="tasks022.htm#sthref149" /></entry>
-    </entry>
-    <entry keyword="transient">
-      <entry keyword="Transient mapping"><topic href="tasks018.htm#sthref133" /></entry>
-    </entry>
-    <entry keyword="version">
-      <entry keyword="Version mapping"><topic href="tasks019.htm#sthref137" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="named queries">
-    <entry keyword="entity">
-      <entry keyword="Creating Named Queries"><topic href="tasks009.htm#sthref94" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="nonpersistent">
-    <entry keyword="classes">
-      <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref55" /></entry>
-    </entry>
-    <entry keyword="fields. See transient"></entry>
-  </entry>
-  <entry keyword="one-to-many mapping">
-    <entry keyword="@OneToMany">
-      <entry keyword="One-to-many mapping"><topic href="tasks016.htm#sthref126" /></entry>
-    </entry>
-    <entry keyword="about">
-      <entry keyword="One-to-many mapping"><topic href="tasks016.htm#sthref124" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="one-to-one mapping">
-    <entry keyword="@OneToOne">
-      <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref130" /></entry>
-    </entry>
-    <entry keyword="about">
-      <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref128" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="ordering">
-    <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref205" /></entry>
-  </entry>
-  <entry keyword="orm.xml file">
-    <entry keyword="about">
-      <entry keyword="The orm.xml file"><topic href="concepts003.htm#sthref23" /></entry>
-    </entry>
-    <entry keyword="managing">
-      <entry keyword="Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref46" /></entry>
-    </entry>
-    <entry keyword="sample">
-      <entry keyword="Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref47" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="overrides - JPA attributes">
-    <entry keyword="Attribute overrides"><topic href="reference010.htm#sthref181" /></entry>
-  </entry>
-  <entry keyword="persistence">
-    <entry keyword="about">
-      <entry keyword="Understanding Java persistence"><topic href="concept_persistence.htm#sthref18" /></entry>
-    </entry>
-    <entry keyword="database connection">
-      <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref237" /></entry>
-    </entry>
-    <entry keyword="database schema">
-      <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref240" /></entry>
-    </entry>
-    <entry keyword="entity class">
-      <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref54" /></entry>
-    </entry>
-    <entry keyword="options">
-      <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref232" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="Persistence XML Editor">
-    <entry keyword="Using the XML Editor to edit the persistence.xml file"><topic href="tasks002.htm#sthref40" /></entry>
-  </entry>
-  <entry keyword="persistence.xml file">
-    <entry keyword="about">
-      <entry keyword="The persistence.xml file"><topic href="concepts002.htm#sthref22" /></entry>
-    </entry>
-    <entry keyword="editor">
-      <entry keyword="Using the XML Editor to edit the persistence.xml file"><topic href="tasks002.htm#sthref41" /></entry>
-    </entry>
-    <entry keyword="managing">
-      <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref35" /></entry>
-      <entry keyword="Using the XML Editor to edit the persistence.xml file"><topic href="tasks002.htm#sthref38" /></entry>
-      <entry keyword="Working with orm.xml file"><topic href="tasks005.htm#sthref52" /></entry>
-    </entry>
-    <entry keyword="sample">
-      <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref36" /></entry>
-    </entry>
-    <entry keyword="synchronizing with classes">
-      <entry keyword="Synchronizing classes"><topic href="tasks003.htm#sthref44" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="persistent entity">
-    <entry keyword="Entity"><topic href="tasks006.htm#sthref58" /></entry>
-  </entry>
-  <entry keyword="perspective - JPA Development">
-    <entry keyword="JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref245" /></entry>
-  </entry>
-  <entry keyword="platform - JPA">
-    <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref234" /></entry>
-  </entry>
-  <entry keyword="problems">
-    <entry keyword="Validating mappings and reporting problems"><topic href="tasks022.htm#sthref148" /></entry>
-  </entry>
-  <entry keyword="projects - JPA">
-    <entry keyword="creating new">
-      <entry keyword="Creating a new JPA project"><topic href="getting_started003.htm#sthref8" /></entry>
-      <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref25" /></entry>
-    </entry>
-    <entry keyword="options">
-      <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref233" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="quick start - Dali">
-    <entry keyword="Dali quick start"><topic href="getting_started002.htm#sthref7" /></entry>
-  </entry>
-  <entry keyword="requirements">
-    <entry keyword="Dali Java Persistence Tools">
-      <entry keyword="Requirements and installation"><topic href="getting_started001.htm#sthref4" /></entry>
-    </entry>
-    <entry keyword="persistent entities">
-      <entry keyword="Entity"><topic href="tasks006.htm#sthref60" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="schema - database">
-    <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref239" /></entry>
-  </entry>
-  <entry keyword="secondary tables">
-    <entry keyword="Secondary table information"><topic href="reference011.htm#sthref183" /></entry>
-  </entry>
-  <entry keyword="Secondary Tables - in Java Details view">
-    <entry keyword="Secondary table information"><topic href="reference011.htm#sthref186" /></entry>
-  </entry>
-  <entry keyword="single table inheritance">
-    <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref88" /></entry>
-  </entry>
-  <entry keyword="superclass">
-    <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref77" /></entry>
-  </entry>
-  <entry keyword="tables">
-    <entry keyword="creating entities from">
-      <entry keyword="Generating entities from tables"><topic href="tasks020.htm#sthref142" /></entry>
-      <entry keyword="Generate Entities from Tables dialog"><topic href="task_generate_entities.htm#sthref243" /></entry>
-    </entry>
-    <entry keyword="inheritance">
-      <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref89" /></entry>
-    </entry>
-    <entry keyword="secondary">
-      <entry keyword="Secondary table information"><topic href="reference011.htm#sthref184" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="temporal">
-    <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref199" /></entry>
-    <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref201" /></entry>
-  </entry>
-  <entry keyword="transient mapping">
-    <entry keyword="@Transient">
-      <entry keyword="Transient mapping"><topic href="tasks018.htm#sthref136" /></entry>
-    </entry>
-    <entry keyword="about">
-      <entry keyword="Transient mapping"><topic href="tasks018.htm#sthref134" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="version mapping">
-    <entry keyword="@Version">
-      <entry keyword="Version mapping"><topic href="tasks019.htm#sthref140" /></entry>
-    </entry>
-    <entry keyword="about">
-      <entry keyword="Version mapping"><topic href="tasks019.htm#sthref138" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="views">
-    <entry keyword="JPA Details view">
-      <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref178" /></entry>
-      <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref191" /></entry>
-    </entry>
-    <entry keyword="JPA Structure view">
-      <entry keyword="JPA Structure view"><topic href="ref_persistence_outline.htm#sthref215" /></entry>
-    </entry>
-  </entry>
-  <entry keyword="warning messages - Dali">
-    <entry keyword="Validating mappings and reporting problems"><topic href="tasks022.htm#sthref147" /></entry>
-  </entry>
-  <entry keyword="XML editor">
-    <entry keyword="Using the XML Editor to edit the persistence.xml file"><topic href="tasks002.htm#sthref37" /></entry>
-    <entry keyword="Working with orm.xml file"><topic href="tasks005.htm#sthref51" /></entry>
-  </entry>
-</index>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm b/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm
deleted file mode 100644
index 25a99e40e9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:55 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Legal</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content=" Legal" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="sthref256" name="sthref256"></a></p>
-<h1>Legal</h1>
-<p>Copyright &copy; 2006, 2008, Oracle. All rights reserved.</p>
-<p>This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at:</p>
-<p><code><a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></code></p>
-<p><a href="about.htm">Terms and conditions regarding the use of this guide.</a></p>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/plugin.properties b/jpa/plugins/org.eclipse.jpt.doc.user/plugin.properties
deleted file mode 100644
index 865c0824a8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/plugin.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 Oracle.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle. - initial API and implementation
-###############################################################################
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = Java Persistence Documentation - Doc
-providerName = Eclipse.org
-
-jpaDevelopment=JPA Development
-createAJpaProject=Create a JPA project
-createAJpaProjectDescription=This cheat sheet helps you create a JPA project.
-createAPersistentEntity=Create a persistent entity
-createAPersistentEntityDescription=This cheat sheet helps you create a Java persistent entity.
-MapAPersistentEntity=Map a persistent entity
-MapAPersistentEntityDescription=This cheat sheet helps you map the a Java persistent entity to a database table.
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml b/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
deleted file mode 100644
index 2f308f3991..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin name="JPA Documentation Plug-in" id="org.eclipse.jpt.doc.user" version="2.0.0" provider-name="Oracle">
-	<!-- =========== -->
-	<!-- Define TOC  -->
-	<!-- =========== -->
-	<extension point="org.eclipse.help.toc">
-		<toc file="toc.xml" primary="true"/>
-	</extension>
-	<!-- =========== -->
-	<!-- Define F1   -->
-	<!-- =========== -->
-	<extension point="org.eclipse.help.contexts">
-		<contexts file="contexts.xml" plugin="org.eclipse.jpt.ui"/>
-	</extension>
-	<!-- ==================== -->
-	<!-- Define Keyword Index -->
-	<!-- ==================== -->
-	<extension point="org.eclipse.help.index">
-		<index file="index.xml"/>
-	</extension>
-	<!-- =========== -->
-	<!-- Cheatsheets -->
-	<!-- =========== -->
-	<extension point="org.eclipse.ui.cheatsheets.cheatSheetContent">
-		<category name="%jpaDevelopment" id="com.jpa.category"/>
-		<cheatsheet name="%createAJpaProject" category="com.jpa.category" contentFile="$nl$/cheatsheets/add_persistence.xml" id="org.eclipse.jpa.cheatsheet.createproject1">
-			<description>%createAJpaProjectDescription</description>
-		</cheatsheet>
-		<cheatsheet name="%createAPersistentEntity" category="com.jpa.category" contentFile="$nl$/cheatsheets/create_entity.xml" id="org.eclipse.jpa.cheatsheet.addentity">
-			<description>%createAPersistentEntityDescription</description>
-		</cheatsheet>
-		<cheatsheet name="%MapAPersistentEntity" category="com.jpa.category" contentFile="$nl$/cheatsheets/map_entity.xml" id="org.eclipse.jpa.cheatsheet.mapentity">
-			<description>%MapAPersistentEntityDescription</description>
-		</cheatsheet>
-	</extension>
-</plugin>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_details_orm.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_details_orm.htm
deleted file mode 100644
index cdda46b2ec..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_details_orm.htm
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>JPA Details view (for orm.xml)</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="JPA Details view (for orm.xml)" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACGDGHC" name="CACGDGHC"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>JPA Details view (for orm.xml)</h1>
-<p>The <span class="gui-object-title">JPA Details</span> view displays the default mapping and persistence information for the project and contains the following areas:</p>
-<ul>
-<li>
-<p><a href="reference016.htm#CACCACGH">General information</a></p>
-</li>
-<li>
-<p><a href="reference017.htm#CACEAGBG">Persistence Unit information</a></p>
-</li>
-</ul>
-<p>These defaults can be overridden by the settings on a specific entity or mapping.</p>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_jpa_facet.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_jpa_facet.htm
deleted file mode 100644
index 88c5595061..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_jpa_facet.htm
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>JPA Facet page</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="JPA Facet page" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACIFDIF" name="CACIFDIF"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>JPA Facet page</h1>
-<p>This table lists the properties available on the JPA Facet page of the <a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a>.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Generate DDL - Objects page." summary="This table describes the options on the Generate DDL - Objects page." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t3">Property</th>
-<th align="left" valign="bottom" id="r1c2-t3">Description</th>
-<th align="left" valign="bottom" id="r1c3-t3">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t3" headers="r1c1-t3">Platform</td>
-<td align="left" headers="r2c1-t3 r1c2-t3">Vendor-specific JPA implementation.</td>
-<td align="left" headers="r2c1-t3 r1c3-t3">EclipseLink</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t3" headers="r1c1-t3">Connection</td>
-<td align="left" headers="r3c1-t3 r1c2-t3">Select the database connection to use with the project. Dali requires an active database connection to use and validate the persistent entities and mappings.
-<p>Click <span class="bold">Add connection</span> to create a new database connection.</p>
-</td>
-<td align="left" headers="r3c1-t3 r1c3-t3"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t3" headers="r1c1-t3">&nbsp;&nbsp;Override default schema from connection</td>
-<td align="left" headers="r4c1-t3 r1c2-t3">Select a schema other than the default one that is derived from the connection information. Use this option if the default schema cannot be used. For example, use this option when the deployment login differs from the design-time login.</td>
-<td align="left" headers="r4c1-t3 r1c3-t3">The value calculated by Dali.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t3" headers="r1c1-t3">JPA Implementation</td>
-<td align="left" headers="r5c1-t3 r1c2-t3">Select to use the <span class="bold">JPA implementation provided by the server at runtime</span>, or select a specific <span class="bold">implementation library</span> that contain the Java Persistence API (JPA) and entities to be added to the project's Java Build Path.
-<p>Click <span class="bold">Configure default JPA implementation library</span> to create a default library for the project or click <span class="bold">Configure user libraries</span> to define additional libraries.</p>
-</td>
-<td align="left" headers="r5c1-t3 r1c3-t3">Determined by server.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t3" headers="r1c1-t3">Persistent class management</td>
-<td align="left" headers="r6c1-t3 r1c2-t3">Specify if Dali will <span class="bold">discover annotated classes automatically</span>, or if the <span class="bold">annotated classes must be listed in the persistence.xml</span> file.
-<p><span class="bold">Note</span>: To insure application portability, you should explicitly list the managed persistence classes that are included in the persistence unit.</p>
-</td>
-<td align="left" headers="r6c1-t3 r1c3-t3">Determined by server.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t3" headers="r1c1-t3">Create orm.xml</td>
-<td align="left" headers="r7c1-t3 r1c2-t3">Specify if Dali should create a default <code>orm.xml</code> file for your entity mappings and persistence unit defaults.</td>
-<td align="left" headers="r7c1-t3 r1c3-t3">Selected</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblinformal" --></div>
-<!-- class="sect3" -->
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_mapping_general.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_mapping_general.htm
deleted file mode 100644
index df8834cfb4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_mapping_general.htm
+++ /dev/null
@@ -1,261 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:50 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>General information</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="General information" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACBHFIJ" name="CACBHFIJ"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>General information</h1>
-<p>This table lists the General properties available in the <span class="gui-object-title">Java Details view</span> for each mapping type.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the options on the Persistence Properties view." summary="This table describes the options on the Persistence Properties view." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t10">Property</th>
-<th align="left" valign="bottom" id="r1c2-t10">Description</th>
-<th align="left" valign="bottom" id="r1c3-t10">Default</th>
-<th align="left" valign="bottom" id="r1c4-t10">Available for Mapping Type</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t10" headers="r1c1-t10">Mapping Type Hyperlink</td>
-<td align="left" headers="r2c1-t10 r1c2-t10">Clicking the name of the mapping type, which is represented as a hyperlink, invokes the Mapping Type Selection dialog. Use this dialog to specify the type of attribute.</td>
-<td align="left" headers="r2c1-t10 r1c3-t10">Basic</td>
-<td align="left" headers="r2c1-t10 r1c4-t10">All mapping types</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t10" headers="r1c1-t10"><a id="CACGCBHB" name="CACGCBHB"></a>Column</td>
-<td align="left" headers="r3c1-t10 r1c2-t10"><a id="sthref193" name="sthref193"></a><a id="sthref194" name="sthref194"></a>The database column that contains the value for the attribute. This field corresponds to the <code>@Column</code> annotation.</td>
-<td align="left" headers="r3c1-t10 r1c3-t10">By default, the Column is assumed to be named identically to the attribute.</td>
-<td align="left" headers="r3c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a>, <a href="tasks019.htm#BABHIBII">Version mapping</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Name</td>
-<td align="left" headers="r4c1-t10 r1c2-t10">Name of the database column.
-<p>This field corresponds to the <code>@Column</code> annotation.</p>
-</td>
-<td align="left" headers="r4c1-t10 r1c3-t10"><br /></td>
-<td align="left" headers="r4c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Table</td>
-<td align="left" headers="r5c1-t10 r1c2-t10">Name of the database table that contains the selected column.</td>
-<td align="left" headers="r5c1-t10 r1c3-t10"><br /></td>
-<td align="left" headers="r5c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Insertable</td>
-<td align="left" headers="r6c1-t10 r1c2-t10">Specifies if the column is always included in <code>SQL INSERT</code> statements.</td>
-<td align="left" headers="r6c1-t10 r1c3-t10">True</td>
-<td align="left" headers="r6c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Updatable</td>
-<td align="left" headers="r7c1-t10 r1c2-t10">Specifies if this column is always included in <code>SQL UPDATE</code> statements.</td>
-<td align="left" headers="r7c1-t10 r1c3-t10">True</td>
-<td align="left" headers="r7c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Unique</td>
-<td align="left" headers="r8c1-t10 r1c2-t10">Sets the <code>UNIQUE</code> constraint for the column.</td>
-<td align="left" headers="r8c1-t10 r1c3-t10">False</td>
-<td align="left" headers="r8c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r9c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Nullable</td>
-<td align="left" headers="r9c1-t10 r1c2-t10">Specifies if the column allows null values.</td>
-<td align="left" headers="r9c1-t10 r1c3-t10">True</td>
-<td align="left" headers="r9c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r10c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Length</td>
-<td align="left" headers="r10c1-t10 r1c2-t10">Sets the column length.</td>
-<td align="left" headers="r10c1-t10 r1c3-t10">255</td>
-<td align="left" headers="r10c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r11c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Precision</td>
-<td align="left" headers="r11c1-t10 r1c2-t10">Sets the precision for the column values.</td>
-<td align="left" headers="r11c1-t10 r1c3-t10">0</td>
-<td align="left" headers="r11c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r12c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Scale</td>
-<td align="left" headers="r12c1-t10 r1c2-t10">Sets the number of digits that appear to the right of the decimal point.</td>
-<td align="left" headers="r12c1-t10 r1c3-t10">0</td>
-<td align="left" headers="r12c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r13c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Column Definition</td>
-<td align="left" headers="r13c1-t10 r1c2-t10">Define the DDL for a column. This is used when a table is being generated.</td>
-<td align="left" headers="r13c1-t10 r1c3-t10"><br /></td>
-<td align="left" headers="r13c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r14c1-t10" headers="r1c1-t10"><a id="CACGGGHB" name="CACGGGHB"></a><a id="sthref195" name="sthref195"></a><a id="sthref196" name="sthref196"></a><a id="sthref197" name="sthref197"></a>Fetch Type</td>
-<td align="left" headers="r14c1-t10 r1c2-t10">Defines how data is loaded from the database:
-<ul>
-<li>
-<p>Eager &ndash; Data is loaded in before it is actually needed.</p>
-</li>
-<li>
-<p>Lazy &ndash; Data is loaded only when required by the transaction.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r14c1-t10 r1c3-t10">Eager</td>
-<td align="left" headers="r14c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r15c1-t10" headers="r1c1-t10">Optional</td>
-<td align="left" headers="r15c1-t10 r1c2-t10">Specifies if this field is can be null.</td>
-<td align="left" headers="r15c1-t10 r1c3-t10">Yes</td>
-<td align="left" headers="r15c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r16c1-t10" headers="r1c1-t10"><a id="CACBBIBI" name="CACBBIBI"></a><a id="sthref198" name="sthref198"></a>Lob</td>
-<td align="left" headers="r16c1-t10 r1c2-t10">Specify if the field is mapped to <code>java.sql.Clob</code> or <code>java.sql.Blob</code>.
-<p>This field corresponds to the <code>@Lob</code> annotation.</p>
-</td>
-<td align="left" headers="r16c1-t10 r1c3-t10"><br /></td>
-<td align="left" headers="r16c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r17c1-t10" headers="r1c1-t10"><a id="CACEAJGD" name="CACEAJGD"></a><a id="sthref199" name="sthref199"></a><a id="sthref200" name="sthref200"></a><a id="sthref201" name="sthref201"></a>Temporal</td>
-<td align="left" headers="r17c1-t10 r1c2-t10">Specifies if this field is one of the following:
-<ul>
-<li>
-<p>Date &ndash; <code>java.sql.Date</code></p>
-</li>
-<li>
-<p>Time &ndash; <code>java.sql.Time</code></p>
-</li>
-<li>
-<p>Timestamp &ndash; <code>java.sql.Timestamp</code></p>
-</li>
-</ul>
-<p>This field corresponds to the <code>@Temporal</code> annotation.</p>
-</td>
-<td align="left" headers="r17c1-t10 r1c3-t10"><br /></td>
-<td align="left" headers="r17c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r18c1-t10" headers="r1c1-t10"><a id="sthref202" name="sthref202"></a><a id="sthref203" name="sthref203"></a><a id="sthref204" name="sthref204"></a>Enumerated</td>
-<td align="left" headers="r18c1-t10 r1c2-t10">Specify how to persist enumerated constraints if the <code>String</code> value suits your application requirements or to match an existing database schema.
-<ul>
-<li>
-<p>ordinal</p>
-</li>
-<li>
-<p><code>String</code></p>
-</li>
-</ul>
-<p>This field corresponds to the <code>@Enumerated</code> annotation.</p>
-</td>
-<td align="left" headers="r18c1-t10 r1c3-t10">Ordinal</td>
-<td align="left" headers="r18c1-t10 r1c4-t10"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r19c1-t10" headers="r1c1-t10">Target Entity</td>
-<td align="left" headers="r19c1-t10 r1c2-t10">The persistent entity to which the attribute is mapped.</td>
-<td align="left" headers="r19c1-t10 r1c3-t10"><br /></td>
-<td align="left" headers="r19c1-t10 r1c4-t10"><a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks016.htm#BABHGEBD">One-to-many mapping</a> <a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r20c1-t10" headers="r1c1-t10"><a id="CACJAIHB" name="CACJAIHB"></a>Cascade Type</td>
-<td align="left" headers="r20c1-t10 r1c2-t10">Specify which operations are propagated throughout the entity.
-<ul>
-<li>
-<p>All &ndash; All operations</p>
-</li>
-<li>
-<p>Persist</p>
-</li>
-<li>
-<p>Merge</p>
-</li>
-<li>
-<p>Move</p>
-</li>
-<li>
-<p>Remove</p>
-</li>
-<li>
-<p>Refresh</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r20c1-t10 r1c3-t10"><br /></td>
-<td align="left" headers="r20c1-t10 r1c4-t10"><a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks016.htm#BABHGEBD">One-to-many mapping</a>, <a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r21c1-t10" headers="r1c1-t10"><a id="CACJDJJA" name="CACJDJJA"></a>Mapped By</td>
-<td align="left" headers="r21c1-t10 r1c2-t10">The field in the database table that "owns" the relationship. This field is required only on the non-owning side of the relationship.</td>
-<td align="left" headers="r21c1-t10 r1c3-t10"><br /></td>
-<td align="left" headers="r21c1-t10 r1c4-t10"><a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks016.htm#BABHGEBD">One-to-many mapping</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r22c1-t10" headers="r1c1-t10"><a id="CACDADIH" name="CACDADIH"></a><a id="sthref205" name="sthref205"></a><a id="sthref206" name="sthref206"></a>Order By</td>
-<td align="left" headers="r22c1-t10 r1c2-t10">Specify the default order for objects returned from a query:
-<ul>
-<li>
-<p>No ordering</p>
-</li>
-<li>
-<p>Primary key</p>
-</li>
-<li>
-<p>Custom ordering</p>
-</li>
-</ul>
-<p>This field corresponds to the <code>@OrderBy</code> annotation.</p>
-</td>
-<td align="left" headers="r22c1-t10 r1c3-t10">Primary key</td>
-<td align="left" headers="r22c1-t10 r1c4-t10"><a href="tasks016.htm#BABHGEBD">One-to-many mapping</a>. <a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r23c1-t10" headers="r1c1-t10">Attribute Overrides</td>
-<td align="left" headers="r23c1-t10 r1c2-t10">Overrides <span class="bold">Basic</span> mappings of a mapped superclass (for example, if the inherited column name is incompatible with a pre-existing data model, or invalid as a column name in your database).</td>
-<td align="left" headers="r23c1-t10 r1c3-t10"><br /></td>
-<td align="left" headers="r23c1-t10 r1c4-t10"><a href="tasks011.htm#BABCBHDF">Embedded mapping</a>
-<p><a href="tasks011.htm#BABCBHDF">Embedded mapping</a></p>
-<br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" -->
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></div>
-<!-- class="sect3" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project.htm
deleted file mode 100644
index 36e6f539f5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project.htm
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>New JPA Project page</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="New JPA Project page" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACBJAGC" name="CACBJAGC"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>New JPA Project page</h1>
-<p>This table lists the properties available on the New JPA Project page of the <a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a>.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Generate DDL - Objects page." summary="This table describes the options on the Generate DDL - Objects page." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t2">Property</th>
-<th align="left" valign="bottom" id="r1c2-t2">Description</th>
-<th align="left" valign="bottom" id="r1c3-t2">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t2" headers="r1c1-t2">Project name</td>
-<td align="left" headers="r2c1-t2 r1c2-t2">Name of the Eclipse JPA project.</td>
-<td align="left" headers="r2c1-t2 r1c3-t2"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t2" headers="r1c1-t2">Project contents</td>
-<td align="left" headers="r3c1-t2 r1c2-t2">Location of the workspace in which to save the project.
-<p>Unselect The <span class="bold">Use Default</span> option and click <span class="bold">Browse</span> to select a new location.</p>
-</td>
-<td align="left" headers="r3c1-t2 r1c3-t2">Current workspace</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t2" headers="r1c1-t2">Target runtime</td>
-<td align="left" headers="r4c1-t2 r1c2-t2">Select a pre-defined target for the project.
-<p>Click <span class="bold">New</span> to create a new environment with the New Server Runtime wizard.</p>
-</td>
-<td align="left" headers="r4c1-t2 r1c3-t2"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t2" headers="r1c1-t2">Configurations</td>
-<td align="left" headers="r5c1-t2 r1c2-t2">Select a project configuration with pre-defined facets.
-<p>Select <span class="bold">&lt;custom&gt;</span> to manually select the facets for this project.</p>
-</td>
-<td align="left" headers="r5c1-t2 r1c3-t2">Utility JPA project with Java 5.0</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t2" headers="r1c1-t2">EAR membership</td>
-<td align="left" headers="r6c1-t2 r1c2-t2">Specify if this project should be included in an EAR file for deployment.
-<p>Select the <span class="bold">EAR Project Name</span>, or click <span class="bold">New</span> to create a new EAR project.</p>
-</td>
-<td align="left" headers="r6c1-t2 r1c3-t2"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblinformal" --></div>
-<!-- class="sect3" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project_wizard.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project_wizard.htm
deleted file mode 100644
index bfb014e70e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project_wizard.htm
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Create New JPA Project wizard</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Create New JPA Project wizard" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACBJGBG" name="CACBJGBG"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Create New JPA Project wizard</h1>
-<p>The Create New JPA Project wizard allows you to create a new Java project using JPA. The wizard consists of the following pages:</p>
-<ul>
-<li>
-<p><a href="ref_new_jpa_project.htm#CACBJAGC">New JPA Project page</a></p>
-</li>
-<li>
-<p><a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a></p>
-</li>
-</ul>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_map_view.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_map_view.htm
deleted file mode 100644
index aba760059b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_map_view.htm
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:50 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>JPA Details view (for attributes)</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="JPA Details view (for attributes)" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABIFBAF" name="BABIFBAF"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>JPA Details view (for attributes)</h1>
-<p><a id="sthref190" name="sthref190"></a><a id="sthref191" name="sthref191"></a><a id="sthref192" name="sthref192"></a>The <span class="gui-object-title">JPA Details</span> view displays the persistence information for the currently selected mapped attribute and contains the following areas:</p>
-<ul>
-<li>
-<p><a href="ref_mapping_general.htm#CACBHFIJ">General information</a></p>
-</li>
-<li>
-<p><a href="reference014.htm#CACBAEBC">Join Table Information</a></p>
-</li>
-<li>
-<p><a href="reference015.htm#CACFCEJC">Join Columns Information</a></p>
-</li>
-<li>
-<p><a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation information</a></p>
-</li>
-</ul>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_outline.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_outline.htm
deleted file mode 100644
index 11fa6b2224..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_outline.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>JPA Structure view</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="JPA Structure view" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABEGGFE" name="BABEGGFE"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>JPA Structure view</h1>
-<p><a id="sthref215" name="sthref215"></a><a id="sthref216" name="sthref216"></a>The <span class="gui-object-title">JPA Structure</span> view displays an outline of the structure (its attributes and mappings) of the entity that is currently selected or opened in the editor. The structural elements shown in the outline are the entity and its fields.</p>
-<div class="figure"><a id="sthref217" name="sthref217"></a>
-<p class="titleinfigure">Sample JPA Structure View</p>
-<img src="img/persistence_outline_view.png" alt="Sample JPA Structure view for an entity." title="Sample JPA Structure view for an entity." /><br /></div>
-<!-- class="figure" -->
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a>
-<p>&nbsp;</p>
-</div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm
deleted file mode 100644
index 7099087ada..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:52 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>JPA Development perspective</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="JPA Development perspective" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABIFBDB" name="BABIFBDB"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>JPA Development perspective</h1>
-<p><a id="sthref244" name="sthref244"></a><a id="sthref245" name="sthref245"></a>The <span class="bold">JPA Development perspective</span> defines the initial set and layout of views in the Workbench window when using Dali. By default, the <span class="gui-object-title">JPA Development perspective</span> includes the following views:</p>
-<ul>
-<li>
-<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
-</li>
-<li>
-<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
-</li>
-<li>
-<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
-</li>
-<li>
-<p><a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></p>
-</li>
-</ul>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<p><a href="../org.eclipse.platform.doc.user/concepts/concepts-4.htm">Perspectives</a></p>
-</div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_prop_view.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_prop_view.htm
deleted file mode 100644
index d7a07c83d5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_prop_view.htm
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>JPA Details view (for entities)</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="JPA Details view (for entities)" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABFAEBB" name="BABFAEBB"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>JPA Details view (for entities)</h1>
-<p><a id="sthref177" name="sthref177"></a><a id="sthref178" name="sthref178"></a><a id="sthref179" name="sthref179"></a>The <span class="gui-object-title">JPA Details</span> view displays the persistence information for the currently selected entity and contains the following tabs:</p>
-<ul>
-<li>
-<p><a href="reference009.htm#CACCAGGC">General information</a></p>
-</li>
-<li>
-<p><a href="reference010.htm#CACIJBGH">Attribute overrides</a></p>
-</li>
-<li>
-<p><a href="reference011.htm#CACBHIDA">Secondary table information</a></p>
-</li>
-<li>
-<p><a href="reference012.htm#CACFHGHE">Inheritance information</a></p>
-</li>
-</ul>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_primary_key.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_primary_key.htm
deleted file mode 100644
index c98a548484..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_primary_key.htm
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Primary Key Generation information</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Primary Key Generation information" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACFCCAB" name="CACFCCAB"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Primary Key Generation information</h1>
-<p>This table lists the fields available in the <span class="gui-object-title">Primary Key Generation</span> area in JPA Details view for <a href="tasks013.htm#BABGCBHG">ID mapping</a> types.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the options on the Join Columns tab." summary="This table describes the options on the Join Columns tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t13">Property</th>
-<th align="left" valign="bottom" id="r1c2-t13">Description</th>
-<th align="left" valign="bottom" id="r1c3-t13">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t13" headers="r1c1-t13"><a id="CACBAJBC" name="CACBAJBC"></a>Primary Key Generation</td>
-<td align="left" headers="r2c1-t13 r1c2-t13"><a id="sthref211" name="sthref211"></a><a id="sthref212" name="sthref212"></a>These fields define how the primary key is generated. These fields correspond to the <code>@GeneratedValue</code> annotation.</td>
-<td align="left" headers="r2c1-t13 r1c3-t13">Generated Value</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t13" headers="r1c1-t13"><a id="CACJEEEC" name="CACJEEEC"></a>&nbsp;&nbsp;&nbsp;Strategy</td>
-<td align="left" headers="r3c1-t13 r1c2-t13">
-<ul>
-<li>Auto</li>
-<li>
-<p>Identity &ndash; Values are assigned by the database's <span class="bold">Identity</span> column.</p>
-</li>
-<li>
-<p>Sequence &ndash; Values are assigned by a sequence table (see <a href="#CACFFHEH">Sequence&nbsp;Generator</a>).</p>
-</li>
-<li>
-<p>Table &ndash; Values are assigned by a database table (see <a href="#CACGFEAH">Table Generator</a>).</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r3c1-t13 r1c3-t13">Auto</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t13" headers="r1c1-t13"><a id="BABEEAHJ" name="BABEEAHJ"></a>&nbsp;&nbsp;Generator Name</td>
-<td align="left" headers="r4c1-t13 r1c2-t13">Unique name of the generated value.</td>
-<td align="left" headers="r4c1-t13 r1c3-t13"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t13" headers="r1c1-t13"><a id="CACGFEAH" name="CACGFEAH"></a>Table Generator</td>
-<td align="left" headers="r5c1-t13 r1c2-t13">These fields define the database table used for generating the primary key and correspond to the <code>@TableGenerator</code> annotation.
-<p>These fields apply only when <span class="bold">Strategy</span>&nbsp;=&nbsp;<span class="bold">Table</span>.</p>
-</td>
-<td align="left" headers="r5c1-t13 r1c3-t13"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Name</td>
-<td align="left" headers="r6c1-t13 r1c2-t13">Unique name of the generator.</td>
-<td align="left" headers="r6c1-t13 r1c3-t13"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Table</td>
-<td align="left" headers="r7c1-t13 r1c2-t13">Database table that stores the generated ID values.</td>
-<td align="left" headers="r7c1-t13 r1c3-t13"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Primary Key Column</td>
-<td align="left" headers="r8c1-t13 r1c2-t13">The column in the table generator's <span class="bold">Table</span> that contains the primary key.</td>
-<td align="left" headers="r8c1-t13 r1c3-t13"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r9c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Value Column</td>
-<td align="left" headers="r9c1-t13 r1c2-t13">The column that stores the generated ID values.</td>
-<td align="left" headers="r9c1-t13 r1c3-t13"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r10c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Primary Key Column Value</td>
-<td align="left" headers="r10c1-t13 r1c2-t13">The value for the <span class="bold">Primary Key Column</span> in the generator table.</td>
-<td align="left" headers="r10c1-t13 r1c3-t13"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r11c1-t13" headers="r1c1-t13"><a id="CACFFHEH" name="CACFFHEH"></a>Sequence&nbsp;Generator</td>
-<td align="left" headers="r11c1-t13 r1c2-t13"><a id="sthref213" name="sthref213"></a><a id="sthref214" name="sthref214"></a>These fields define the specific sequence used for generating the primary key and correspond to the <code>@SequenceGenerator</code> annotation.
-<p>These fields apply only when <span class="bold">Strategy</span> = <span class="bold">Sequence</span>.</p>
-</td>
-<td align="left" headers="r11c1-t13 r1c3-t13"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r12c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Name</td>
-<td align="left" headers="r12c1-t13 r1c2-t13">Name of the sequence table to use for defining primary key values.</td>
-<td align="left" headers="r12c1-t13 r1c3-t13"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r13c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Sequence</td>
-<td align="left" headers="r13c1-t13 r1c2-t13">Unique name of the sequence.</td>
-<td align="left" headers="r13c1-t13 r1c3-t13"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" -->
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="tasks013.htm#BABGCBHG">ID mapping</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></div>
-<!-- class="sect3" -->
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_project_properties.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_project_properties.htm
deleted file mode 100644
index 0fd473e54b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_project_properties.htm
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:52 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Project Properties page - JPA Options</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Project Properties page - JPA Options" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABJHBCI" name="BABJHBCI"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Project Properties page &ndash; JPA Options</h1>
-<p><a id="sthref232" name="sthref232"></a><a id="sthref233" name="sthref233"></a>Use the <span class="gui-object-title">JPA</span> options on the <span class="gui-object-title">Properties</span> page to select the database connection to use with the project.</p>
-<p>This table lists the properties available in the <span class="gui-object-title">JPA Details page</span>.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Persistence Properties page." summary="This table describes the options on the Persistence Properties page." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t28">Property</th>
-<th align="left" valign="bottom" id="r1c2-t28">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t28" headers="r1c1-t28"><a id="sthref234" name="sthref234"></a><a id="sthref235" name="sthref235"></a><a id="sthref236" name="sthref236"></a><a id="sthref237" name="sthref237"></a>Platform</td>
-<td align="left" headers="r2c1-t28 r1c2-t28">Select the vendor-specific platform.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t28" headers="r1c1-t28"><a id="sthref238" name="sthref238"></a><a id="sthref239" name="sthref239"></a><a id="sthref240" name="sthref240"></a>Connection</td>
-<td align="left" headers="r3c1-t28 r1c2-t28">The database connection used to map the persistent entities.
-<ul>
-<li>
-<p>To create a new connection, click <span class="bold">Add Connections</span>.</p>
-</li>
-<li>
-<p>To reconnect to an existing connection, click <span class="bold">Reconnect</span>.</p>
-</li>
-</ul>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t28" headers="r1c1-t28">&nbsp;&nbsp;Override default schema from connection</td>
-<td align="left" headers="r4c1-t28 r1c2-t28">Select a schema other than the default one derived from the connection information. Use this option if the default schema is incorrect or cannot be used. For example, use this option when the deployment login differs from the design-time login.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t28" headers="r1c1-t28">Persistent Class Management</td>
-<td align="left" headers="r5c1-t28 r1c2-t28">Specify if Dali will <span class="bold">discover annotated classes automatically</span>, or if the <span class="bold">annotated classes must be listed in the persistence.xml</span> file.
-<p><span class="bold">Note</span>: To insure application portability, you should explicitly list the managed persistence classes that are included in the persistence unit.</p>
-</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblinformal" -->
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="tasks025.htm#BABDBCBI">Modifying persistent project properties</a></div>
-<!-- class="sect2" -->
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm
deleted file mode 100644
index ccf4052c61..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Reference</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content=" Reference" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="sthref168" name="sthref168"></a></p>
-<h1>Reference</h1>
-<p>This section includes detailed help information for each of the following elements in the Dali OR Mapping Tool:</p>
-<ul>
-<li>
-<p><a href="reference001.htm#CACJJJJH">Wizards</a></p>
-</li>
-<li>
-<p><a href="reference008.htm#CACDJIIG">Property pages</a></p>
-</li>
-<li>
-<p><a href="reference028.htm#CACDEIEE">Preferences</a></p>
-</li>
-<li>
-<p><a href="reference029.htm#CACGEJDA">Dialogs</a></p>
-</li>
-<li>
-<p><a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a></p>
-</li>
-<li>
-<p><a href="reference031.htm#CACDHCIA">Icons and buttons</a></p>
-</li>
-<li>
-<p><a href="reference034.htm#CACBBDIB">Dali Developer Documentation</a></p>
-</li>
-</ul>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm
deleted file mode 100644
index 0c326d1c60..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Wizards</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Wizards" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACJJJJH" name="CACJJJJH"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Wizards</h1>
-<p>This section includes information on the following wizards:</p>
-<ul>
-<li>
-<p><a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a></p>
-</li>
-<li>
-<p><a href="reference002.htm#CIAGGGDF">Create JPA Entity wizard</a></p>
-</li>
-</ul>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm
deleted file mode 100644
index 55322e391c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Create JPA Entity wizard</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Create JPA Entity wizard" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIAGGGDF" name="CIAGGGDF"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Create JPA Entity wizard</h1>
-<p>The Create JPA wizard enables you to quickly add an entity and also add persistence fields to that entity. In addition, this wizard adds the accessor methods (<code>getter</code> and <code>setter</code>) in the class file. The wizard consists of the following pages:</p>
-<ul>
-<li>
-<p><a href="reference003.htm#CIAFEIGF">Entity Class page</a></p>
-</li>
-<li>
-<p><a href="reference004.htm#CIADECIA">Entity Properties page</a></p>
-</li>
-</ul>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm
deleted file mode 100644
index 2cb08d872b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm
+++ /dev/null
@@ -1,131 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Entity Class page</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Entity Class page" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIAFEIGF" name="CIAFEIGF"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Entity Class page</h1>
-<p>This table lists the properties of the Entity Class page of the <a href="reference002.htm#CIAGGGDF">Create JPA Entity wizard</a>.</p>
-<div class="tblformal"><a id="sthref169" name="sthref169"></a><a id="sthref170" name="sthref170"></a>
-<p class="titleintable">&nbsp;</p>
-<table class="Formal" title="" summary="This table describes the Entity Class page of the Create JPA Entities wizard." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t4">Property</th>
-<th align="left" valign="bottom" id="r1c2-t4">Description</th>
-<th align="left" valign="bottom" id="r1c3-t4">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t4" headers="r1c1-t4">
-<p>Project</p>
-</td>
-<td align="left" headers="r2c1-t4 r1c2-t4">
-<p>The name of t he JPA project.</p>
-</td>
-<td align="left" headers="r2c1-t4 r1c3-t4"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t4" headers="r1c1-t4">
-<p>Source Folder</p>
-</td>
-<td align="left" headers="r3c1-t4 r1c2-t4">
-<p>The location of the JPA project's src folder.</p>
-</td>
-<td align="left" headers="r3c1-t4 r1c3-t4"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t4" headers="r1c1-t4">
-<p>Java Package</p>
-</td>
-<td align="left" headers="r4c1-t4 r1c2-t4">
-<p>The name of the class package.</p>
-</td>
-<td align="left" headers="r4c1-t4 r1c3-t4"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t4" headers="r1c1-t4">
-<p>Class name</p>
-</td>
-<td align="left" headers="r5c1-t4 r1c2-t4">
-<p>The name of the Java class.</p>
-</td>
-<td align="left" headers="r5c1-t4 r1c3-t4"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t4" headers="r1c1-t4">
-<p>Superclass</p>
-</td>
-<td align="left" headers="r6c1-t4 r1c2-t4">
-<p>Select the superclass.</p>
-</td>
-<td align="left" headers="r6c1-t4 r1c3-t4"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t4" headers="r1c1-t4">
-<p>Inheritance</p>
-</td>
-<td align="left" headers="r7c1-t4 r1c2-t4">
-<p>Because the wizard creates a Java class with an <code>@Entity</code> notation, the <span class="bold">Entity</span> option is selected by default.</p>
-<p>Select <span class="bold">Mapped Superclass</span> if you defined a superclass.</p>
-<p>To add an <code>@Inheritance</code> notation to the entity, select <span class="bold">Inheritance</span> and then select one of the inheritance mapping strategies (described in JSR 220):</p>
-<ul>
-<li>
-<p>SINGLE_TABLE -- All classes in a hierarchy as mapped to a single table. This annotation is without an attribute for the inheritance strategy.</p>
-</li>
-<li>
-<p>TABLE_PER_CLASS -- Each class is mapped to a separate table.</p>
-</li>
-<li>
-<p>JOINED -- The root of the class hierarchy is represented by a single table. Each subclass is represented by a separate table that contains those fields that are specific to the subclass (not inherited from its superclass), as well as the column(s) that represent its primary key. The primary key column(s) of the subclass table serves as a foreign key to the primary key of the superclass table.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r7c1-t4 r1c3-t4">
-<p>Entity</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t4" headers="r1c1-t4">
-<p>XML Entity Mappings</p>
-</td>
-<td align="left" headers="r8c1-t4 r1c2-t4">
-<p>Select <span class="bold">Add to entity mappings in XML</span> to create XML mappings in <code>orm.xml</code>, rather than annotations.</p>
-</td>
-<td align="left" headers="r8c1-t4 r1c3-t4"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="tblformal" --></div>
-<!-- class="sect3" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm
deleted file mode 100644
index fd1b9996f5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Entity Properties page</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Entity Properties page" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIADECIA" name="CIADECIA"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Entity Properties page</h1>
-<p>This table lists the properties of the Entity Properties page of the <a href="reference002.htm#CIAGGGDF">Create JPA Entity wizard</a>.</p>
-<div class="tblformal"><a id="sthref171" name="sthref171"></a><a id="sthref172" name="sthref172"></a>
-<p class="titleintable">&nbsp;</p>
-<table class="Formal" title="" summary="This table to be converted to informal." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t5">Property</th>
-<th align="left" valign="bottom" id="r1c2-t5">Description</th>
-<th align="left" valign="bottom" id="r1c3-t5">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t5" headers="r1c1-t5">
-<p>Entity Name</p>
-</td>
-<td align="left" headers="r2c1-t5 r1c2-t5">
-<p>The name of the entity. By default, this value is the same as the one entered as the class name. If the entity name differs from the class name, then the entity name is added as an attribute. For example: <code>@Entity(name="EntityName")</code>.</p>
-</td>
-<td align="left" headers="r2c1-t5 r1c3-t5">
-<p>Determined by server.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t5" headers="r1c1-t5">
-<p>Table Name</p>
-</td>
-<td align="left" headers="r3c1-t5 r1c2-t5">
-<p>Select <span class="bold">Use default</span> to match the name of the mapped table name to the entity name. Otherwise, clear the <span class="bold">Use default</span> option and enter the name in the <span class="italic">Table Name</span> field. These options result in the addition of the <code>@Table</code> option to the Java class file.</p>
-</td>
-<td align="left" headers="r3c1-t5 r1c3-t5">
-<p>Use default.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t5" headers="r1c1-t5">
-<p>Entity Fields</p>
-</td>
-<td align="left" headers="r4c1-t5 r1c2-t5">
-<p>Click the <span class="bold">Add</span> button to add persistence fields using the Entity Fields dialog. This dialog enable you to build a field by entering a field name and selecting among persistence types. The <span class="bold">Key</span> option enables you to mark a field as a primary key. The dialog's <span class="bold">Browse</span> function enables you to add other persistence types described in the JPA specification. The <span class="bold">Edit</span> button enables you to change the name or type set for a persistent field.</p>
-</td>
-<td align="left" headers="r4c1-t5 r1c3-t5"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t5" headers="r1c1-t5">
-<p>Access Type</p>
-</td>
-<td align="left" headers="r5c1-t5 r1c2-t5">
-<p>Select whether the entity's access to instance variables is field-based or property-based, as defined in the JPA specification.</p>
-<ul>
-<li>
-<p><span class="bold">Field-based</span> &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
-</li>
-<li>
-<p><span class="bold">Property-based</span> &ndash; Persistent state accessed through the property accessor methods. The property accessor methods must be <span class="bold">public</span> or <span class="bold">private</span>.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r5c1-t5 r1c3-t5">
-<p>Field-based</p>
-</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="tblformal" -->
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="tasks001.htm#BABFBJBG">Creating a JPA Entity</a><br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
-<!-- class="sect3" -->
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm
deleted file mode 100644
index 6bd404341b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Mapping File Wizard</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Mapping File Wizard" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIAIJCCE" name="CIAIJCCE"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Mapping File Wizard</h1>
-<p>The Mapping File wizard enables you to add an <code>orm.xml</code> file to a JPA project if no object map exists at the location specified. For example, if you cleared the <span class="bold">Create orm.xml</span> option on the <a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a>, you can later add the <code>orm.xml</code> file to the src file of the project using this wizard.</p>
-<p>The <a href="#CIAIJCCE">Mapping File Wizard</a> consists of the Mapping File page.</p>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm
deleted file mode 100644
index 2028c23e2b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm
+++ /dev/null
@@ -1,119 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Mapping File Wizard</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Mapping File Wizard" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<div class="sect3"><!-- infolevel="all" infotype="General" --><a id="sthref173" name="sthref173"></a>
-<h1>Mapping File</h1>
-<p>This table lists the properties of the <a href="reference005.htm#CIAIJCCE">Mapping File Wizard</a>.</p>
-<div class="tblformal"><a id="sthref174" name="sthref174"></a><a id="sthref175" name="sthref175"></a>
-<p class="titleintable">Mapping File Wizard Properties</p>
-<table class="Formal" title="Mapping File Wizard Properties" summary="" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t6">Property</th>
-<th align="left" valign="bottom" id="r1c2-t6">Description</th>
-<th align="left" valign="bottom" id="r1c3-t6">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t6" headers="r1c1-t6">
-<p>Project</p>
-</td>
-<td align="left" headers="r2c1-t6 r1c2-t6">
-<p>The name of the JPA project.</p>
-</td>
-<td align="left" headers="r2c1-t6 r1c3-t6">
-<p>Selected.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t6" headers="r1c1-t6">
-<p>Source folder</p>
-</td>
-<td align="left" headers="r3c1-t6 r1c2-t6">
-<p>The location of the project's src folder. If needed, click <span class="bold">Browse</span> to point the wizard to the src file's location.</p>
-</td>
-<td align="left" headers="r3c1-t6 r1c3-t6">
-<p>Selected.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t6" headers="r1c1-t6">
-<p>File Path</p>
-</td>
-<td align="left" headers="r4c1-t6 r1c2-t6">
-<p>The location for the new <code>orm.xml</code> file.</p>
-</td>
-<td align="left" headers="r4c1-t6 r1c3-t6">
-<p>Selected.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t6" headers="r1c1-t6">
-<p>Default Access</p>
-</td>
-<td align="left" headers="r5c1-t6 r1c2-t6">
-<p>Select whether the access to the entity is field-based or property-based, as defined in JPA specification.</p>
-<ul>
-<li>
-<p>None &ndash; No access type specified.</p>
-</li>
-<li>
-<p><span class="bold">Property-based</span> &ndash; Persistent state accessed through the property accessor methods. The property accessor methods must be <span class="bold">public</span> or <span class="bold">private</span>.</p>
-</li>
-<li>
-<p><span class="bold">Field-based</span> &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r5c1-t6 r1c3-t6">
-<p>None</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t6" headers="r1c1-t6">
-<p>Add to persistence unit</p>
-</td>
-<td align="left" headers="r6c1-t6 r1c2-t6">
-<p>Designates the persistence unit for this object map file.</p>
-</td>
-<td align="left" headers="r6c1-t6 r1c3-t6">
-<p>Selected.</p>
-</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="tblformal" --></div>
-<!-- class="sect3" -->
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm
deleted file mode 100644
index de8a03ae2a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Mapping File Wizard Properties</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Mapping File Wizard Properties" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<div class="sect2"><!-- infolevel="all" infotype="General" --><a id="sthref176" name="sthref176"></a>
-<h1>Generate DDL from Entities Wizard</h1>
-<p>The Generate DDL from Entities Wizard to quickly create DDL scripts from your persistent entities. Dali automatically creates the necessary primary and foreign keys, based on the entity mappings.</p>
-</div>
-<!-- class="sect2" -->
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm
deleted file mode 100644
index e1a36d01e9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Property pages</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Property pages" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACDJIIG" name="CACDJIIG"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Property pages</h1>
-<p>This section includes information on the following:</p>
-<ul>
-<li>
-<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
-</li>
-<li>
-<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
-</li>
-<li>
-<p><a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></p>
-</li>
-<li>
-<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
-</li>
-</ul>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm
deleted file mode 100644
index f1b9b244be..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>General information</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="General information" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACCAGGC" name="CACCAGGC"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>General information</h1>
-<p>This table lists the General information fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t7">Property</th>
-<th align="left" valign="bottom" id="r1c2-t7">Description</th>
-<th align="left" valign="bottom" id="r1c3-t7">Default</th>
-<th align="left" valign="bottom" id="r1c4-t7">Available for Entity&nbsp;Type</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t7" headers="r1c1-t7">Mapping Type Hyperlink</td>
-<td align="left" headers="r2c1-t7 r1c2-t7">Clicking the name of the mapping type, which is represented as a hyperlink, invokes the Mapping Type Selection dialog. Use this dialog to specify the type of entity: Mapped Superclass, Embeddable or the default mapping type.</td>
-<td align="left" headers="r2c1-t7 r1c3-t7">Entity</td>
-<td align="left" headers="r2c1-t7 r1c4-t7"><a href="tasks006.htm#BABGBIEE">Entity</a>, <a href="tasks007.htm#BABFEICE">Embeddable</a>, and <a href="tasks008.htm#BABDAGCI">Mapped superclass</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t7" headers="r1c1-t7">Name</td>
-<td align="left" headers="r3c1-t7 r1c2-t7">The name of this entity. By default, the class name is used as the entity name.</td>
-<td align="left" headers="r3c1-t7 r1c3-t7"><br /></td>
-<td align="left" headers="r3c1-t7 r1c4-t7"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t7" headers="r1c1-t7">Table</td>
-<td align="left" headers="r4c1-t7 r1c2-t7">The default database table information for this entity. These fields can be overridden by the information in the <a href="reference010.htm#CACIJBGH">Attribute overrides</a> area.</td>
-<td align="left" headers="r4c1-t7 r1c3-t7"><br /></td>
-<td align="left" headers="r4c1-t7 r1c4-t7"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t7" headers="r1c1-t7">&nbsp;&nbsp;Name</td>
-<td align="left" headers="r5c1-t7 r1c2-t7">The name of the primary database table associated with the entity.</td>
-<td align="left" headers="r5c1-t7 r1c3-t7"><br /></td>
-<td align="left" headers="r5c1-t7 r1c4-t7"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t7" headers="r1c1-t7">&nbsp;&nbsp;Catalog</td>
-<td align="left" headers="r6c1-t7 r1c2-t7">The database catalog that contains the <span class="bold">Table</span>.</td>
-<td align="left" headers="r6c1-t7 r1c3-t7">As defined in <code>orm.xml</code>.</td>
-<td align="left" headers="r6c1-t7 r1c4-t7"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t7" headers="r1c1-t7">&nbsp;&nbsp;Schema</td>
-<td align="left" headers="r7c1-t7 r1c2-t7">The database schema that contains the <span class="bold">Table</span>.</td>
-<td align="left" headers="r7c1-t7 r1c3-t7">As defined in <code>orm.xml</code>.</td>
-<td align="left" headers="r7c1-t7 r1c4-t7"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblinformal" -->
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
-<!-- class="sect3" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm
deleted file mode 100644
index 21bdad0d62..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Attribute overrides</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Attribute overrides" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACIJBGH" name="CACIJBGH"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Attribute overrides</h1>
-<p><a id="sthref180" name="sthref180"></a><a id="sthref181" name="sthref181"></a><a id="sthref182" name="sthref182"></a>Use the <span class="gui-object-title">Attribute Overrides</span> area in the <span class="gui-object-title">JPA Details</span> view to override the default settings specified in the <a href="reference009.htm#CACCAGGC">General information</a> area of an attribute. Attribute overrides generally override/configure attribtues that are inherited or embedded.</p>
-<p>This table lists the Attribute override fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t8">Property</th>
-<th align="left" valign="bottom" id="r1c2-t8">Description</th>
-<th align="left" valign="bottom" id="r1c3-t8">Default</th>
-<th align="left" valign="bottom" id="r1c4-t8">Available for Entity&nbsp;Type</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t8" headers="r1c1-t8">Attribute Overrides</td>
-<td align="left" headers="r2c1-t8 r1c2-t8">Specify a property or field to be overridden (from the default mappings). Select <span class="bold">Override Default</span>.</td>
-<td align="left" headers="r2c1-t8 r1c3-t8"><br /></td>
-<td align="left" headers="r2c1-t8 r1c4-t8"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t8" headers="r1c1-t8">Join Columns</td>
-<td align="left" headers="r3c1-t8 r1c2-t8"><br /></td>
-<td align="left" headers="r3c1-t8 r1c3-t8"><br /></td>
-<td align="left" headers="r3c1-t8 r1c4-t8"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblinformal" -->
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="reference009.htm#CACCAGGC">General information</a><br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
-<!-- class="sect3" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm
deleted file mode 100644
index ed5e368429..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:50 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Secondary table information</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Secondary table information" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACBHIDA" name="CACBHIDA"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Secondary table information</h1>
-<p><a id="sthref183" name="sthref183"></a><a id="sthref184" name="sthref184"></a><a id="sthref185" name="sthref185"></a><a id="sthref186" name="sthref186"></a>Use the <span class="gui-object-title">Secondary Tables</span> area in the <span class="gui-object-title">JPA Details</span> view to associate additional tables with an entity. Use this area if the data associated with an entity is spread across multiple tables.</p>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a><br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
-<!-- class="sect3" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm
deleted file mode 100644
index 544604dfb5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:50 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Inheritance information</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Inheritance information" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACFHGHE" name="CACFHGHE"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Inheritance information</h1>
-<p><a id="sthref187" name="sthref187"></a><a id="sthref188" name="sthref188"></a>This table lists the fields available on the <span class="gui-object-title">Inheritance</span> area in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the options on the Persistence Properties view, Inheritance tab." summary="This table describes the options on the Persistence Properties view, Inheritance tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t9">Property</th>
-<th align="left" valign="bottom" id="r1c2-t9">Description</th>
-<th align="left" valign="bottom" id="r1c3-t9">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t9" headers="r1c1-t9">Strategy</td>
-<td align="left" headers="r2c1-t9 r1c2-t9">Specify the strategy to use when mapping a class or class hierarchy:
-<ul>
-<li>
-<p>Single table &ndash; All classes in the hierarchy are mapped to a single table.</p>
-</li>
-<li>
-<p>Joined &ndash; The root of the hierarchy is mapped to a single table; each child maps to its own table.</p>
-</li>
-<li>
-<p>Table per class &ndash; Each class is mapped to a separate table.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r2c1-t9 r1c3-t9">Single table</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t9" headers="r1c1-t9">Discriminator Column</td>
-<td align="left" headers="r3c1-t9 r1c2-t9">Use to specify the name of the discriminator column when using a <span class="bold">Single</span> or <span class="bold">Joined</span> inheritance strategy.</td>
-<td align="left" headers="r3c1-t9 r1c3-t9"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t9" headers="r1c1-t9">Discriminator Type</td>
-<td align="left" headers="r4c1-t9 r1c2-t9">Set this field to set the discriminator type to <code>Char</code> or <code>Integer</code> (instead of its default: <code>String</code>). The <span class="bold">Discriminator Value</span> must conform to this type.</td>
-<td align="left" headers="r4c1-t9 r1c3-t9">String</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t9" headers="r1c1-t9">Discriminator Value</td>
-<td align="left" headers="r5c1-t9 r1c2-t9">Specify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified <span class="bold">Discriminator Type</span>.</td>
-<td align="left" headers="r5c1-t9 r1c3-t9"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t9" headers="r1c1-t9">Primary Key Join Columns</td>
-<td align="left" headers="r6c1-t9 r1c2-t9">Use to override the default primary key join columns. Select <span class="bold">Override Default</span>, then click <span class="bold">Add</span> to select new Join Column.
-<p>This field corresponds with @PrimaryKeyJoinColumn annotation.</p>
-</td>
-<td align="left" headers="r6c1-t9 r1c3-t9"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" -->
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a><br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
-<!-- class="sect3" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm
deleted file mode 100644
index dd495829e1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:50 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Inheritance information</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Inheritance information" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<div class="sect3"><!-- infolevel="all" infotype="General" --><a id="sthref189" name="sthref189"></a>
-<h1>Queries</h1>
-<p>Use the queries area of the JPA Details view to create named queries and named native queries. Refer to <a href="tasks009.htm#BABIGBGG">"Creating Named Queries"</a> for additional information.</p>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="tasks009.htm#BABIGBGG">Creating Named Queries</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
-<!-- class="sect3" -->
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm
deleted file mode 100644
index d19978121e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:50 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Join Table Information</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Join Table Information" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACBAEBC" name="CACBAEBC"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Join Table Information</h1>
-<p>Use area to specify a mapped column for joining an entity association. By default, the mapping is assumed to have a single join.</p>
-<p>This table lists the fields available on the <span class="gui-object-title">Join Table</span> area in <span class="gui-object-title">the JPA Details</span> view for <a href="tasks016.htm#BABHGEBD">One-to-many mapping</a> and <a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a> mapping types.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the options on the Join Table tab." summary="This table describes the options on the Join Table tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t11">Property</th>
-<th align="left" valign="bottom" id="r1c2-t11">Description</th>
-<th align="left" valign="bottom" id="r1c3-t11">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t11" headers="r1c1-t11">Name</td>
-<td align="left" headers="r2c1-t11 r1c2-t11">Name of the join table that contains the foreign key column.</td>
-<td align="left" headers="r2c1-t11 r1c3-t11">By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t11" headers="r1c1-t11"><a id="CACBBDFG" name="CACBBDFG"></a>Join Columns</td>
-<td align="left" headers="r3c1-t11 r1c2-t11"><a id="sthref207" name="sthref207"></a><a id="sthref208" name="sthref208"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
-<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
-</td>
-<td align="left" headers="r3c1-t11 r1c3-t11">By default, the mapping is assumed to have a single join.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t11" headers="r1c1-t11">Inverse Join Columns</td>
-<td align="left" headers="r4c1-t11 r1c2-t11">Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</td>
-<td align="left" headers="r4c1-t11 r1c3-t11"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" -->
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="reference030.htm#CACCGEHC">Edit Join Columns Dialog</a></div>
-<!-- class="sect3" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm
deleted file mode 100644
index 11e35fa477..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:50 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Join Columns Information</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Join Columns Information" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACFCEJC" name="CACFCEJC"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Join Columns Information</h1>
-<p>This table lists the fields available in the <span class="gui-object-title">Join Table</span> area in <span class="gui-object-title">JPA Details</span> view for <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a> and <a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a> mapping types.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the options on the Join Columns tab." summary="This table describes the options on the Join Columns tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t12">Property</th>
-<th align="left" valign="bottom" id="r1c2-t12">Description</th>
-<th align="left" valign="bottom" id="r1c3-t12">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t12" headers="r1c1-t12">Join Column</td>
-<td align="left" headers="r2c1-t12 r1c2-t12"><a id="sthref209" name="sthref209"></a><a id="sthref210" name="sthref210"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
-<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
-</td>
-<td align="left" headers="r2c1-t12 r1c3-t12">By default, the mapping is assumed to have a single join.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" -->
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="reference030.htm#CACCGEHC">Edit Join Columns Dialog</a></div>
-<!-- class="sect3" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm
deleted file mode 100644
index b938a47f57..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>General information</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="General information" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACCACGH" name="CACCACGH"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>General information</h1>
-<p>This table lists the General information fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t14">Property</th>
-<th align="left" valign="bottom" id="r1c2-t14">Description</th>
-<th align="left" valign="bottom" id="r1c3-t14">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t14" headers="r1c1-t14">Package</td>
-<td align="left" headers="r2c1-t14 r1c2-t14">The Java package that contains the persistent entities. Click <span class="bold">Browse</span> and select the package</td>
-<td align="left" headers="r2c1-t14 r1c3-t14"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t14" headers="r1c1-t14">Schema</td>
-<td align="left" headers="r3c1-t14 r1c2-t14">The database schema that contains the <span class="bold">Table</span>.
-<p>This field corresponds to the <code>&lt;schema&gt;</code> element in the <code>orm.xml</code> file.</p>
-</td>
-<td align="left" headers="r3c1-t14 r1c3-t14"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t14" headers="r1c1-t14">Catalog</td>
-<td align="left" headers="r4c1-t14 r1c2-t14">The database catalog that contains the <span class="bold">Table</span>.
-<p>This field corresponds to the <code>&lt;catalog&gt;</code> element in the <code>orm.xml</code> file.</p>
-</td>
-<td align="left" headers="r4c1-t14 r1c3-t14"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t14" headers="r1c1-t14">Access</td>
-<td align="left" headers="r5c1-t14 r1c2-t14">Specify the default access method for the variables in the project:
-<ul>
-<li>
-<p>Property</p>
-</li>
-<li>
-<p>Field</p>
-</li>
-</ul>
-<p>This field corresponds to the <code>&lt;access&gt;</code> element in the <code>orm.xml</code> file.</p>
-</td>
-<td align="left" headers="r5c1-t14 r1c3-t14"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" -->
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
-<!-- class="sect3" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm
deleted file mode 100644
index e183172b5a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Persistence Unit information</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Persistence Unit information" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACEAGBG" name="CACEAGBG"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Persistence Unit information</h1>
-<p>This table lists the Persistence Unit information fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type. These fields are contained in the <code>&lt;persistence-unit-metadata&gt;</code> element in the <code>orm.xml</code> file.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t15">Property</th>
-<th align="left" valign="bottom" id="r1c2-t15">Description</th>
-<th align="left" valign="bottom" id="r1c3-t15">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t15" headers="r1c1-t15">XML Mapping Data Complete</td>
-<td align="left" headers="r2c1-t15 r1c2-t15">Specifies that the Java classes in this persistence unit are fully specified by their metadata. Any annotations will be ignored.
-<p>This field corresponds to the <code>&lt;xml-mapping-metadata-complete&gt;</code> element in the <code>orm.xml</code> file.</p>
-</td>
-<td align="left" headers="r2c1-t15 r1c3-t15"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t15" headers="r1c1-t15">Schema</td>
-<td align="left" headers="r3c1-t15 r1c2-t15">The database schema that contains the <span class="bold">Table</span>.
-<p>This field corresponds to the <code>&lt;schema&gt;</code> element in the <code>orm.xml</code> file.</p>
-</td>
-<td align="left" headers="r3c1-t15 r1c3-t15"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t15" headers="r1c1-t15">Catalog</td>
-<td align="left" headers="r4c1-t15 r1c2-t15">The database catalog that contains the <span class="bold">Table</span>.
-<p>This field corresponds to the <code>&lt;catalog&gt;</code> element in the <code>orm.xml</code> file.</p>
-</td>
-<td align="left" headers="r4c1-t15 r1c3-t15"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t15" headers="r1c1-t15">Access Type</td>
-<td align="left" headers="r5c1-t15 r1c2-t15">Specify how the entity its access instance variables.
-<ul>
-<li>
-<p>Property &ndash; Persistent state accessed through the property accessor methods. The property accessor methods must be <span class="bold">public</span> or <span class="bold">private</span>.</p>
-</li>
-<li>
-<p>Field &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r5c1-t15 r1c3-t15">Property</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t15" headers="r1c1-t15">Cascade Persist</td>
-<td align="left" headers="r6c1-t15 r1c2-t15">Adds cascade-persist to the set of cascade options in entity relationships of the persistence unit.
-<p>This field corresponds to the <code>&lt;cascade-persist&gt;</code> element in the <code>orm.xml</code> file.</p>
-</td>
-<td align="left" headers="r6c1-t15 r1c3-t15"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" -->
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
-<!-- class="sect3" -->
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm
deleted file mode 100644
index fbdbc4646d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>persistence.xml Editor</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="persistence.xml Editor" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIACCHID" name="CIACCHID"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>persistence.xml Editor</h1>
-<p>The persistence.xml Editor provides an interface that enables you to update the persistence.xml file. For projects using the EclipseLink platform, the perisistence.xml Editor consists of the following pages:</p>
-<ul>
-<li>
-<p><a href="reference019.htm#CIACIFGJ">General</a></p>
-</li>
-<li>
-<p><a href="reference020.htm#CIAFFJIE">Connection</a></p>
-</li>
-<li>
-<p><a href="reference021.htm#CIAJAFEG">Customization</a></p>
-</li>
-<li>
-<p><a href="reference022.htm#CIABEDCH">Caching</a></p>
-</li>
-<li>
-<p><a href="reference023.htm#CIABGHHI">Logging</a></p>
-</li>
-<li>
-<p><a href="reference024.htm#CIAFJCHE">Options</a></p>
-</li>
-<li>
-<p><a href="reference025.htm#CIACCFCB">Schema Generation</a></p>
-</li>
-<li>
-<p><a href="reference026.htm#CIAHJDFF">Properties</a></p>
-</li>
-<li>
-<p><a href="reference027.htm#CIAHCJAH">Source</a></p>
-</li>
-</ul>
-<p>For projects using the Generic platform, the following subset of these pages is available:</p>
-<ul>
-<li>
-<p><a href="reference019.htm#CIACIFGJ">General</a></p>
-</li>
-<li>
-<p><a href="reference020.htm#CIAFFJIE">Connection</a></p>
-</li>
-<li>
-<p><a href="reference026.htm#CIAHJDFF">Properties</a></p>
-</li>
-<li>
-<p><a href="reference027.htm#CIAHCJAH">Source</a></p>
-</li>
-</ul>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm
deleted file mode 100644
index 69660c6367..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>General</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="General" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIACIFGJ" name="CIACIFGJ"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>General</h1>
-<p>The following table lists properties available in the General page of the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div class="tblformal"><a id="sthref218" name="sthref218"></a><a id="sthref219" name="sthref219"></a>
-<p class="titleintable">Properties of the General Page</p>
-<table class="Formal" title="Properties of the General Page" summary="This table describes the properties of the persistence.xml&rsquo;s General page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t16">Property</th>
-<th align="left" valign="bottom" id="r1c2-t16">Description</th>
-<th align="left" valign="bottom" id="r1c3-t16">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t16" headers="r1c1-t16">
-<p>Name</p>
-</td>
-<td align="left" headers="r2c1-t16 r1c2-t16">
-<p>Enter the name of the persistence unit.</p>
-</td>
-<td align="left" headers="r2c1-t16 r1c3-t16">
-<p>The project name.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t16" headers="r1c1-t16">
-<p>Persistence Provider</p>
-</td>
-<td align="left" headers="r3c1-t16 r1c2-t16">
-<p>Enter the name of the persistence provider.</p>
-</td>
-<td align="left" headers="r3c1-t16 r1c3-t16">
-<p>Determined by the server.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t16" headers="r1c1-t16">
-<p>Description</p>
-</td>
-<td align="left" headers="r4c1-t16 r1c2-t16">
-<p>Enter a description for this persistence unit. This is an optional property.</p>
-</td>
-<td align="left" headers="r4c1-t16 r1c3-t16"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t16" headers="r1c1-t16">
-<p>Managed Classes</p>
-</td>
-<td align="left" headers="r5c1-t16 r1c2-t16">
-<p>Add or remove the classes managed through the persistence unit.</p>
-</td>
-<td align="left" headers="r5c1-t16 r1c3-t16"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t16" headers="r1c1-t16">
-<p>Exclude Unlisted Classes</p>
-</td>
-<td align="left" headers="r6c1-t16 r1c2-t16">
-<p>Select to include all annotated entity classes in the root of the persistence unit.</p>
-</td>
-<td align="left" headers="r6c1-t16 r1c3-t16">
-<p>False</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t16" headers="r1c1-t16">
-<p>XML Mapping Files</p>
-</td>
-<td align="left" headers="r7c1-t16 r1c2-t16">
-<p>Add or remove the object/relational mapping XML files that define the classes to be managed by the persistence unit.</p>
-</td>
-<td align="left" headers="r7c1-t16 r1c3-t16">
-<p>Meta-INF\orm.xml</p>
-</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="tblformal" --></div>
-<!-- class="sect3" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm
deleted file mode 100644
index 672b473bea..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Connection</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Connection" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIAFFJIE" name="CIAFFJIE"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Connection</h1>
-<p>The following table lists the properties available in the Connection page of the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div class="tblformal"><a id="sthref220" name="sthref220"></a><a id="sthref221" name="sthref221"></a>
-<p class="titleintable">Properties of the Connection Page</p>
-<table class="Formal" title="Properties of the Connection Page" summary="This table lists the properties for the persistence.xml editor&rsquo;s connection page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t17">Property</th>
-<th align="left" valign="bottom" id="r1c2-t17">Description</th>
-<th align="left" valign="bottom" id="r1c3-t17">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t17" headers="r1c1-t17">
-<p>Transaction Type</p>
-</td>
-<td align="left" headers="r2c1-t17 r1c2-t17">
-<p>Specify if the connection for this persistence unit uses one of the following transaction types:</p>
-<ul>
-<li>
-<p><span class="bold">Default</span> -- Select to use the container used by the container.</p>
-</li>
-<li>
-<p><span class="bold">JTA</span> (Java Transaction API) -- Transactions of the Java EE server.</p>
-</li>
-<li>
-<p><span class="bold">Resource Local</span> -- Native actions of a JDBC driver that are referenced by a persistence unit.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r2c1-t17 r1c3-t17"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t17" headers="r1c1-t17">
-<p>Batch Writing</p>
-</td>
-<td align="left" headers="r3c1-t17 r1c2-t17">
-<p>Specify the use of batch writing to optimize transactions with multiple write operations.</p>
-<p>Set the value of this property into the session at deployment time.</p>
-<p>Note: This property applies when used both in a Java SE and Java EE environment.</p>
-<p>The following are the valid values for oracle.toplink.config.BatchWriting:</p>
-<ul>
-<li>
-<p><span class="bold">JDBC</span>&ndash;Use JDBC batch writing.</p>
-</li>
-<li>
-<p><span class="bold">Buffered</span>&ndash;Do not use either JDBC batch writing nor native platform batch writing.</p>
-</li>
-<li>
-<p><span class="bold">OracleJDBC</span>&ndash;Use both JDBC batch writing and Oracle native platform batch writing.</p>
-</li>
-<li>
-<p><span class="bold">None</span>&ndash;Do not use batch writing (turn it off).</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r3c1-t17 r1c3-t17">
-<p>None</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t17" headers="r1c1-t17">
-<p>JTA Data Source Name</p>
-</td>
-<td align="left" headers="r4c1-t17 r1c2-t17">
-<p>If you selected <span class="bold">JTA</span> as the transaction type, then enter the name of the default JTA data source for the persistence unit.</p>
-</td>
-<td align="left" headers="r4c1-t17 r1c3-t17"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t17" headers="r1c1-t17">
-<p>Non-JTA Data Source Name</p>
-</td>
-<td align="left" headers="r5c1-t17 r1c2-t17">
-<p>If you selected <span class="bold">Resource Local</span> as the transaction type, then enter the name of the non-JTA data source.</p>
-<p>This property is not available for projects using the Generic platform.</p>
-</td>
-<td align="left" headers="r5c1-t17 r1c3-t17"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t17" headers="r1c1-t17">
-<p>&nbsp;&nbsp;Bind Parameters</p>
-</td>
-<td align="left" headers="r6c1-t17 r1c2-t17">
-<p>Control whether or not the query uses parameter binding.</p>
-<p>Note: This property applies when used in a Java SE environment.</p>
-<p>This property is not available for projects using the Generic platform.</p>
-</td>
-<td align="left" headers="r6c1-t17 r1c3-t17"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t17" headers="r1c1-t17">
-<p>EclipseLink Connection Pool</p>
-</td>
-<td align="left" headers="r7c1-t17 r1c2-t17">
-<p>Define the connection pool driver, URL, user name and password.</p>
-<p>These properties are note available for projects using the Generic platform.</p>
-</td>
-<td align="left" headers="r7c1-t17 r1c3-t17"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t17" headers="r1c1-t17">
-<p>&nbsp;&nbsp;Read Connection</p>
-</td>
-<td align="left" headers="r8c1-t17 r1c2-t17">
-<p>The maximum and minimum number of connections allowed in the JDBC read connection pool.</p>
-<p>Note: These properties apply when used in a Java SE environment.</p>
-<p>These properties are not available for projects using the Generic platform</p>
-</td>
-<td align="left" headers="r8c1-t17 r1c3-t17"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r9c1-t17" headers="r1c1-t17">
-<p>&nbsp;&nbsp;Write Connection</p>
-</td>
-<td align="left" headers="r9c1-t17 r1c2-t17">
-<p>The maximum and minimum number of connections allowed in the JDBC write connection pool.</p>
-<p>Note: These properties apply when used in a Java SE environment.</p>
-<p>These properties are not available for projects using the Generic platform</p>
-</td>
-<td align="left" headers="r9c1-t17 r1c3-t17"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="tblformal" --></div>
-<!-- class="sect3" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm
deleted file mode 100644
index 395b15aec7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Customization</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Customization" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIAJAFEG" name="CIAJAFEG"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Customization</h1>
-<p>The following table lists the properties available in the Customization page of the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div class="tblformal"><a id="sthref222" name="sthref222"></a><a id="sthref223" name="sthref223"></a>
-<p class="titleintable">Properties of the Customization Page</p>
-<table class="Formal" title="Properties of the Customization Page" summary="This table lists the properties of the persistence.xml Editor&rsquo;s Customization page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t18">Property</th>
-<th align="left" valign="bottom" id="r1c2-t18">Description</th>
-<th align="left" valign="bottom" id="r1c3-t18">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t18" headers="r1c1-t18">
-<p>Weaving</p>
-</td>
-<td align="left" headers="r2c1-t18 r1c2-t18">
-<p>Specifies if weaving of the entity classes is performed. The EclipseLink JPA persistence provider uses weaving to enhance JPA entities for such properties as lazy loading, change tracking, fetch groups, and internal optimizations. Select from the following options:</p>
-<ul>
-<li>
-<p><span class="bold">No Weaving</span></p>
-</li>
-<li>
-<p><span class="bold">Weave Dynamically</span></p>
-</li>
-<li>
-<p><span class="bold">Weave Statically</span> -- Use this option if you plan to execute your application outside of a Java EE 5 container in an environment that does not permit the use of <code>-javaagent:eclipselink.jar</code> on the JVM command line. This assumes that classes have already been statically woven. Run the static weaver on the classes before deploying them.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r2c1-t18 r1c3-t18">
-<p>Weave Dynamically</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t18" headers="r1c1-t18">
-<p>&nbsp;&nbsp;Weaving Lazy</p>
-</td>
-<td align="left" headers="r3c1-t18 r1c2-t18">
-<p>Select this optoin to enable lazy weaving.</p>
-</td>
-<td align="left" headers="r3c1-t18 r1c3-t18"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t18" headers="r1c1-t18">
-<p>&nbsp;&nbsp;Weaving Fetch Groups</p>
-</td>
-<td align="left" headers="r4c1-t18 r1c2-t18">
-<p>Select this option to enable fetch groups through weaving. Set this option to false if:</p>
-<ul>
-<li>
-<p>There is no weaving.</p>
-</li>
-<li>
-<p>Classes should not be changed during weaving (for example, when debugging).</p>
-</li>
-</ul>
-<p>Set this property to false for platforms where it is not supported.</p>
-</td>
-<td align="left" headers="r4c1-t18 r1c3-t18"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t18" headers="r1c1-t18">
-<p>&nbsp;&nbsp;Weaving Change Tracking</p>
-</td>
-<td align="left" headers="r5c1-t18 r1c2-t18">
-<p>Select this option to use weaving to detect which fields or properties of the object change.</p>
-</td>
-<td align="left" headers="r5c1-t18 r1c3-t18"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t18" headers="r1c1-t18">
-<p>&nbsp;&nbsp;Throw Exceptions</p>
-</td>
-<td align="left" headers="r6c1-t18 r1c2-t18">
-<p>Select this option to set EclipseLink to throw an exception or log a warning when it encounters a problem with any of the files listed in a <span class="bold">persistence.xml</span> file <code>&lt;mapping-file&gt;</code> element.</p>
-</td>
-<td align="left" headers="r6c1-t18 r1c3-t18"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t18" headers="r1c1-t18">
-<p>Session Customizer</p>
-</td>
-<td align="left" headers="r7c1-t18 r1c2-t18">
-<p>Select a session customizer class: a Java class that implements the <code>eclipselink.tools.sessionconfiguration.SessionCustomizer</code> interface and provides a default (zero-argument) constructor. Use this class' <code>customize</code> method, which takes an <code>eclipselink.sessions.Session</code>, to programmatically access advanced EclipseLink session API.</p>
-</td>
-<td align="left" headers="r7c1-t18 r1c3-t18"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t18" headers="r1c1-t18">
-<p>Descriptor Customizer</p>
-</td>
-<td align="left" headers="r8c1-t18 r1c2-t18">
-<p>Select an EclipseLink descriptor customizer class&ndash;a Java class that implements the <code>eclipselink.tools.sessionconfiguration.DescriptorCustomizer</code> interface and provides a default (zero-argument) constructor. Use this class's <code>customize</code> method, which takes an <code>eclipselink.descriptors.ClassDescriptor</code>, to programmatically access advanced EclipseLink descriptor and mapping API for the descriptor associated with the JPA entity named <code>&lt;ENTITY&gt;</code>.</p>
-</td>
-<td align="left" headers="r8c1-t18 r1c3-t18"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="tblformal" -->
-<p>The following table lists the properties of the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-This page is not available for projects using the <span class="bold">Generic</span> platform.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-</div>
-<!-- class="sect3" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm
deleted file mode 100644
index 391d913f21..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm
+++ /dev/null
@@ -1,157 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Caching</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Caching" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIABEDCH" name="CIABEDCH"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Caching</h1>
-<p>This table lists the properties of the Caching page of the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div class="tblformal"><a id="sthref224" name="sthref224"></a><a id="sthref225" name="sthref225"></a>
-<p class="titleintable">Properties of the Caching Page</p>
-<table class="Formal" title="Properties of the Caching Page" summary="This table lists the properties of the persistence.xml&rsquo;s Caching page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t20">Property</th>
-<th align="left" valign="bottom" id="r1c2-t20">Description</th>
-<th align="left" valign="bottom" id="r1c3-t20">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t20" headers="r1c1-t20">
-<p>Default Cache Type</p>
-</td>
-<td align="left" headers="r2c1-t20 r1c2-t20">
-<p>Select one of the following as the Default Cache Type:</p>
-<ul>
-<li>
-<p><span class="bold">Soft with Weak Subcache</span>&ndash;This option is similar to <span class="bold">Weak with Hard Subcache</span> except that it maintains a most frequently used subcache that uses soft references. The size of the subcache is proportional to the size of the identity map. The subcache uses soft references to ensure that these objects are garbage-collected only if the system is low on memory.</p>
-<p>Use this identity map in most circumstances as a means to control memory used by the cache.</p>
-</li>
-<li>
-<p><span class="bold">Week with Hard Subcache</span>&ndash;This option is similar to <span class="bold">Soft with Weak</span> subcache except that it maintains a most frequently used subcache that uses hard references. Use this identity map if soft references are not suitable for your platform.</p>
-</li>
-<li>
-<p><span class="bold">Weak</span>&ndash;This option is similar to <span class="bold">Full</span>, except that objects are referenced using weak references. This option uses less memory than <span class="bold">Full</span>, allows complete garbage collection and provides full caching and guaranteed identity.</p>
-<p>Use this identity map for transactions that, once started, stay on the server side.</p>
-</li>
-<li>
-<p><span class="bold">Soft</span>&ndash;This option is similar to <span class="bold">Weak</span> except that the map holds the objects using soft references. This identity map enables full garbage collection when memory is low. It provides full caching and guaranteed identity.</p>
-</li>
-<li>
-<p><span class="bold">Full</span>&ndash;This option provides full caching and guaranteed identity: all objects are cached and not removed.</p>
-<p>Note: This process may be memory-intensive when many objects are read.</p>
-</li>
-<li>
-<p><span class="bold">None</span>&ndash;This option does not preserve object identity and does not cache objects.This option is not recommended.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r2c1-t20 r1c3-t20">
-<p>Weak with hard subcache</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t20" headers="r1c1-t20">
-<p>Default Cache Size</p>
-</td>
-<td align="left" headers="r3c1-t20 r1c2-t20">
-<p>Set the size of the cache.</p>
-</td>
-<td align="left" headers="r3c1-t20 r1c3-t20">
-<p>1000</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t20" headers="r1c1-t20">
-<p>Default Shared Cache</p>
-</td>
-<td align="left" headers="r4c1-t20 r1c2-t20">
-<p>Specfies if cached instances should be in the shared cache or in a client isolated cache.</p>
-</td>
-<td align="left" headers="r4c1-t20 r1c3-t20"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t20" headers="r1c1-t20">
-<p>Entity Caching</p>
-</td>
-<td align="left" headers="r5c1-t20 r1c2-t20">
-<p>Specify the entity.</p>
-</td>
-<td align="left" headers="r5c1-t20 r1c3-t20"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t20" headers="r1c1-t20">
-<p>&nbsp;&nbsp;Cache Type</p>
-</td>
-<td align="left" headers="r6c1-t20 r1c2-t20">
-<p>Select a cache type. See <span class="italic">Default Cache</span></p>
-</td>
-<td align="left" headers="r6c1-t20 r1c3-t20"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t20" headers="r1c1-t20">
-<p>&nbsp;&nbsp;Cache Size</p>
-</td>
-<td align="left" headers="r7c1-t20 r1c2-t20">
-<p>Set the size of the cache.</p>
-</td>
-<td align="left" headers="r7c1-t20 r1c3-t20"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t20" headers="r1c1-t20">
-<p>&nbsp;&nbsp;Shared Cache</p>
-</td>
-<td align="left" headers="r8c1-t20 r1c2-t20">
-<p>See <span class="italic">Default Shared Cache</span>.</p>
-</td>
-<td align="left" headers="r8c1-t20 r1c3-t20"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="tblformal" -->
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-This page is not available for projects using the <span class="bold">Generic</span> platform.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-</div>
-<!-- class="sect3" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm
deleted file mode 100644
index 693ad1dd65..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm
+++ /dev/null
@@ -1,217 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Logging</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Logging" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIABGHHI" name="CIABGHHI"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Logging</h1>
-<p>This table lists the properties of the Logging page of the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-This page is not available for projects using the <span class="bold">Generic</span> platform.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-<div class="tblformal"><a id="sthref226" name="sthref226"></a><a id="sthref227" name="sthref227"></a>
-<p class="titleintable">Properties of the Logging Page</p>
-<table class="Formal" title="Properties of the Logging Page" summary="This table lists the properties of the Logging page of the persistence.xml Editor." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t23">Property</th>
-<th align="left" valign="bottom" id="r1c2-t23">Description</th>
-<th align="left" valign="bottom" id="r1c3-t23">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t23" headers="r1c1-t23">
-<p>Logging Level</p>
-</td>
-<td align="left" headers="r2c1-t23 r1c2-t23">
-<p>Specifies the amount and detail of log output by selecting the log level (in ascending order of information):</p>
-<p>The following are the valid values for the <code>java.util.logging.Level</code>:</p>
-<ul>
-<li>
-<p><span class="bold">OFF</span>&ndash;disables logging</p>
-</li>
-<li>
-<p><span class="bold">SEVERE</span>&ndash;logs exceptions indicating TopLink cannot continue, as well as any exceptions generated during login. This includes a stack trace.</p>
-</li>
-<li>
-<p><span class="bold">WARNING</span>&ndash;logs exceptions that do not force TopLink to stop, including all exceptions not logged with severe level. This does not include a stack trace.</p>
-</li>
-<li>
-<p><span class="bold">INFO</span>&ndash;logs the login/logout per sever session, including the user name. After acquiring the session, detailed information is logged.</p>
-</li>
-<li>
-<p><span class="bold">CONFIG</span>&ndash;logs only login, JDBC connection, and database information.</p>
-</li>
-<li>
-<p><span class="bold">FINE</span>&ndash;logs SQL.</p>
-</li>
-<li>
-<p><span class="bold">FINER</span>&ndash;similar to warning. Includes stack trace.</p>
-</li>
-<li>
-<p><span class="bold">FINEST</span>&ndash;includes additional low level information.</p>
-</li>
-</ul>
-<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
-<pre xml:space="preserve" class="oac_no_warn">
-&lt;property name="eclipselink.logging.level" value="INFO"/&gt;
-</pre></td>
-<td align="left" headers="r2c1-t23 r1c3-t23">
-<p>Info</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t23" headers="r1c1-t23">
-<p>&nbsp;&nbsp;TimeStamp</p>
-</td>
-<td align="left" headers="r3c1-t23 r1c2-t23">
-<p>Control whether the timestamp is logged in each log entry.</p>
-<p>The following are the valid values:</p>
-<ul>
-<li>
-<p><span class="bold">true</span>&ndash;log a timestamp.</p>
-</li>
-<li>
-<p><span class="bold">false</span>&ndash;do not log a timestamp.</p>
-</li>
-</ul>
-<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
-<pre xml:space="preserve" class="oac_no_warn">
-&lt;property name="eclipselink.logging.timestamp" value="false"/&gt;
-</pre></td>
-<td align="left" headers="r3c1-t23 r1c3-t23"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t23" headers="r1c1-t23">
-<p>&nbsp;&nbsp;Thread</p>
-</td>
-<td align="left" headers="r4c1-t23 r1c2-t23">
-<p>Control whether a thread identifier is logged in each log entry.</p>
-<p>The following are the valid values:</p>
-<ul>
-<li>
-<p><span class="bold">true</span>&ndash;log a thread identifier.</p>
-</li>
-<li>
-<p><span class="bold">false</span>&ndash;do not log a thread identifier.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r4c1-t23 r1c3-t23"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t23" headers="r1c1-t23">
-<p>&nbsp;&nbsp;Session</p>
-</td>
-<td align="left" headers="r5c1-t23 r1c2-t23">
-<p>Control whether an EclipseLink session identifier is logged in each log entry.</p>
-<p>The following are the valid values:</p>
-<ul>
-<li>
-<p><span class="bold">true</span>&ndash;log a EclipseLink session identifier.</p>
-</li>
-<li>
-<p><span class="bold">false</span>&ndash;do not log a EclipseLink session identifier.</p>
-</li>
-</ul>
-<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
-<pre xml:space="preserve" class="oac_no_warn">
-&lt;property name="eclipselink.logging.session" value="false"/&gt;
-</pre></td>
-<td align="left" headers="r5c1-t23 r1c3-t23"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t23" headers="r1c1-t23">
-<p>&nbsp;&nbsp;Exceptions</p>
-</td>
-<td align="left" headers="r6c1-t23 r1c2-t23">
-<p>Control whether the exceptions thrown from within the TopLink code are logged prior to returning the exception to the calling application. Ensures that all exceptions are logged and not masked by the application code.</p>
-<p>The following are the valid values:</p>
-<ul>
-<li>
-<p><span class="bold">true</span>&ndash;log all exceptions.</p>
-</li>
-<li>
-<p><span class="bold">false</span>&ndash;do not log exceptions.</p>
-</li>
-</ul>
-<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
-<pre xml:space="preserve" class="oac_no_warn">
-&lt;property name="eclipselink.logging.exceptions" value="true"/&gt;
-</pre></td>
-<td align="left" headers="r6c1-t23 r1c3-t23"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t23" headers="r1c1-t23">
-<p>Logger</p>
-</td>
-<td align="left" headers="r7c1-t23 r1c2-t23">
-<p>Select the type of logger to use:</p>
-<p>The following are the valid values:</p>
-<ul>
-<li>
-<p><span class="bold">DefaultLogger</span>&ndash;the EclipseLink native logger <code>eclipselink.logging.DefaultSessionLog</code>.</p>
-</li>
-<li>
-<p><span class="bold">JavaLogger</span>&ndash;the <code>java.util.logging</code> logger <code>eclipselink.logging.JavaLog</code>.</p>
-</li>
-<li>
-<p><span class="bold">ServerLogger</span>&ndash;the <code>java.util.logging</code> logger <code>eclipselink.platform.server.ServerLog</code>. Integrates with the application server's logging as define in the <code>eclipselink.platform.server.ServerPlatform.</code></p>
-</li>
-<li>
-<p>Fully qualified class name of a custom logger. The custom logger must implement the <code>eclipselink.logging.SessionLog</code> interface.</p>
-</li>
-</ul>
-<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
-<pre xml:space="preserve" class="oac_no_warn">
-&lt;property name="eclipselink.logging.logger" value="acme.loggers.MyCustomLogger" /&gt;
-</pre></td>
-<td align="left" headers="r7c1-t23 r1c3-t23">
-<p>DefaultLogger</p>
-</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="tblformal" --></div>
-<!-- class="sect3" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm
deleted file mode 100644
index 076e38dcee..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Options</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Options" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIAFJCHE" name="CIAFJCHE"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Options</h1>
-<p>This table lists the properties of the Options page of the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-This page is not available for projects using the <span class="bold">Generic</span> platform.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-<div class="tblformal"><a id="sthref228" name="sthref228"></a><a id="sthref229" name="sthref229"></a>
-<p class="titleintable">Properties of the Options Page</p>
-<table class="Formal" title="Properties of the Options Page" summary="" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t25">Property</th>
-<th align="left" valign="bottom" id="r1c2-t25">Description</th>
-<th align="left" valign="bottom" id="r1c3-t25">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t25" headers="r1c1-t25">
-<p>Session Name</p>
-</td>
-<td align="left" headers="r2c1-t25 r1c2-t25">
-<p>Specify the name by which the EclipseLink session is stored in the static session manager. Use this option if you need to access the EclipseLink shared session outside of the context of the JPA or to use a pre-existing EclipseLink session configured through a EclipseLink <code>sessions.xml</code> file</p>
-<p>Valid values: a valid EclipseLink session name that is unique in a server deployment.</p>
-<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
-<pre xml:space="preserve" class="oac_no_warn">
-&lt;property name="eclipselink.session-name" value="MySession"/&gt;
-</pre></td>
-<td align="left" headers="r2c1-t25 r1c3-t25"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t25" headers="r1c1-t25">
-<p>Sessions XML</p>
-</td>
-<td align="left" headers="r3c1-t25 r1c2-t25">
-<p>Specify persistence information loaded from the EclipseLink session configuration file (<code>sessions.xml</code>).</p>
-<p>You can use this option as an alternative to annotations and deployment XML. If you specify this property, TopLink will override all class annotation and the object relational mapping from the <code>persistence.xml</code>, as well as <code>ORM.xml</code> and other mapping files, if present. .</p>
-<p>Indicate the session by setting the <code>eclipselink.session-name</code> property.</p>
-<p>Note: If you do not specify the value for this property, <code>sessions.xml</code> file will not be used.</p>
-<p>Valid values: the resource name of the sessions XML file.</p>
-<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
-<pre xml:space="preserve" class="oac_no_warn">
-&lt;property name="toplink.session-xml" value="mysession.xml"/&gt;
-</pre></td>
-<td align="left" headers="r3c1-t25 r1c3-t25"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t25" headers="r1c1-t25">
-<p>Target Database</p>
-</td>
-<td align="left" headers="r4c1-t25 r1c2-t25"><br /></td>
-<td align="left" headers="r4c1-t25 r1c3-t25"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t25" headers="r1c1-t25">
-<p>Event Listener</p>
-</td>
-<td align="left" headers="r5c1-t25 r1c2-t25">
-<p>Specify a descriptor event listener to be added during bootstrapping.</p>
-<p>Valid values: qualified class name for a class that implements the <code>eclipselink.sessions.SessionEventListener</code> interface.</p>
-<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
-<pre xml:space="preserve" class="oac_no_warn">
-&lt;property name="eclipselink.session-event-listener" value="mypackage.MyClass.class"/&gt;
-</pre></td>
-<td align="left" headers="r5c1-t25 r1c3-t25"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t25" headers="r1c1-t25">
-<p>Include Descriptor Queries</p>
-</td>
-<td align="left" headers="r6c1-t25 r1c2-t25">
-<p>Enable or disable the default copying of all named queries from the descriptors to the session. These queries include the ones defined using EclipseLink API, descriptor amendment methods, and so on.</p>
-</td>
-<td align="left" headers="r6c1-t25 r1c3-t25"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="tblformal" --></div>
-<!-- class="sect3" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm
deleted file mode 100644
index 183e31790b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Schema Generation</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Schema Generation" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIACCFCB" name="CIACCFCB"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Schema Generation</h1>
-<p>This table lists the properties of the Schema Generation page of the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-This page is not available for projects using the <span class="bold">Generic</span> platform.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-<div class="tblformal"><a id="sthref230" name="sthref230"></a><a id="sthref231" name="sthref231"></a>
-<p class="titleintable">&nbsp;</p>
-<table class="Formal" title="" summary="This table lists the properties of the persistence.xml Editor&rsquo;s Schema Generation page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t27">Property</th>
-<th align="left" valign="bottom" id="r1c2-t27">Description</th>
-<th align="left" valign="bottom" id="r1c3-t27">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t27" headers="r1c1-t27">
-<p>DDL Generation Type</p>
-</td>
-<td align="left" headers="r2c1-t27 r1c2-t27">
-<p>Select the type of DDL generation:</p>
-<ul>
-<li>
-<p><span class="bold">None</span> -- Do not generate DDL; no schema is generated.</p>
-</li>
-<li>
-<p><span class="bold">Create Tables</span> -- Create DDL for non-existent tables; leave existing tables unchanged.</p>
-</li>
-<li>
-<p><span class="bold">Drop and Create Tables</span> -- Create DDL for all tables; drop all existing tables.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r2c1-t27 r1c3-t27">
-<p>None</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t27" headers="r1c1-t27">
-<p>Output Mode</p>
-</td>
-<td align="left" headers="r3c1-t27 r1c2-t27">
-<p>Select the DDL generation target:</p>
-<ul>
-<li>
-<p><span class="bold">Both</span> -- Generate SQL files and execute them on the database.</p>
-</li>
-<li>
-<p><span class="bold">Database</span> -- Execute SQL on the database only (do not generate SQL files).</p>
-</li>
-<li>
-<p><span class="bold">SQL Script</span> -- Generate SQL files only (do not execute them on the database).</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r3c1-t27 r1c3-t27"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t27" headers="r1c1-t27">
-<p>DDL Generation Location</p>
-</td>
-<td align="left" headers="r4c1-t27 r1c2-t27">
-<p>Specify where EclipseLink writes DDL output. Specify a file specification to a directory in which you have write access. The file specification may be relative to your current working directory or absolute. If it does not end in a file separator, then EclipseLink appends one that is valid for your operating system.</p>
-</td>
-<td align="left" headers="r4c1-t27 r1c3-t27"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t27" headers="r1c1-t27">
-<p>Create DDL File Name</p>
-</td>
-<td align="left" headers="r5c1-t27 r1c2-t27">
-<p>Specify the file name of the DDL file that EclipseLink generates that contains SQL statements for creating tables for JPA entities. Specify a file name valid for your operating system.</p>
-</td>
-<td align="left" headers="r5c1-t27 r1c3-t27">
-<p>createDDL.jdbc</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t27" headers="r1c1-t27">
-<p>Drop DDL File Name</p>
-</td>
-<td align="left" headers="r6c1-t27 r1c2-t27">
-<p>Specify the file name of the DDL file that EclipseLink generates that contains SQL statements for dropping tables for JPA entities.</p>
-</td>
-<td align="left" headers="r6c1-t27 r1c3-t27">
-<p>dropDDL.jdbc</p>
-</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="tblformal" --></div>
-<!-- class="sect3" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm
deleted file mode 100644
index 000c41403c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Properties</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Properties" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIAHJDFF" name="CIAHJDFF"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Properties</h1>
-<p>This page enables you to add or remove the vendor-specific <code>&lt;properties&gt;</code> elements of persistence.xml.</p>
-</div>
-<!-- class="sect3" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm
deleted file mode 100644
index 2569ec9ef5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Source</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Source" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIAHCJAH" name="CIAHCJAH"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Source</h1>
-<p>Using this page, you can manually edit the persistence.xml file.</p>
-<p>See <a href="task_manage_persistence.htm#CIHDAJID">"Managing the persistence.xml file"</a> for additional information.</p>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a></div>
-<!-- class="sect3" -->
-<!-- class="sect2" -->
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm
deleted file mode 100644
index 72bfc39bb6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:52 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Preferences</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Preferences" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACDEIEE" name="CACDEIEE"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Preferences</h1>
-<p>This section includes information on the following preference pages:</p>
-<ul>
-<li>
-<p><a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; JPA Options</a></p>
-</li>
-</ul>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm
deleted file mode 100644
index 09d9498ec7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:52 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Dialogs</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Dialogs" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACGEJDA" name="CACGEJDA"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Dialogs</h1>
-<p>This section includes information on the following preference pages:</p>
-<ul>
-<li>
-<p><a href="task_generate_entities.htm#CACDAFJD">Generate Entities from Tables dialog</a></p>
-</li>
-<li>
-<p><a href="reference030.htm#CACCGEHC">Edit Join Columns Dialog</a></p>
-</li>
-</ul>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm
deleted file mode 100644
index 0123de3e64..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:52 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Edit Join Columns Dialog</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Edit Join Columns Dialog" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACCGEHC" name="CACCGEHC"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Edit Join Columns Dialog</h1>
-<p>Use the <span class="gui-object-title">Join Columns</span> dialog to create or modify the join tables and columns in relationship mappings.</p>
-<p>This table lists the properties available in the <span class="gui-object-title">Join Columns</span> dialog.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Join Columns dialog." summary="This table describes the options on the Join Columns dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t30">Property</th>
-<th align="left" valign="bottom" id="r1c2-t30">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t30" headers="r1c1-t30">Name</td>
-<td align="left" headers="r2c1-t30 r1c2-t30">Name of the joint table column that contains the foreign key column.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t30" headers="r1c1-t30">Referenced Column Name</td>
-<td align="left" headers="r3c1-t30 r1c2-t30">Name of the database column that contains the foreign key reference for the entity relationship.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblinformal" -->
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="reference014.htm#CACBAEBC">Join Table Information</a><br />
-<a href="reference015.htm#CACFCEJC">Join Columns Information</a></div>
-<!-- class="sect2" -->
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm
deleted file mode 100644
index c9d1e3ec95..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:52 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Icons and buttons</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Icons and buttons" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACDHCIA" name="CACDHCIA"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Icons and buttons</h1>
-<p>This section includes information on each of the icons and buttons used in the Dali OR Mapping Tool.</p>
-<ul>
-<li>
-<p><a href="reference032.htm#CACGEACG">Icons</a></p>
-</li>
-<li>
-<p><a href="reference033.htm#CACDJCEI">Buttons</a></p>
-</li>
-</ul>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm
deleted file mode 100644
index fc1cd84f6a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:52 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Icons</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Icons" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACGEACG" name="CACGEACG"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Icons</h1>
-<p>The following icons are used throughout the Dali OR Mapping Tool.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the icons used in the Dali plug-in." summary="This table describes the icons used in the Dali plug-in." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t31">Icon</th>
-<th align="left" valign="bottom" id="r1c2-t31">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t31" headers="r1c1-t31"><img src="img/new_icon_mappedentity.png" alt="" title="" /><br /></td>
-<td align="left" headers="r2c1-t31 r1c2-t31"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t31" headers="r1c1-t31"><img src="img/new_icon_embeddableentitymapping.png" alt="Embeddable entity icon" title="Embeddable entity icon" /><br /></td>
-<td align="left" headers="r3c1-t31 r1c2-t31"><a href="tasks007.htm#BABFEICE">Embeddable</a> entity</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t31" headers="r1c1-t31"><img src="img/new_icon_mappedsuperclass.png" alt="Mapped superclass icon" title="Mapped superclass icon" /><br /></td>
-<td align="left" headers="r4c1-t31 r1c2-t31"><a href="tasks008.htm#BABDAGCI">Mapped superclass</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t31" headers="r1c1-t31"><img src="img/new_icon_basicmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
-<td align="left" headers="r5c1-t31 r1c2-t31"><a href="tasks010.htm#BABBABCE">Basic mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t31" headers="r1c1-t31"><img src="img/new_icon_embeddedidmapping.png" alt="Embedded mapping icon" title="Embedded mapping icon" /><br /></td>
-<td align="left" headers="r6c1-t31 r1c2-t31"><a href="tasks011.htm#BABCBHDF">Embedded mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t31" headers="r1c1-t31"><img src="img/new_icon_embeddedmapping.png" alt="Embedded ID mapping icon" title="Embedded ID mapping icon" /><br /></td>
-<td align="left" headers="r7c1-t31 r1c2-t31"><a href="tasks012.htm#CIHDIAEE">Embedded ID mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t31" headers="r1c1-t31"><img src="img/new_icon_idmapping.png" alt="ID mapping icon" title="ID mapping icon" /><br /></td>
-<td align="left" headers="r8c1-t31 r1c2-t31"><a href="tasks013.htm#BABGCBHG">ID mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r9c1-t31" headers="r1c1-t31"><img src="img/new_icon_manytomanymapping.png" alt="Many-to-many mapping icon" title="Many-to-many mapping icon" /><br /></td>
-<td align="left" headers="r9c1-t31 r1c2-t31"><a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r10c1-t31" headers="r1c1-t31"><img src="img/new_icon_manytoonemapping.png" alt="Many-to-one mapping icon." title="Many-to-one mapping icon." /><br /></td>
-<td align="left" headers="r10c1-t31 r1c2-t31"><a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r11c1-t31" headers="r1c1-t31"><img src="img/new_icon_onetomanymapping.png" alt="One-to-many mapping icon" title="One-to-many mapping icon" /><br /></td>
-<td align="left" headers="r11c1-t31 r1c2-t31"><a href="tasks016.htm#BABHGEBD">One-to-many mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r12c1-t31" headers="r1c1-t31"><img src="img/new_icon_onetoonemapping.png" alt="One-to-one mapping icon." title="One-to-one mapping icon." /><br /></td>
-<td align="left" headers="r12c1-t31 r1c2-t31"><a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r13c1-t31" headers="r1c1-t31"><img src="img/new_icon_transientmapping.png" alt="Transient mapping icon." title="Transient mapping icon." /><br /></td>
-<td align="left" headers="r13c1-t31 r1c2-t31"><a href="tasks018.htm#BABHFHEI">Transient mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r14c1-t31" headers="r1c1-t31"><img src="img/new_icon_versionmapping.png" alt="Version mapping icon." title="Version mapping icon." /><br /></td>
-<td align="left" headers="r14c1-t31 r1c2-t31"><a href="tasks019.htm#BABHIBII">Version mapping</a><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" -->
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<p><a href="reference031.htm#CACDHCIA">Icons and buttons</a></p>
-</div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm
deleted file mode 100644
index 912e486719..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:53 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Buttons</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Buttons" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACDJCEI" name="CACDJCEI"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Buttons</h1>
-<p>The following buttons are used throughout the Dali OR Mapping Tool.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the buttons used in the Dali plug-in." summary="This table describes the buttons used in the Dali plug-in." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t32">Icon</th>
-<th align="left" valign="bottom" id="r1c2-t32">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t32" headers="r1c1-t32"><img src="img/new_jpa_perspective_button.png" alt="The JPA Perspective icon" title="The JPA Perspective icon" /><br /></td>
-<td align="left" headers="r2c1-t32 r1c2-t32">JPA Development perspective</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" -->
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<p><a href="reference031.htm#CACDHCIA">Icons and buttons</a></p>
-</div>
-<!-- class="sect2" -->
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference034.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference034.htm
deleted file mode 100644
index cf677e30bd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference034.htm
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:53 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Dali Developer Documentation</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Dali Developer Documentation" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACBBDIB" name="CACBBDIB"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Dali Developer Documentation</h1>
-<p><a id="sthref246" name="sthref246"></a><a id="sthref247" name="sthref247"></a><a id="sthref248" name="sthref248"></a>Additional Dali documentation is available online at:</p>
-<p><code><a href="http://wiki.eclipse.org/index.php/Dali_Developer_Documentation">http://wiki.eclipse.org/index.php/Dali_Developer_Documentation</a></code></p>
-<p>This developer documentation includes information about:</p>
-<ul>
-<li>
-<p>Dali architecture</p>
-</li>
-<li>
-<p>Plugins that comprise the Dali JPA Eclipse feature</p>
-</li>
-<li>
-<p>Extension points</p>
-</li>
-</ul>
-</div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_add_persistence.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_add_persistence.htm
deleted file mode 100644
index 2fde1e2c47..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_add_persistence.htm
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:44 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Adding persistence to a class</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Adding persistence to a class" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABHICAI" name="BABHICAI"></a></p>
-<div class="sect1">
-<h1>Adding persistence to a class</h1>
-<p><a id="sthref54" name="sthref54"></a><a id="sthref55" name="sthref55"></a><a id="sthref56" name="sthref56"></a>You can make a Java class into one of the following persistent types:</p>
-<ul>
-<li>
-<p><a href="tasks006.htm#BABGBIEE">Entity</a></p>
-</li>
-<li>
-<p><a href="tasks007.htm#BABFEICE">Embeddable</a></p>
-</li>
-<li>
-<p><a href="tasks008.htm#BABDAGCI">Mapped superclass</a></p>
-</li>
-</ul>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related tasks" title="Related tasks" /><br />
-<br />
-<a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a><br />
-<a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a><br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a><br />
-<a href="concepts003.htm#CHDBIJAC">The orm.xml file</a><br />
-<a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a> <!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_additonal_tables.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_additonal_tables.htm
deleted file mode 100644
index ba760f6083..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_additonal_tables.htm
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:45 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Specifying additional tables</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Specifying additional tables" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIHGBIEI" name="CIHGBIEI"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Specifying additional tables</h1>
-<p>Add a secondary table annotation to an entity if its data is split across more more than one table.</p>
-<p>To add a secondary table to the entity,</p>
-<ol start="1">
-<li>
-<p>Select the entity in the <span class="gui-object-title">Package Explorer</span>.</p>
-</li>
-<li>
-<p>In the <span class="gui-object-title">JPA Details</span> view, select the <span class="gui-object-action">Secondary Tables</span> information.</p>
-<div class="figure"><a id="sthref79" name="sthref79"></a>
-<p class="titleinfigure">Specifying Secondary Tables</p>
-<img src="img/secondary_tables.png" alt="Secondary Tables area on the JPA Details view." title="Secondary Tables area on the JPA Details view." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Click <span class="bold">Add</span> to associate an additional table with the entity. The Edit Secondary Table dialog appears</p>
-</li>
-<li>
-<p>Select the <span class="bold">Name</span>, <span class="bold">Catalog</span>, and <span class="bold">Schema</span> of the additional table to associate with the entity.</p>
-</li>
-</ol>
-<p>Eclipse adds the following annotations the entity:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@SecondaryTable(name="NAME", catalog = "CATALOG", schema = "SCHEMA"
-
-</pre>
-<br />
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a><br /></div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_create_new_project.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_create_new_project.htm
deleted file mode 100644
index 1a7ad4a032..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_create_new_project.htm
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:42 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Creating a new JPA project</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Creating a new JPA project" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIHHEJCJ" name="CIHHEJCJ"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Creating a new JPA project</h1>
-<p><a id="sthref25" name="sthref25"></a><a id="sthref26" name="sthref26"></a>Use this procedure to create a new JPA project.</p>
-<ol start="1">
-<li>
-<p>From the Navigator or Package Explorer, select <span class="bold">File &gt; New &gt; Project</span>. The Select a wizard dialog appears.</p>
-<div align="center">
-<div class="inftblnotealso"><br />
-<table class="NoteAlso oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Tip:</p>
-You can also select the JPA perspective and then select <span class="bold">File &gt; New &gt; JPA Project</span>.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnotealso" --></div>
-<div class="figure"><a id="sthref27" name="sthref27"></a>
-<p class="titleinfigure">Selecting the Create a JPA Project wizard</p>
-<img src="img/select_a_wizard_jpa_project.png" alt="The Select a Wizard dialog with JPA project selected." title="The Select a Wizard dialog with JPA project selected." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Select <span class="bold">JPA Project</span> and then click <span class="bold">Next</span>. The <a href="ref_new_jpa_project.htm#CACBJAGC">New JPA Project page</a> appears.</p>
-<div class="figure"><a id="sthref28" name="sthref28"></a>
-<p class="titleinfigure">The JPA Project Page</p>
-<img src="img/new_jpa_project_task.png" alt="The JPA Project page of the Create a JPA Project wizard." title="The JPA Project page of the Create a JPA Project wizard." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Complete the fields on the <a href="ref_new_jpa_project.htm#CACBJAGC">New JPA Project page</a> to specify the project name and location, target runtime, and pre-defined configuration.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-The Target Runtime is not required for Java SE development.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-</li>
-<li>
-<p>Click <span class="bold">Next</span>. <a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a> appears.</p>
-<div class="figure"><a id="sthref29" name="sthref29"></a>
-<p class="titleinfigure">The JPA Facet Page</p>
-<img src="img/new_jpa_facet_task.png" alt="The JPA Facet page of the Create a JPA Project wizard." title="The JPA Facet page of the Create a JPA Project wizard." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Complete the fields on the <a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a> to specify your vender-specific platform, database connection, and JPA implementation library.</p>
-<p>If Dali derives the incorrect schema, select <span class="bold">Override the Default Schema for Connection</span>. Using this option, you can select a development time schema for defaults and validation.</p>
-<p>If you clear the <span class="bold">Create orm.xml</span> option (which is selected by default), you can later add a mapping file to the project using the <a href="reference005.htm#CIAIJCCE">Mapping File Wizard</a>.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-If the server runtime does not provide a JPA implementation, you must explicitly select a JPA implementation library.
-<p>To insure the portability of your application, you must explicitly list the managed persistence classes that are included in the persistence unit. If the server supports EJB 3.0, the persistent classes will be discovered automatically.</p>
-</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-</li>
-<li>
-<p>Click <span class="bold">Finish</span>. You should now open the <a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a>.</p>
-</li>
-</ol>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a><br />
-<a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a><br />
-<a href="reference005.htm#CIAIJCCE">Mapping File Wizard</a>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related tasks" title="Related tasks" /><br />
-<br />
-<a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a><br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a><br />
-<a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a>
-<p>&nbsp;</p>
-</div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_generate_entities.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_generate_entities.htm
deleted file mode 100644
index 299aedd3db..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_generate_entities.htm
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:52 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Generate Entities from Tables dialog</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Generate Entities from Tables dialog" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACDAFJD" name="CACDAFJD"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Generate Entities from Tables dialog</h1>
-<p><a id="sthref241" name="sthref241"></a><a id="sthref242" name="sthref242"></a><a id="sthref243" name="sthref243"></a>Use the <span class="gui-object-title">Generate Entities</span> dialog to create Java persistent entities from your database tables and columns.</p>
-<p>This table lists the properties available in the <span class="gui-object-title">Generate Entities dialog</span>.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Generate Entities dialog." summary="This table describes the options on the Generate Entities dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t29">Property</th>
-<th align="left" valign="bottom" id="r1c2-t29">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t29" headers="r1c1-t29">Source Folder</td>
-<td align="left" headers="r2c1-t29 r1c2-t29">Enter a project folder name in which to generate the Java persistent entities, or click <span class="bold">Browse</span> to select an existing folder.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t29" headers="r1c1-t29">Package</td>
-<td align="left" headers="r3c1-t29 r1c2-t29">Enter a package name in which to generate the Java persistent entities, or click <span class="bold">Browse</span> to select an existing package.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t29" headers="r1c1-t29">Synchronize Classes in persistence.xml</td>
-<td align="left" headers="r4c1-t29 r1c2-t29">Specify if Dali should update the persistence.xml file to include the generated classes.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t29" headers="r1c1-t29">Tables</td>
-<td align="left" headers="r5c1-t29 r1c2-t29">Select the tables from which to create Java persistent entities. The tables shown are determined by the database connection that you defined in the <a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; JPA Options</a>.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblinformal" -->
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<p><a href="tasks020.htm#BABBAGFI">Generating entities from tables</a></p>
-<p>&nbsp;</p>
-</div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm
deleted file mode 100644
index d4e124b0ef..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:45 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Specifying entity inheritance</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Specifying entity inheritance" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIHCCCJD" name="CIHCCCJD"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Specifying entity inheritance</h1>
-<p><a id="sthref80" name="sthref80"></a><a id="sthref81" name="sthref81"></a>An entity may inherit properties from other entities. You can specify a specific strategy to use for inheritance.</p>
-<p>Use this procedure to specify inheritance (<code>@Inheritance)</code> for an existing entity (<code>@Entity</code>):</p>
-<ol start="1">
-<li>
-<p>Select the entity in the <span class="gui-object-title">Package Explorer</span>.</p>
-</li>
-<li>
-<p>In the <span class="gui-object-title">JPA Details</span> view, select the <span class="gui-object-action">Inheritance</span> information.</p>
-<div class="figure"><a id="sthref82" name="sthref82"></a>
-<p class="titleinfigure">Specifying Inheritance</p>
-<img src="img/inheritance_tab.png" alt="Selecting the Inheritance area on the JPA Details view." title="Selecting the Inheritance area on the JPA Details view." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>In the <span class="bold">Strategy</span> list, select one of the following the inheritance strategies:</p>
-<ul>
-<li>
-<p>A single table (default)</p>
-</li>
-<li>
-<p>Joined table</p>
-</li>
-<li>
-<p>One table per class</p>
-</li>
-</ul>
-</li>
-<li>
-<p>Use the following table to complete the remaining fields on the tab. See <a href="reference012.htm#CACFHGHE">"Inheritance information"</a> for additional details.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the options on the Persistence Properties view, Inheritance tab." summary="This table describes the options on the Persistence Properties view, Inheritance tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t14">Property</th>
-<th align="left" valign="bottom" id="r1c2-t14">Description</th>
-<th align="left" valign="bottom" id="r1c3-t14">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t14" headers="r1c1-t14"><a id="sthref83" name="sthref83"></a><a id="sthref84" name="sthref84"></a>Discriminator Column</td>
-<td align="left" headers="r2c1-t14 r1c2-t14">Name of the discriminator column when using a <span class="bold">Single</span> or <span class="bold">Joined</span> inheritance strategy.
-<p>This field corresponds to the <code>@DiscriminatorColumn</code> annotation.</p>
-</td>
-<td align="left" headers="r2c1-t14 r1c3-t14"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t14" headers="r1c1-t14">Discriminator Type</td>
-<td align="left" headers="r3c1-t14 r1c2-t14">Set the discriminator type to <code>Char</code> or <code>Integer</code> (instead of its default: <code>String</code>). The <span class="bold">Discriminator Value</span> must conform to this type.</td>
-<td align="left" headers="r3c1-t14 r1c3-t14">String</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t14" headers="r1c1-t14"><a id="sthref85" name="sthref85"></a><a id="sthref86" name="sthref86"></a>Discriminator Value</td>
-<td align="left" headers="r4c1-t14 r1c2-t14">Specify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified <span class="bold">Discriminator Type</span>.
-<p>This field corresponds to the <code>@DiscriminatorValue</code> annotation.</p>
-</td>
-<td align="left" headers="r4c1-t14 r1c3-t14"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t14" headers="r1c1-t14">Override Default</td>
-<td align="left" headers="r5c1-t14 r1c2-t14">Use this field to specify custom primary key join columns.
-<p>This field corresponds to the <code>@PrimaryKeyJoinClumn</code> annotation.</p>
-</td>
-<td align="left" headers="r5c1-t14 r1c3-t14"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-</ol>
-<p>Eclipse adds the following annotations the entity field:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@Inheritance(strategy=InheritanceType.<span class="italic">&lt;INHERITANCE_STRATEGY&gt;</span>)
-@DiscriminatorColumn(name="<span class="italic">&lt;DISCRIMINATOR_COLUMN&gt;</span>",
-    discriminatorType=<span class="italic">&lt;DISCRIMINATOR_TYPE&gt;</span>)
-@DiscriminatorValue(value-"<span class="italic">&lt;DISCRIMINATOR_VALUE&gt;</span>")
-@PrimaryKeyJoinColumn(name="<span class="italic">&lt;JOIN_COLUMN_NAME&gt;</span>", 
-    referencedColumnName = "<span class="italic">&lt;REFERENCED_COLUMN_NAME&gt;</span>")
-
-</pre>
-<p><a id="sthref87" name="sthref87"></a><a id="sthref88" name="sthref88"></a><a id="sthref89" name="sthref89"></a>The following figures illustrates the different inheritance strategies.</p>
-<div class="figure"><a id="sthref90" name="sthref90"></a>
-<p class="titleinfigure">Single Table Inheritance</p>
-<img src="img/inheritance_single.png" alt="This figure illustrates entity inheritance in a single table." title="This figure illustrates entity inheritance in a single table." /><br /></div>
-<!-- class="figure" -->
-<div class="figure"><a id="sthref91" name="sthref91"></a>
-<p class="titleinfigure"><a id="sthref92" name="sthref92"></a><a id="sthref93" name="sthref93"></a>Joined Table Inheritance</p>
-<img src="img/inheritance_join.png" alt="This figure illustrates a joined subclass inheritance strategy." title="This figure illustrates a joined subclass inheritance strategy." /><br /></div>
-<!-- class="figure" -->
-<br />
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a><br /></div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm
deleted file mode 100644
index 76780e6360..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:43 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Managing the orm.xml file</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Managing the orm.xml file" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIHDGDCD" name="CIHDGDCD"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref46" name="sthref46"></a>Managing the orm.xml file</h1>
-<p>When creating a JPA project, (see <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a>) you can also create the <code>orm.xml</code> file that defines the mapping metadata and defaults.</p>
-<p><a id="sthref47" name="sthref47"></a>Eclipse creates the <code>META-INF\orm.xml</code> file in your project's directory:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;persistence version="<span class="italic">&lt;PERSISTENCE_VERSION&gt;</span>"
-      xmlns="http://java.sun.com/xml/ns/persistence"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
-      http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"&gt;
-  &lt;persistence-unit name="<span class="italic">&lt;PERSISTENCE_UNIT_NAME&gt;</span>"&gt;
-    &lt;provider="<span class="italic">&lt;PERSISTENCE_PROVIDER&gt;</span>" /&gt;
-  &lt;/persistence-unit&gt;
-&lt;/persistence&gt;
-</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="tasks005.htm#CIHBCDCE">Working with orm.xml file</a><br />
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concepts003.htm#CHDBIJAC">The orm.xml file</a><br />
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence.htm
deleted file mode 100644
index 8be90a2e23..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence.htm
+++ /dev/null
@@ -1,212 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:43 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Managing the persistence.xml file</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Managing the persistence.xml file" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIHDAJID" name="CIHDAJID"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref35" name="sthref35"></a>Managing the persistence.xml file</h1>
-<p><a id="sthref36" name="sthref36"></a>When you create a project, Eclipse creates the <code>META-INF\persistence.xml</code> file in the project's directory.</p>
-<p>You can create a stub <code>persistence.xml</code> file in the META-INF directory when you create a JPA project (see <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a>). You can manage this file either through the XML editor (see <a href="tasks002.htm#CIHEJAIE">"Using the XML Editor to edit the persistence.xml file"</a>) or through the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-In additon to the General, Connection, Properties and Source pages, the persistence.xml Editor pages for projects that use the EclipseLink platform include the following:
-<ul>
-<li>
-<p><a href="reference021.htm#CIAJAFEG">Customization</a></p>
-<p>Use this page to define change-tracking and session customizer-related properties.</p>
-</li>
-<li>
-<p><a href="reference022.htm#CIABEDCH">Caching</a></p>
-<p>Use this page to define caching properties.</p>
-</li>
-<li>
-<p><a href="reference023.htm#CIABGHHI">Logging</a></p>
-<p>Use this page to define logging properties.</p>
-</li>
-<li>
-<p><a href="reference024.htm#CIAFJCHE">Options</a></p>
-<p>Use this page to define session and target database properties.</p>
-</li>
-<li>
-<p><a href="reference025.htm#CIACCFCB">Schema Generation</a></p>
-<p>Use this page to define DDL-related properties.</p>
-</li>
-</ul>
-<p>For projects using the EclipseLink platform, the Connections page also includes JDBC connection pool properties.</p>
-<p>If the project uses the Generic platform, then only the General, Connection, Properties and Source pages are available.</p>
-</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-<p>To use the <code>persistence.xml</code> Editor:</p>
-<ol start="1">
-<li>
-<p>Open the <code>peristence.xml</code> file. The <a href="reference019.htm#CIACIFGJ">General</a> page of the editor appears.</p>
-</li>
-<li>
-<p>Use the General page to define the <code>persistence.xml</code> files <code>&lt;persistent-unit&gt;</code>-related attributes as well as the <code>&lt;provider&gt;</code>, and <code>&lt;class&gt;</code> elements (described in the following table).</p>
-<div align="center">
-<div class="inftblnotealso"><br />
-<table class="NoteAlso oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Tip:</p>
-The persistence.xml Editor's Source page enables you to view and edit the raw XML file.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnotealso" --></div>
-<div class="inftblinformal">
-<table class="Informal" summary="This table lists the properties of the persistence.xml editor." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t8">Property</th>
-<th align="left" valign="bottom" id="r1c2-t8">Description</th>
-<th align="left" valign="bottom" id="r1c3-t8">Element Defined</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t8" headers="r1c1-t8">Name</td>
-<td align="left" headers="r2c1-t8 r1c2-t8">Enter the name of the persistence unit.</td>
-<td align="left" headers="r2c1-t8 r1c3-t8"><code>&lt;persistence-unit name = "&lt;Name&gt;"&gt;</code></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t8" headers="r1c1-t8">Persistence Provider</td>
-<td align="left" headers="r3c1-t8 r1c2-t8">Enter the name of the persistence provider.</td>
-<td align="left" headers="r3c1-t8 r1c3-t8"><code>&lt;provider&gt;</code></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t8" headers="r1c1-t8">Description</td>
-<td align="left" headers="r4c1-t8 r1c2-t8">Enter a description for this persistence unit. This is an optional property.</td>
-<td align="left" headers="r4c1-t8 r1c3-t8"><code>&lt;description&gt;</code></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t8" headers="r1c1-t8">Managed Classes</td>
-<td align="left" headers="r5c1-t8 r1c2-t8">Add or remove the classes managed through the persistence unit.</td>
-<td align="left" headers="r5c1-t8 r1c3-t8"><code>&lt;class&gt;</code></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t8" headers="r1c1-t8">&nbsp;&nbsp;Exclude Unlisted Classes</td>
-<td align="left" headers="r6c1-t8 r1c2-t8">Select to include all annotated entity classes in the root of the persistence unit.</td>
-<td align="left" headers="r6c1-t8 r1c3-t8"><code>&lt;exclude-unlisted-classes&gt;</code></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t8" headers="r1c1-t8">XML Mapping Files</td>
-<td align="left" headers="r7c1-t8 r1c2-t8">Add or remove the object/relational mapping XML files define the classes managed through the persistence unit.</td>
-<td align="left" headers="r7c1-t8 r1c3-t8"><code>&lt;mapping-file&gt;</code></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblinformal" --></li>
-<li>
-<p>Use the <a href="reference020.htm#CIAFFJIE">Connection</a> page to define the <code>&lt;jta-data-source&gt;</code> and <code>&lt;non-jta-data-source&gt;</code> elements as follows:</p>
-<p>To configure the JTA (Java Transaction API) source used by the persistence provider:</p>
-<ol start="1">
-<li>
-<p>Select <span class="bold">JTA</span> from the Transaction Type list.</p>
-</li>
-<li>
-<p>Enter the global JNDI name of the data source.</p>
-</li>
-</ol>
-<p>To configure a non-JTA data source:</p>
-<ol start="1">
-<li>
-<p>Select <span class="bold">Resource Local</span> from the Transaction Type list.</p>
-</li>
-<li>
-<p>Enter the global JNDI name of the data source.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-Select <span class="bold">Default()</span> to use the data source provided by the container.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-</li>
-</ol>
-</li>
-<li>
-<p>Use the table in the Properties page to set the vendor-specific <code>&lt;properties&gt;</code> element.</p>
-<p>To add <code>&lt;property&gt;</code> elements:</p>
-<ol start="1">
-<li>
-<p>Click <span class="bold">Add</span>.</p>
-</li>
-<li>
-<p>Enter the <code>&lt;name&gt;</code> and <code>&lt;value&gt;</code> attributes for the <code>&lt;property&gt;</code> element using the table's Name and Value fields.</p>
-</li>
-</ol>
-<p>To remove a <code>&lt;property&gt;</code> element, select a defined property in the table and then click <span class="bold">Remove</span>.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-If the project uses the EclipseLink platform, the connection page also includes parameters for JDBC connection pooling.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-</li>
-</ol>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="reference018.htm#CIACCHID">persistence.xml Editor</a>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="tasks002.htm#CIHEJAIE">Using the XML Editor to edit the persistence.xml file</a><br />
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a><br />
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm
deleted file mode 100644
index 8dc785df3b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:45 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Mapping an entity</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Mapping an entity" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABDGBIJ" name="BABDGBIJ"></a></p>
-<div class="sect1">
-<h1>Mapping an entity</h1>
-<p>Dali supports the following mapping types for Java persistent entities:</p>
-<ul>
-<li>
-<p><a href="tasks010.htm#BABBABCE">Basic mapping</a></p>
-</li>
-<li>
-<p><a href="tasks011.htm#BABCBHDF">Embedded mapping</a></p>
-</li>
-<li>
-<p><a href="tasks012.htm#CIHDIAEE">Embedded ID mapping</a></p>
-</li>
-<li>
-<p><a href="tasks013.htm#BABGCBHG">ID mapping</a></p>
-</li>
-<li>
-<p><a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a></p>
-</li>
-<li>
-<p><a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a></p>
-</li>
-<li>
-<p><a href="tasks016.htm#BABHGEBD">One-to-many mapping</a></p>
-</li>
-<li>
-<p><a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a></p>
-</li>
-<li>
-<p><a href="tasks018.htm#BABHFHEI">Transient mapping</a></p>
-</li>
-<li>
-<p><a href="tasks019.htm#BABHIBII">Version mapping</a></p>
-</li>
-</ul>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a> <!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm
deleted file mode 100644
index 31d4dd2087..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:42 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Tasks</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content=" Tasks" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="sthref24" name="sthref24"></a></p>
-<h1>Tasks</h1>
-<p>This section includes detailed step-by-step procedures for accessing the Dali OR mapping tool functionality.</p>
-<ul>
-<li>
-<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
-</li>
-<li>
-<p><a href="tasks001.htm#BABFBJBG">Creating a JPA Entity</a></p>
-</li>
-<li>
-<p><a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a></p>
-</li>
-<li>
-<p><a href="task_manage_orm.htm#CIHDGDCD">Managing the orm.xml file</a></p>
-</li>
-<li>
-<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
-</li>
-<li>
-<p><a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a></p>
-</li>
-<li>
-<p><a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a></p>
-</li>
-<li>
-<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
-</li>
-<li>
-<p><a href="tasks020.htm#BABBAGFI">Generating entities from tables</a></p>
-</li>
-<li>
-<p><a href="tasks022.htm#BABFAIBA">Validating mappings and reporting problems</a></p>
-</li>
-<li>
-<p><a href="tasks025.htm#BABDBCBI">Modifying persistent project properties</a></p>
-</li>
-</ul>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm
deleted file mode 100644
index 530bf91bba..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:42 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Creating a JPA Entity</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Creating a JPA Entity" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABFBJBG" name="BABFBJBG"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref30" name="sthref30"></a>Creating a JPA Entity</h1>
-<p>Use this procedure to create a JPA entity:</p>
-<ol start="1">
-<li>
-<p>From the Navigator or Package Explorer, select the JPA project and then <span class="bold">File &gt; New &gt; Other</span>. The Select a Wizard dialog appears.</p>
-<div class="figure"><a id="sthref31" name="sthref31"></a>
-<p class="titleinfigure">Selecting the Create a JPA Entity Wizard</p>
-<img src="img/select_a_wizard_entity.png" alt="The Select a Wizard dialog with Entity selected." title="The Select a Wizard dialog with Entity selected." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Select <span class="bold">Entity</span> and then click <span class="bold">Next</span>. The <a href="reference003.htm#CIAFEIGF">Entity Class page</a> appears.</p>
-<div class="figure"><a id="sthref32" name="sthref32"></a>
-<p class="titleinfigure">The Entity Class Page</p>
-<img src="img/create_jpa_entity_wizard.png" alt="The Entity Class page of the Create a JPA Entity wizard." title="The Entity Class page of the Create a JPA Entity wizard." /><br /></div>
-<!-- class="figure" -->
-<p>Complete this page as follows:</p>
-<ul>
-<li>
-<p>Select the JPA project in the Project field.</p>
-</li>
-<li>
-<p>In the Source Folder field, select, or enter, the location of the JPA project's src folder.</p>
-</li>
-<li>
-<p>Select, or enter, the name of the class package for this entity in the Java Package field.</p>
-</li>
-<li>
-<p>Enter the name of the Java class in the Class name field.</p>
-</li>
-<li>
-<p>If needed, enter, or select a superclass.</p>
-</li>
-<li>
-<p>If needed, complete the Inheritance section as follows (these properties are optional):</p>
-<ul>
-<li>
-<p>Accept the <span class="bold">Entity</span> option (the default) to create a Java class with the <code>@Entity</code> option.</p>
-</li>
-<li>
-<p>Alternatively, select <a href="tasks008.htm#BABDAGCI">Mapped superclass</a> (if you defined a super class).</p>
-</li>
-<li>
-<p>Select <span class="bold">Inheritance</span> and then select one of the JSR 220 inheritance mapping strategies (SINGLE_TABLE, TABLE_PER_CLASS, JOINED).</p>
-</li>
-<li>
-<p>Select <span class="bold">Add</span> to entity mappings in XML to create XML mappings in <code>orm.xml</code>, rather than annotations.</p>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-<li>
-<p>Click <span class="bold">Next</span> to proceed to the <a href="reference004.htm#CIADECIA">Entity Properties page</a> where you define the persistent fields for the entity.</p>
-<div class="figure"><a id="sthref33" name="sthref33"></a>
-<p class="titleinfigure">The Entity Properties Page</p>
-<img src="img/create_jpa_fields.png" alt="The Entity Properties page of the Create JPA Entity wizard." title="The Entity Properties page of the Create JPA Entity wizard." /><br /></div>
-<!-- class="figure" -->
-<p>Alternatively, click <span class="bold">Finish</span> to complete the entity.</p>
-</li>
-<li>
-<p>Complete the page as follows:</p>
-<ol start="1">
-<li>
-<p>If needed, enter a new name for the entity. Doing so results in adding a <code>name</code> attribute to the <code>@Entity</code> notation (<code>@Entity(name="EntityName")</code>).</p>
-</li>
-<li>
-<p>Accept <span class="bold">Use default</span> (the default setting) to use the default value for the name of the mapped table. Entering a different name results in adding the <code>@Table</code> notation with its <code>name</code> attribute defined as the new table (<code>@Table(name="TableName")</code>).</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-The Entity Name-related options are not available if you selected <a href="tasks008.htm#BABDAGCI">Mapped superclass</a> on the <a href="reference003.htm#CIAFEIGF">Entity Class page</a></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-</li>
-<li>
-<p>Add persistence fields to the entity by clicking <span class="bold">Add</span>. The Entity Fields dialog appears.</p>
-<div class="figure"><a id="sthref34" name="sthref34"></a>
-<p class="titleinfigure">The Entity Fields Dialog</p>
-<img src="img/jpa_wizard_create_fields.png" alt="The Entity Fields dialog." title="The Entity Fields dialog." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Select a persistence type from the Type list. You can retrieve additional types using the <span class="bold">Browse</span> function.</p>
-</li>
-<li>
-<p>Enter the field name and then click <span class="bold">OK</span>. Repeat this procedure for each field.</p>
-</li>
-<li>
-<p>If needed, select <span class="bold">Key</span> to designate the field as a primary key.</p>
-</li>
-<li>
-<p>Select either the <span class="bold">Field-based</span> access type (the default) or <span class="bold">Property-based</span> access type.</p>
-</li>
-</ol>
-</li>
-</ol>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="reference002.htm#CIAGGGDF">Create JPA Entity wizard</a><br />
-<a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a><br />
-<a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related tasks" title="Related tasks" /><br />
-<br />
-<a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a><br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a><br />
-<a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a><br />
-<p>&nbsp;</p>
-</div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm
deleted file mode 100644
index d14c825ba4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:43 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Using the XML Editor to edit the persistence.xml file</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Using the XML Editor to edit the persistence.xml file" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIHEJAIE" name="CIHEJAIE"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Using the XML Editor to edit the persistence.xml file</h1>
-<p><a id="sthref37" name="sthref37"></a><a id="sthref38" name="sthref38"></a>You can work with the <code>persistence.xml</code> by using the XML Editor.</p>
-<p>Use this procedure to work with the <code>persistence.xml</code> file:</p>
-<ol start="1">
-<li>
-<p>Right-click the <code>persistence.xml</code> file in the <span class="gui-object-title">Package Explorer</span> and select <span class="gui-object-action">Open With &gt; XML Editor</span>.</p>
-<div class="figure"><a id="sthref39" name="sthref39"></a>
-<p class="titleinfigure">Opening the XML Editor</p>
-<img src="img/open_persistence_editor.png" alt="This figure shows the Open &gt; XML Editor option for the persistence.xml file." title="This figure shows the Open &gt; XML Editor option for the persistence.xml file." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p><a id="sthref40" name="sthref40"></a><a id="sthref41" name="sthref41"></a>Use the <span class="gui-object-title">XML Editor</span> to edit the <code>persistence.xml</code> file.</p>
-<div class="figure"><a id="sthref42" name="sthref42"></a>
-<p class="titleinfigure">XML Editor</p>
-<img src="img/persistence_xml_editor.png" alt="This figure shows the XML Editor." title="This figure shows the XML Editor." /><br /></div>
-<!-- class="figure" --></li>
-</ol>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="#CIHEJAIE">Using the XML Editor to edit the persistence.xml file</a><br />
-<a href="../org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html">Working with XML Files</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a><br /></div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm
deleted file mode 100644
index cf80ff4c39..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:43 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Synchronizing classes</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Synchronizing classes" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIHFEBAI" name="CIHFEBAI"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Synchronizing classes</h1>
-<p>As you work with the classes in your Java project, you will need to update the <code>persistence.xml</code> file to reflect the changes. <a id="sthref43" name="sthref43"></a><a id="sthref44" name="sthref44"></a></p>
-<p>Use this procedure to synchronize the <code>persistence.xml</code> file:</p>
-<ol start="1">
-<li>
-<p>Right-click the <code>persistence.xml</code> file in the <span class="gui-object-title">Package Explorer</span> and select <span class="gui-object-action">JPA Tools &gt; Synchronize Classes</span>.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-Use this function if you selected <span class="bold">Annotated classes must be listed in the persistence.xml option</span> in the <a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a>. In general, you do not have to use this function within the container.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-<div class="figure"><a id="sthref45" name="sthref45"></a>
-<p class="titleinfigure">Synchronizing the persistence.xml File</p>
-<img src="img/synchornize_classes.png" alt="This figure shows the JPA Tools &gt; Synchronize Classes option." title="This figure shows the JPA Tools &gt; Synchronize Classes option." /><br /></div>
-<!-- class="figure" -->
-<p>Dali adds the necessary <code>&lt;class&gt;</code> elements to the <code>persistence.xml</code> file.</p>
-</li>
-<li>
-<p>Use the <span class="gui-object-title">Persistence XML Editor</span> to continue editing the <code>persistence.xml</code> file.</p>
-</li>
-</ol>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="tasks002.htm#CIHEJAIE">Using the XML Editor to edit the persistence.xml file</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a><br />
-<br /></div>
-<!-- class="sect2" -->
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm
deleted file mode 100644
index 98c8327cc5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:43 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Managing the orm.xml file</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Managing the orm.xml file" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<div class="sect2"><!-- infolevel="all" infotype="General" --><a id="sthref48" name="sthref48"></a>
-<h1>Creating an orm.xml file</h1>
-<p>If you opt not to create an <code>orm.xml</code> file when you create a JPA project, you can create one using the <a href="reference005.htm#CIAIJCCE">Mapping File Wizard</a>.</p>
-<p>Use this procedure to create an <code>orm.xml</code> file:</p>
-<ol start="1">
-<li>
-<p>From the Navigator or Package Explorer, select <span class="bold">File &gt; New &gt; Other</span>. The Select a Wizard dialog appears.</p>
-<div class="figure"><a id="sthref49" name="sthref49"></a>
-<p class="titleinfigure">The Select a Wizard Dialog</p>
-<img src="img/select_a_wizard_mapping.png" alt="The Select a Wizard dialog with Mapping file selected." title="The Select a Wizard dialog with Mapping file selected." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Select <span class="bold">Mapping File</span> and then click <span class="bold">Next</span>. The Mapping File page appears.</p>
-<div class="figure"><a id="sthref50" name="sthref50"></a>
-<p class="titleinfigure">The Mapping File Page</p>
-<img src="img/mapping_file_new.png" alt="The Mapping File page." title="The Mapping File page." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Define the properties in the page and click <span class="bold">Finish</span>. The <code>orm.xml</code> file appears in the src directory of the selected JPA project. You can manage the orm.xml file using the JPA Details view or through the XML Editor. See also <a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a>.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-The Mapping File Wizard will not allow you to proceed if you select a JPA project that already includes an <code>orm.xml</code> file.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-</li>
-</ol>
-</div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm
deleted file mode 100644
index ea5d1dd6bb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:44 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Working with orm.xml file</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Working with orm.xml file" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIHBCDCE" name="CIHBCDCE"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Working with orm.xml file</h1>
-<p><a id="sthref51" name="sthref51"></a><a id="sthref52" name="sthref52"></a>You can work with the <code>orm.xml</code> by using the JPA Details view.</p>
-<p>Use this procedure to work with the <code>orm.xml</code> file:</p>
-<ol start="1">
-<li>
-<p>Right-click the <code>orm.xml</code> file in the <span class="gui-object-title">Package Explorer</span> and select <span class="gui-object-action">Open</span>.</p>
-</li>
-<li>
-<p>In the JPA Structure view, select <span class="bold">EntityMappings</span>.</p>
-</li>
-<li>
-<p>Use the JPA Details view to configure the entity mapping and persistence unit defaults.</p>
-<div class="figure"><a id="sthref53" name="sthref53"></a>
-<p class="titleinfigure">JPA Details view for EntityMappings (orm.xml)</p>
-<img src="img/details_entitymappings.png" alt="JPA Details view for orm.xml file." title="JPA Details view for orm.xml file." /><br /></div>
-<!-- class="figure" --></li>
-</ol>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="#CIHBCDCE">Working with orm.xml file</a><br />
-<a href="../org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html">Working with XML Files</a><br />
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concepts003.htm#CHDBIJAC">The orm.xml file</a><br /></div>
-<!-- class="sect2" -->
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm
deleted file mode 100644
index 7aef6952a7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:44 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Entity</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Entity" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABGBIEE" name="BABGBIEE"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Entity</h1>
-<p><a id="sthref57" name="sthref57"></a><a id="sthref58" name="sthref58"></a><a id="sthref59" name="sthref59"></a><a id="sthref60" name="sthref60"></a>An <span class="bold">Entity</span> is a persistent domain object.</p>
-<p>An entity <span class="italic">can be</span>:</p>
-<ul>
-<li>
-<p>Abstract or concrete classes. Entities may also extend non-entity classes as well as entity classes, and non-entity classes may extend entity classes.</p>
-</li>
-</ul>
-<p>An entity <span class="italic">must have</span>:</p>
-<ul>
-<li>
-<p>A no-arg constructor (public or protected); the entity class may have other constructors as well.</p>
-</li>
-</ul>
-<p><a id="sthref61" name="sthref61"></a><a id="sthref62" name="sthref62"></a><a id="sthref63" name="sthref63"></a>Each persistent entity must be mapped to a database table and contain a primary key. Persistent entities are identified by the <code>@Entity</code> annotation.</p>
-<p>Use this procedure to add persistence to an existing entity:</p>
-<ol start="1">
-<li>
-<p>Open the Java class in the <span class="gui-object-title">Package Explorer.</span></p>
-</li>
-<li>
-<p>Select the class in the JPA Structure view.</p>
-</li>
-<li>
-<p>In the JPA Details view, click the mapping type hyperlink to access the Mapping Type Selection dialog. In the following figure, clicking <span class="italic">entity</span> invokes the dialog from the JPA Details View.</p>
-<div class="figure"><a id="sthref64" name="sthref64"></a>
-<p class="titleinfigure">The Mapping Type Hyperlink</p>
-<img src="img/mapped_entity_type_link.png" alt="The JPA Details view for an entity showing the mapping type hyperlink." title="The JPA Details view for an entity showing the mapping type hyperlink." /><br /></div>
-<!-- class="figure" -->
-<div align="center">
-<div class="inftblnotealso"><br />
-<table class="NoteAlso oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Tip:</p>
-You can also change (or add) persistence for an entity by right-clicking the class in the JPA Structure View and then clicking <span class="bold">Map As &gt; Entity</span>.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnotealso" --></div>
-</li>
-<li>
-<p>Select <span class="bold">Entity</span> from the Mapping Type Selection dialog and then click <span class="bold">OK</span>.</p>
-<div class="figure"><a id="sthref65" name="sthref65"></a>
-<p class="titleinfigure">The Mapping Type Selection Dialog</p>
-<img src="img/mapping_type_selection_entity.png" alt="The Mapping Type selection dialog with Enity selected." title="The Mapping Type selection dialog with Enity selected." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Complete the remaining <a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>.</p>
-</li>
-</ol>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related tasks" title="Related tasks" /><br />
-<br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a><br />
-<a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a><br />
-<a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a><br /></div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm
deleted file mode 100644
index efd109a179..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:44 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Embeddable</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Embeddable" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABFEICE" name="BABFEICE"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Embeddable</h1>
-<p><a id="sthref66" name="sthref66"></a><a id="sthref67" name="sthref67"></a>An <span class="bold">Embedded</span> class is a class whose instances are stored as part of an owning entity; it shares the identity of the owning entity. Each field of the embedded class is mapped to the database table associated with the owning entity.</p>
-<p>To override the mapping information for a specific subclass, use the <code>@AttributeOverride</code> annotation for that specific class.</p>
-<p><a id="sthref68" name="sthref68"></a><a id="sthref69" name="sthref69"></a><a id="sthref70" name="sthref70"></a>An embeddable entity is identified by the <code>@Embeddable</code> annotation.</p>
-<p>Use this procedure to add embeddable persistence to an existing entity:</p>
-<ol start="1">
-<li>
-<p>Open the Java class in the <span class="gui-object-title">Package Explorer</span>.</p>
-</li>
-<li>
-<p>Select the class in the JPA Structure view.</p>
-</li>
-<li>
-<p>Click the mapping type hyperlink to open the Mapping Type Selection dialog.</p>
-</li>
-<li>
-<p>Select <span class="bold">Embeddable</span> and then click <span class="bold">OK</span>.</p>
-<div class="figure"><a id="sthref71" name="sthref71"></a>
-<p class="titleinfigure">Mapping Type Selection Dialog (Embeddable)</p>
-<img src="img/mapping_type_selection_embed.png" alt="The Mapping Type Selection dialog with Embeddable selected." title="The Mapping Type Selection dialog with Embeddable selected." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Complete the remaining <a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>.</p>
-</li>
-</ol>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related tasks" title="Related tasks" /><br />
-<dl>
-<dd><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></dd>
-<dd><a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a></dd>
-<dd><a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a></dd>
-</dl>
-</div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm
deleted file mode 100644
index e03d3d0e13..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:44 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Mapped superclass</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Mapped superclass" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABDAGCI" name="BABDAGCI"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Mapped superclass</h1>
-<p><a id="sthref72" name="sthref72"></a><a id="sthref73" name="sthref73"></a>An entity that extends a <span class="bold">Mapped Superclass</span> class inherits the persistent state and mapping information from a superclass. You should use a mapped superclass to define mapping information that is common to multiple entity classes.</p>
-<p>A mapped superclass <span class="italic">can be</span>:</p>
-<ul>
-<li>
-<p>Abstract or concrete classes</p>
-</li>
-</ul>
-<p>A mapped superclass <span class="italic">cannot be</span>:</p>
-<ul>
-<li>
-<p>Be queried or passed as an argument to Entity-Manager or Query operations</p>
-</li>
-<li>
-<p>Be the target of a persistent relationship</p>
-</li>
-</ul>
-<p>A mapped superclass does not have a defined database table. Instead, its mapping information is derived from its superclass. To override the mapping information for a specific subclass, use the <code>@AttributeOverride</code> annotation for that specific class.</p>
-<p><a id="sthref74" name="sthref74"></a><a id="sthref75" name="sthref75"></a><a id="sthref76" name="sthref76"></a><a id="sthref77" name="sthref77"></a>A mapped superclass is identified by the <code>@MappedSuperclass</code> annotation.</p>
-<p>Use this procedure to add Mapped Superclass persistence to an existing entity:</p>
-<ol start="1">
-<li>
-<p>Open the Java class in the <span class="gui-object-title">Package Explorer</span>.</p>
-</li>
-<li>
-<p>Select the class in the JPA Structure view.</p>
-</li>
-<li>
-<p>In the JPA Details view, click the mapping type hyperlink to open the Mapping Type Selection dialog.</p>
-</li>
-<li>
-<p>Select <span class="bold">Mapped Superclass</span> and then <span class="bold">OK</span>.</p>
-<div class="figure"><a id="sthref78" name="sthref78"></a>
-<p class="titleinfigure">Mapping Type Selection Dialog (Mapped Superclass)</p>
-<img src="img/mapping_type_selection_superclass.png" alt="The Mapping Type Selection dialog with Mapped Superclass selected." title="The Mapping Type Selection dialog with Mapped Superclass selected." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Complete the remaining <a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>.</p>
-</li>
-</ol>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related tasks" title="Related tasks" /><br />
-<br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a><br />
-<a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a><br />
-<a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a><br /></div>
-<!-- class="sect2" -->
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm
deleted file mode 100644
index f88a6d7472..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:45 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Creating Named Queries</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Creating Named Queries" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABIGBGG" name="BABIGBGG"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Creating Named Queries</h1>
-<p><a id="sthref94" name="sthref94"></a><a id="sthref95" name="sthref95"></a>Named queries improve application performance because they are prepared once and they (and all of their associated supporting objects) can be efficiently reused thereafter, making them well suited for complex and frequently executed operations. Named queries use the JPA query language for portable execution on any underlying database; named native queries use the SQL language native to the underlying database.</p>
-<p>Use this procedure to add <code>@NamedQuery</code> and <code>@NamedNativeQuery</code> annotations to the entity.</p>
-<p>To create a named query:</p>
-<ol start="1">
-<li>
-<p>Select the entity in the Package Explorer.</p>
-</li>
-<li>
-<p>In the JPA Details view, expand Queries.</p>
-</li>
-<li>
-<p>Click <span class="bold">Add</span> for a named query, or <span class="bold">Add Native</span> for a native query.</p>
-</li>
-<li>
-<p>In the dialog that appears, enter the name of the query in the Name field and then click OK.</p>
-</li>
-<li>
-<p>Enter the query in the Query field.</p>
-<div class="figure"><a id="sthref96" name="sthref96"></a>
-<p class="titleinfigure">Entering a Named Query</p>
-<img src="img/task_entering_query.png" alt="The Queries section of the JPA Details view." title="The Queries section of the JPA Details view." /><br /></div>
-<!-- class="figure" --></li>
-</ol>
-</div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm
deleted file mode 100644
index d7c93f70a0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:46 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Basic mapping</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Basic mapping" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABBABCE" name="BABBABCE"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Basic mapping</h1>
-<p><a id="sthref97" name="sthref97"></a><a id="sthref98" name="sthref98"></a><a id="sthref99" name="sthref99"></a><a id="sthref100" name="sthref100"></a>Use a <span class="bold">Basic Mapping</span> to map an attribute directly to a database column. Basic mappings may be used only with the following attribute types:</p>
-<ul>
-<li>
-<p>Java primitive types and wrappers of the primitive types</p>
-</li>
-<li>
-<p><code>java.lang.String, java.math.BigInteger</code></p>
-</li>
-<li>
-<p><code>java.math.BigDecimal</code></p>
-</li>
-<li>
-<p><code>java.util.Date</code></p>
-</li>
-<li>
-<p><code>java.util.Calendar, java.sql.Date</code></p>
-</li>
-<li>
-<p><code>java.sql.Time</code></p>
-</li>
-<li>
-<p><code>java.sql.Timestamp</code></p>
-</li>
-<li>
-<p><code>byte[]</code></p>
-</li>
-<li>
-<p><code>Byte[]</code></p>
-</li>
-<li>
-<p><code>char[]</code></p>
-</li>
-<li>
-<p><code>Character[]</code></p>
-</li>
-<li>
-<p>enums</p>
-</li>
-<li>
-<p>any other type that implements <code>Serializable</code></p>
-</li>
-</ul>
-<p>To create a basic mapping:</p>
-<ol start="1">
-<li>
-<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, right-click the field to map. Select <span class="bold">Map As &gt; Basic</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
-</li>
-<li>
-<p>Use this table to complete the remaining fields on the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t15">Property</th>
-<th align="left" valign="bottom" id="r1c2-t15">Description</th>
-<th align="left" valign="bottom" id="r1c3-t15">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t15" headers="r1c1-t15">Entity Map Hyperlink</td>
-<td align="left" headers="r2c1-t15 r1c2-t15">Defines this mapping as a <span class="bold">Basic Mapping</span>.
-<p>This corresponds to the <code>@Basic</code> annotation.</p>
-</td>
-<td align="left" headers="r2c1-t15 r1c3-t15">Basic</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t15" headers="r1c1-t15">Column</td>
-<td align="left" headers="r3c1-t15 r1c2-t15">The database column mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.</td>
-<td align="left" headers="r3c1-t15 r1c3-t15">By default, the Column is assumed to be named identically to the attribute and always included in the <code>INSERT</code> and <code>UPDATE</code> statements.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t15" headers="r1c1-t15">Table</td>
-<td align="left" headers="r4c1-t15 r1c2-t15">Name of the database table.</td>
-<td align="left" headers="r4c1-t15 r1c3-t15"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t15" headers="r1c1-t15">Fetch</td>
-<td align="left" headers="r5c1-t15 r1c2-t15">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
-<ul>
-<li>
-<p>Eager</p>
-</li>
-<li>
-<p>Lazy</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r5c1-t15 r1c3-t15">Eager</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t15" headers="r1c1-t15">Optional</td>
-<td align="left" headers="r6c1-t15 r1c2-t15">Specifies if this field is can be null.</td>
-<td align="left" headers="r6c1-t15 r1c3-t15">Yes</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t15" headers="r1c1-t15">Temporal</td>
-<td align="left" headers="r7c1-t15 r1c2-t15">Specifies the type of data. See <a href="ref_mapping_general.htm#CACEAJGD">"Temporal"</a> for details.
-<ul>
-<li>
-<p>Date</p>
-</li>
-<li>
-<p>Time</p>
-</li>
-<li>
-<p>Timestamp</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r7c1-t15 r1c3-t15"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t15" headers="r1c1-t15">Lob</td>
-<td align="left" headers="r8c1-t15 r1c2-t15">Specifies if this is a large objects (BLOB or CLOB). See <a href="ref_mapping_general.htm#CACBBIBI">"Lob"</a> for details.</td>
-<td align="left" headers="r8c1-t15 r1c3-t15"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-</ol>
-<p>Eclipse adds the following annotations to the field:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@Column(name="<span class="italic">&lt;COLUMN_NAME&gt;</span>", table="<span class="italic">&lt;COLUMN_TABLE&gt;</span>", 
-    insertable=<span class="italic">&lt;INSERTABLE&gt;</span>, updatable=<span class="italic">&lt;UPDATABLE&gt;</span>)
-@Basic(fetch=FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>, optional = <span class="italic">&lt;OPTIONAL&gt;</span>)
-@Temporal(TemporalType.<span class="italic">&lt;TEMPORAL&gt;</span>)
-
-</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm
deleted file mode 100644
index d0d838df60..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:46 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Embedded mapping</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Embedded mapping" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABCBHDF" name="BABCBHDF"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Embedded mapping</h1>
-<p><a id="sthref101" name="sthref101"></a><a id="sthref102" name="sthref102"></a><a id="sthref103" name="sthref103"></a><a id="sthref104" name="sthref104"></a>Use an <span class="bold">Embedded Mapping</span> to specify a persistent field or property of an entity whose value is an instance of an embeddable class.</p>
-<ol start="1">
-<li>
-<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, right-click the field to map.</p>
-</li>
-<li>
-<p>Select <span class="bold">Map as &gt; Embedded</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
-</li>
-<li>
-<p>Use this table to complete the remaining fields on the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t16">Property</th>
-<th align="left" valign="bottom" id="r1c2-t16">Description</th>
-<th align="left" valign="bottom" id="r1c3-t16">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t16" headers="r1c1-t16">Entity Mapping Hyperlnk</td>
-<td align="left" headers="r2c1-t16 r1c2-t16">Defines this mapping as a <span class="bold">Embedded</span>.
-<p>This corresponds to the <code>@Embedded</code> annotation.</p>
-</td>
-<td align="left" headers="r2c1-t16 r1c3-t16">Embedded</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t16" headers="r1c1-t16">Attribute Overrides</td>
-<td align="left" headers="r3c1-t16 r1c2-t16">Specify to override the default mapping of an entity's attribute. Select <span class="bold">Override Default</span>.</td>
-<td align="left" headers="r3c1-t16 r1c3-t16"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t16" headers="r1c1-t16">Columns</td>
-<td align="left" headers="r4c1-t16 r1c2-t16">The database column (and its table) mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.
-<ul>
-<li>
-<p>Name &ndash; Name of the database column.</p>
-</li>
-<li>
-<p>Table &ndash; Name of the database table.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r4c1-t16 r1c3-t16"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-</ol>
-<p>Eclipse adds the following annotations to the field:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@Embedded
-@AttributeOverride(column=@Column(table="<span class="italic">&lt;COLUMN_TABLE&gt;</span>", name = "<span class="italic">&lt;COLUMN_NAME&gt;</span>"))
-</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm
deleted file mode 100644
index 6b35d9c247..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:46 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Embedded ID mapping</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Embedded ID mapping" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIHDIAEE" name="CIHDIAEE"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Embedded ID mapping</h1>
-<p><a id="sthref105" name="sthref105"></a><a id="sthref106" name="sthref106"></a><a id="sthref107" name="sthref107"></a><a id="sthref108" name="sthref108"></a>Use an <span class="bold">Embedded ID Mapping</span> to specify the primary key of an embedded ID. These mappings may be used with a <a href="tasks007.htm#BABFEICE">Embeddable</a> entities.</p>
-<ol start="1">
-<li>
-<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
-</li>
-<li>
-<p>Right-click the field and then select <span class="bold">Map As &gt; Embedded Id</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
-</li>
-<li>
-<p>Use this table to complete the remaining fields on the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t17">Property</th>
-<th align="left" valign="bottom" id="r1c2-t17">Description</th>
-<th align="left" valign="bottom" id="r1c3-t17">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t17" headers="r1c1-t17">Entity Mapping Hyperlink</td>
-<td align="left" headers="r2c1-t17 r1c2-t17">Defines this mapping as a <span class="bold">Embedded Id</span>.
-<p>This corresponds to the <code>@EmbeddedId</code> annotation.</p>
-</td>
-<td align="left" headers="r2c1-t17 r1c3-t17">Embedded Id</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-</ol>
-<p>Eclipse adds the following annotations to the field:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@EmbeddedId
-</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm
deleted file mode 100644
index b8592d92ef..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:46 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>ID mapping</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="ID mapping" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABGCBHG" name="BABGCBHG"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>ID mapping</h1>
-<p><a id="sthref109" name="sthref109"></a><a id="sthref110" name="sthref110"></a><a id="sthref111" name="sthref111"></a><a id="sthref112" name="sthref112"></a>Use an <span class="bold">ID Mapping</span> to specify the primary key of an entity. ID mappings may be used with a <a href="tasks006.htm#BABGBIEE">Entity</a> or <a href="tasks008.htm#BABDAGCI">Mapped superclass</a>. Each <a href="tasks006.htm#BABGBIEE">Entity</a> must have an ID mapping.</p>
-<ol start="1">
-<li>
-<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
-</li>
-<li>
-<p>Right click the filed and then select <span class="bold">Map as &gt; ID</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
-</li>
-<li>
-<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields in the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t18">Property</th>
-<th align="left" valign="bottom" id="r1c2-t18">Description</th>
-<th align="left" valign="bottom" id="r1c3-t18">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t18" headers="r1c1-t18">Entity Mapping Hyperlink</td>
-<td align="left" headers="r2c1-t18 r1c2-t18">Defines this mapping as an <span class="bold">ID Mapping</span>.
-<p>This field corresponds to the <code>@Id</code> annotation.</p>
-</td>
-<td align="left" headers="r2c1-t18 r1c3-t18">ID</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t18" headers="r1c1-t18">Column</td>
-<td align="left" headers="r3c1-t18 r1c2-t18">The database column mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.</td>
-<td align="left" headers="r3c1-t18 r1c3-t18">By default, the Column is assumed to be named identically to the attribute.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t18" headers="r1c1-t18">Table</td>
-<td align="left" headers="r4c1-t18 r1c2-t18">The database table mapped to the entity attribute.</td>
-<td align="left" headers="r4c1-t18 r1c3-t18">By default, the Table is assumed to be identical to the table associated with the entity.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t18" headers="r1c1-t18">Temporal</td>
-<td align="left" headers="r5c1-t18 r1c2-t18">Specifies the type of data. See <a href="ref_mapping_general.htm#CACEAJGD">"Temporal"</a> for details.
-<ul>
-<li>
-<p>Date</p>
-</li>
-<li>
-<p>Time</p>
-</li>
-<li>
-<p>Timestamp</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r5c1-t18 r1c3-t18"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-<li>
-<p>Use this table to complete the fields in <a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation information</a> area in the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the PK Generation tab." summary="This table lists the fields in the PK Generation tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t19">Property</th>
-<th align="left" valign="bottom" id="r1c2-t19">Description</th>
-<th align="left" valign="bottom" id="r1c3-t19">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t19" headers="r1c1-t19">Primary Key Generation</td>
-<td align="left" headers="r2c1-t19 r1c2-t19">These fields define how the primary key is generated.</td>
-<td align="left" headers="r2c1-t19 r1c3-t19"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t19" headers="r1c1-t19">&nbsp;&nbsp;Strategy</td>
-<td align="left" headers="r3c1-t19 r1c2-t19">See <a href="ref_primary_key.htm#CACBAJBC">"Primary Key Generation"</a> for details.
-<ul>
-<li>
-<p>Auto</p>
-</li>
-<li>
-<p>Sequence</p>
-</li>
-<li>
-<p>Identity</p>
-</li>
-<li>
-<p>Table</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r3c1-t19 r1c3-t19">Auto</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t19" headers="r1c1-t19">&nbsp;&nbsp;Generator&nbsp;Name</td>
-<td align="left" headers="r4c1-t19 r1c2-t19">Name of the primary key generator specified in the <span class="bold">Strategy</span></td>
-<td align="left" headers="r4c1-t19 r1c3-t19"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-</ol>
-<p>Additional fields will appear in the <a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation information</a> area, depending on the selected Strategy. See <a href="ref_persistence_map_view.htm#BABIFBAF">"JPA Details view (for attributes)"</a> for additional information.</p>
-<p>Eclipse adds the following annotations to the field:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@Id
-@Column(name="<span class="italic">&lt;COLUMN_NAME&gt;</span>", table="<span class="italic">&lt;TABLE_NAME&gt;</span>", insertable=<span class="italic">&lt;INSERTABLE&gt;</span>,
-    updatable=<span class="italic">&lt;UPDATABLE&gt;</span>)
-@Temporal(<span class="italic">&lt;TEMPORAL&gt;</span>)
-@GeneratedValue(strategy=GeneratorType.<span class="italic">&lt;STRATEGY&gt;</span>, generator="<span class="italic">&lt;GENERATOR_NAME&gt;</span>")@TableGenerator(name="<span class="italic">&lt;TABLE_GENERATOR_NAME&gt;</span>", table = "<span class="italic">&lt;TABLE_GENERATOR_TABLE&gt;</span>", 
-    pkColumnName = "<span class="italic">&lt;TABLE_GENERATOR_PK&gt;</span>", 
-    valueColumnName = "<span class="italic">&lt;TABLE_GENERATOR_VALUE_COLUMN&gt;</span>", 
-    pkColumnValue = "<span class="italic">&lt;TABLE_GENERATOR_PK_COLUMN_VALUE&gt;</span>")@SequenceGenerator(name="<span class="italic">&lt;SEQUENCE_GENERATOR_NAME&gt;</span>", 
-    sequenceName="<span class="italic">&lt;SEQUENCE_GENERATOR_SEQUENCE&gt;</span>")
-</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm
deleted file mode 100644
index 91b6ae91c4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:47 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Many-to-many mapping</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Many-to-many mapping" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABEIEGD" name="BABEIEGD"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Many-to-many mapping</h1>
-<p><a id="sthref113" name="sthref113"></a><a id="sthref114" name="sthref114"></a><a id="sthref115" name="sthref115"></a><a id="sthref116" name="sthref116"></a>Use a <span class="bold">Many-to-Many Mapping</span> to define a many-valued association with many-to-many multiplicity. A many-to-many mapping has two sides: the <span class="italic">owning side</span> and <span class="italic">non-owning side</span>. You must specify the join table on the owning side. For bidirectional mappings, either side may be the owning side.</p>
-<ol start="1">
-<li>
-<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
-</li>
-<li>
-<p>Right-click the field and then select <span class="bold">Map As &gt; Many-toMany</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
-</li>
-<li>
-<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields of the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t20">Property</th>
-<th align="left" valign="bottom" id="r1c2-t20">Description</th>
-<th align="left" valign="bottom" id="r1c3-t20">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t20" headers="r1c1-t20">Mapping Entity Hyperlink</td>
-<td align="left" headers="r2c1-t20 r1c2-t20">Defines this mapping as a <span class="bold">Many to Many Mapping</span>.
-<p>This field corresponds to the <code>@ManyToMany</code> annotation.</p>
-</td>
-<td align="left" headers="r2c1-t20 r1c3-t20">Many to Many</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t20" headers="r1c1-t20">Target Entity</td>
-<td align="left" headers="r3c1-t20 r1c2-t20">The entity to which this attribute is mapped.</td>
-<td align="left" headers="r3c1-t20 r1c3-t20">null
-<p>You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t20" headers="r1c1-t20">Fetch</td>
-<td align="left" headers="r4c1-t20 r1c2-t20">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
-<ul>
-<li>
-<p>Eager</p>
-</li>
-<li>
-<p>Lazy</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r4c1-t20 r1c3-t20">Lazy</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t20" headers="r1c1-t20">Mapped By</td>
-<td align="left" headers="r5c1-t20 r1c2-t20">The database field that owns the relationship.</td>
-<td align="left" headers="r5c1-t20 r1c3-t20"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t20" headers="r1c1-t20">Order By</td>
-<td align="left" headers="r6c1-t20 r1c2-t20">Specify the default order for objects returned from a query. See <a href="ref_mapping_general.htm#CACDADIH">"Order By"</a> for details.
-<ul>
-<li>
-<p>No ordering</p>
-</li>
-<li>
-<p>Primary key</p>
-</li>
-<li>
-<p>Custom</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r6c1-t20 r1c3-t20">No ordering</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-<li>
-<p>Use this table to complete the fields in the <a href="reference014.htm#CACBAEBC">Join Table Information</a> area in the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." summary="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t21">Property</th>
-<th align="left" valign="bottom" id="r1c2-t21">Description</th>
-<th align="left" valign="bottom" id="r1c3-t21">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t21" headers="r1c1-t21">Name</td>
-<td align="left" headers="r2c1-t21 r1c2-t21">Name of the join table that contains the foreign key column.</td>
-<td align="left" headers="r2c1-t21 r1c3-t21">You must specify the join table on the owning side.
-<p>By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t21" headers="r1c1-t21">Join Columns</td>
-<td align="left" headers="r3c1-t21 r1c2-t21">Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</td>
-<td align="left" headers="r3c1-t21 r1c3-t21">By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t21" headers="r1c1-t21">Inverse Join Columns</td>
-<td align="left" headers="r4c1-t21 r1c2-t21">Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</td>
-<td align="left" headers="r4c1-t21 r1c3-t21">By default, the mapping is assumed to have a single join.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-<li>
-<p>To add a new Join or Inverse Join Column, click <span class="gui-object-action">Add</span>.</p>
-<p>To edit an existing Join or Inverse Join Column, select the field to and click <span class="gui-object-action">Edit</span>.</p>
-</li>
-</ol>
-<p>Eclipse adds the following annotations to the field:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@JoinTable(joinColumns=@JoinColumn(name="<span class="italic">&lt;JOIN_COLUMN&gt;</span>"), 
-    name = "<span class="italic">&lt;JOIN_TABLE_NAME&gt;</span>")
-@ManyToMany(cascade=CascadeType.<span class="italic">&lt;CASCADE_TYPE&gt;</span>, fetch=FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>,
-    targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>, mappedBy = "<span class="italic">&lt;MAPPED_BY&gt;</span>")
-@OrderBy("<span class="italic">&lt;ORDER_BY&gt;</span>")
-
-</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm
deleted file mode 100644
index b7943aaab5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:47 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Many-to-one mapping</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Many-to-one mapping" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABHFAFJ" name="BABHFAFJ"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Many-to-one mapping</h1>
-<p><a id="sthref117" name="sthref117"></a><a id="sthref118" name="sthref118"></a><a id="sthref119" name="sthref119"></a><a id="sthref120" name="sthref120"></a>Use a <span class="bold">Many-to-One</span> mapping to defines a single-valued association to another entity class that has many-to-one multiplicity.</p>
-<ol start="1">
-<li>
-<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
-</li>
-<li>
-<p>Right click the field and then select <span class="bold">Map As &gt; Many-to-One</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
-</li>
-<li>
-<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields JPA Details view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields ion the General tab for this mapping." summary="This table lists the fields ion the General tab for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t22">Property</th>
-<th align="left" valign="bottom" id="r1c2-t22">Description</th>
-<th align="left" valign="bottom" id="r1c3-t22">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t22" headers="r1c1-t22">Mapping Entity Hyperlink</td>
-<td align="left" headers="r2c1-t22 r1c2-t22">Defines mapping as <span class="bold">Many-to-One</span>. This corresponds to the <code>@ManyToOne</code> annotation.</td>
-<td align="left" headers="r2c1-t22 r1c3-t22">Many-to-One</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t22" headers="r1c1-t22">Target Entity</td>
-<td align="left" headers="r3c1-t22 r1c2-t22">The entity to which this attribute is mapped.</td>
-<td align="left" headers="r3c1-t22 r1c3-t22">null
-<p>You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t22" headers="r1c1-t22">Fetch</td>
-<td align="left" headers="r4c1-t22 r1c2-t22">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
-<ul>
-<li>
-<p>Eager</p>
-</li>
-<li>
-<p>Lazy</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r4c1-t22 r1c3-t22">Eager</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t22" headers="r1c1-t22">Cascade</td>
-<td align="left" headers="r5c1-t22 r1c2-t22">See <a href="ref_mapping_general.htm#CACJAIHB">"Cascade Type"</a> for details.
-<ul>
-<li>
-<p>Default</p>
-</li>
-<li>
-<p>All</p>
-</li>
-<li>
-<p>Persist</p>
-</li>
-<li>
-<p>Merge</p>
-</li>
-<li>
-<p>Remove</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r5c1-t22 r1c3-t22">Default</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t22" headers="r1c1-t22">Optional</td>
-<td align="left" headers="r6c1-t22 r1c2-t22">Specifies if this field is can be null.</td>
-<td align="left" headers="r6c1-t22 r1c3-t22">Yes</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-<li>
-<p>Use this table to complete the fields on the <a href="reference015.htm#CACFCEJC">Join Columns Information</a> tab in the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t23">Property</th>
-<th align="left" valign="bottom" id="r1c2-t23">Description</th>
-<th align="left" valign="bottom" id="r1c3-t23">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t23" headers="r1c1-t23">Join Column</td>
-<td align="left" headers="r2c1-t23 r1c2-t23"><a id="sthref121" name="sthref121"></a><a id="sthref122" name="sthref122"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
-<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
-</td>
-<td align="left" headers="r2c1-t23 r1c3-t23">By default, the mapping is assumed to have a single join.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-</ol>
-<p>Eclipse adds the following annotations to the field:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@JoinTable(joinColumns=@JoinColumn(name="<span class="italic">&lt;JOIN_COLUMN&gt;</span>"), 
-    name = "<span class="italic">&lt;JOIN_TABLE_NAME&gt;</span>")
-@ManyToOne(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>, fetch=<span class="italic">&lt;FETCH_TYPE&gt;</span>, 
-    cascade=<span class="italic">&lt;CASCADE_TYPE&gt;</span>)
-</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm
deleted file mode 100644
index c24117b252..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:47 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>One-to-many mapping</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="One-to-many mapping" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABHGEBD" name="BABHGEBD"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>One-to-many mapping</h1>
-<p><a id="sthref123" name="sthref123"></a><a id="sthref124" name="sthref124"></a><a id="sthref125" name="sthref125"></a><a id="sthref126" name="sthref126"></a>Use a <span class="bold">One-to-Many Mapping</span> to define a relationship with one-to-many multiplicity.</p>
-<ol start="1">
-<li>
-<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
-</li>
-<li>
-<p>Right-click the field and then select <span class="bold">Map As &gt; One-to-many</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
-</li>
-<li>
-<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields JPA Details view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the General tab of the Persistence Properties view for this mapping." summary="This table lists the fields in the General tab of the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t24">Property</th>
-<th align="left" valign="bottom" id="r1c2-t24">Description</th>
-<th align="left" valign="bottom" id="r1c3-t24">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t24" headers="r1c1-t24">Mapping Entity Type Hyperlink</td>
-<td align="left" headers="r2c1-t24 r1c2-t24">Defines mapping as <span class="bold">One-to-Many</span>. This corresponds to the <code>@OneToMany</code> annotation.</td>
-<td align="left" headers="r2c1-t24 r1c3-t24">One-to-Many</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t24" headers="r1c1-t24">Target Entity</td>
-<td align="left" headers="r3c1-t24 r1c2-t24">The entity to which this attribute is mapped.</td>
-<td align="left" headers="r3c1-t24 r1c3-t24"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t24" headers="r1c1-t24">Cascade</td>
-<td align="left" headers="r4c1-t24 r1c2-t24">See <a href="ref_mapping_general.htm#CACJAIHB">"Cascade Type"</a> for details.
-<ul>
-<li>
-<p>Default</p>
-</li>
-<li>
-<p>All</p>
-</li>
-<li>
-<p>Persist</p>
-</li>
-<li>
-<p>Merge</p>
-</li>
-<li>
-<p>Remove</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r4c1-t24 r1c3-t24"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t24" headers="r1c1-t24">Fetch</td>
-<td align="left" headers="r5c1-t24 r1c2-t24">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
-<ul>
-<li>
-<p>Eager</p>
-</li>
-<li>
-<p>Lazy</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r5c1-t24 r1c3-t24">Eager</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t24" headers="r1c1-t24">Mapped By</td>
-<td align="left" headers="r6c1-t24 r1c2-t24">The database field that owns the relationship.</td>
-<td align="left" headers="r6c1-t24 r1c3-t24"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t24" headers="r1c1-t24">Order By</td>
-<td align="left" headers="r7c1-t24 r1c2-t24">Specify the default order for objects returned from a query. See <a href="ref_mapping_general.htm#CACDADIH">"Order By"</a> for details.
-<ul>
-<li>
-<p>No ordering</p>
-</li>
-<li>
-<p>Primary key</p>
-</li>
-<li>
-<p>Custom</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r7c1-t24 r1c3-t24">No ordering</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-<li>
-<p>Use this table to complete the <a href="reference014.htm#CACBAEBC">Join Table Information</a> fields in the JPA Details view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." summary="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t25">Property</th>
-<th align="left" valign="bottom" id="r1c2-t25">Description</th>
-<th align="left" valign="bottom" id="r1c3-t25">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t25" headers="r1c1-t25">Name</td>
-<td align="left" headers="r2c1-t25 r1c2-t25">Name of the join table</td>
-<td align="left" headers="r2c1-t25 r1c3-t25">By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t25" headers="r1c1-t25">Join Columns</td>
-<td align="left" headers="r3c1-t25 r1c2-t25">Specify two or more join columns (that is, a primary key).</td>
-<td align="left" headers="r3c1-t25 r1c3-t25"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t25" headers="r1c1-t25">Inverse Join Columns</td>
-<td align="left" headers="r4c1-t25 r1c2-t25">The join column on the owned (or inverse) side of the association: the owned entity's primary key column.</td>
-<td align="left" headers="r4c1-t25 r1c3-t25"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-</ol>
-<p>Eclipse adds the following annotations to the field:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@OneToMany(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>)
-@Column(name="<span class="italic">&lt;COLUMN&gt;</span>")
-
-
-@OneToMany(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>.class, cascade=CascadeType.<span class="italic">&lt;CASCADE_TYPE&gt;</span>, 
-    fetch = FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>, mappedBy = "<span class="italic">&lt;MAPPED_BY&gt;</span>")@OrderBy("<span class="italic">&lt;ORDER_BY&gt;</span>")
-@JoinTable(name="<span class="italic">&lt;JOIN_TABLE_NAME&gt;</span>", joinColumns=@JoinColumn(name=
-    "<span class="italic">&lt;JOIN_COLUMN_NAME&gt;</span>", referencedColumnName="<span class="italic">&lt;JOIN_COLUMN_REFERENCED_COLUMN&gt;</span>"), 
-    inverseJoinColumns=@JoinColumn(name="<span class="italic">&lt;INVERSE_JOIN_COLUMN_NAME&gt;</span>", 
-    referencedColumnName="<span class="italic">&lt;INVERSE_JOIN_COLUMN_REFERENCED_COLUMN&gt;</span>"))
-
-</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm
deleted file mode 100644
index 7502303b93..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:47 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>One-to-one mapping</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="One-to-one mapping" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABFHBCJ" name="BABFHBCJ"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>One-to-one mapping</h1>
-<p><a id="sthref127" name="sthref127"></a><a id="sthref128" name="sthref128"></a><a id="sthref129" name="sthref129"></a><a id="sthref130" name="sthref130"></a>Use a <span class="bold">One-to-One Mapping</span> to define a relationship with one-to-many multiplicity.</p>
-<ol start="1">
-<li>
-<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
-</li>
-<li>
-<p>Right-click the field and then select <span class="bold">Map As &gt; One-to-One</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
-</li>
-<li>
-<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields in the JPA Details view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t26">Property</th>
-<th align="left" valign="bottom" id="r1c2-t26">Description</th>
-<th align="left" valign="bottom" id="r1c3-t26">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t26" headers="r1c1-t26">Mapped Entity Hyperlink</td>
-<td align="left" headers="r2c1-t26 r1c2-t26">Defines mapping as <span class="bold">One-to-One</span>. This corresponds to the <code>@OneToOne</code> annotation.</td>
-<td align="left" headers="r2c1-t26 r1c3-t26">One-to-One</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t26" headers="r1c1-t26">Target Entity</td>
-<td align="left" headers="r3c1-t26 r1c2-t26">The entity to which this attribute is mapped.</td>
-<td align="left" headers="r3c1-t26 r1c3-t26">null
-<p>You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t26" headers="r1c1-t26">Fetch Type</td>
-<td align="left" headers="r4c1-t26 r1c2-t26">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
-<ul>
-<li>
-<p>Eager</p>
-</li>
-<li>
-<p>Lazy</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r4c1-t26 r1c3-t26">Eager</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t26" headers="r1c1-t26">Mapped By</td>
-<td align="left" headers="r5c1-t26 r1c2-t26">The database field that owns the relationship.</td>
-<td align="left" headers="r5c1-t26 r1c3-t26"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-<li>
-<p>Use this table to complete the <a href="reference015.htm#CACFCEJC">Join Columns Information</a> fields in the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t27">Property</th>
-<th align="left" valign="bottom" id="r1c2-t27">Description</th>
-<th align="left" valign="bottom" id="r1c3-t27">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t27" headers="r1c1-t27">Join Column</td>
-<td align="left" headers="r2c1-t27 r1c2-t27"><a id="sthref131" name="sthref131"></a><a id="sthref132" name="sthref132"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
-<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
-</td>
-<td align="left" headers="r2c1-t27 r1c3-t27">By default, the mapping is assumed to have a single join.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-</ol>
-<p>Eclipse adds the following annotations to the field:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@OneToOne(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>, cascade=CascadeType.<span class="italic">&lt;CASCADE_TYPE&gt;</span>, 
-    fetch = FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>, mappedBy = "<span class="italic">&lt;MAPPED_BY&gt;</span>")
-@JoinColumn(name="<span class="italic">&lt;JOIN_COLUMN_NAME&gt;</span>", referencedColumnName=
-    "<span class="italic">&lt;JOIN_COLUMN_REFERENCED_COLUMN&gt;</span>", insertable = <span class="italic">&lt;INSERTABLE&gt;</span>, 
-    updatable = <span class="italic">&lt;UPDATABLE&gt;</span>)
-
-</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm
deleted file mode 100644
index 59bbb35eda..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:48 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Transient mapping</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Transient mapping" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABHFHEI" name="BABHFHEI"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Transient mapping</h1>
-<p><a id="sthref133" name="sthref133"></a><a id="sthref134" name="sthref134"></a><a id="sthref135" name="sthref135"></a><a id="sthref136" name="sthref136"></a>Use the Transient Mapping to specify a field of the entity class that <span class="italic">is not</span> persistent.</p>
-<p>To create a transient mapping:</p>
-<ol start="1">
-<li>
-<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
-</li>
-<li>
-<p>Right-click the field and then select <span class="bold">Map As Transient</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
-</li>
-</ol>
-<p>Eclipse adds the following annotation to the field:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@Transient
-</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm
deleted file mode 100644
index 9dde2935bc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm
+++ /dev/null
@@ -1,133 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:48 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Version mapping</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Version mapping" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABHIBII" name="BABHIBII"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Version mapping</h1>
-<p><a id="sthref137" name="sthref137"></a><a id="sthref138" name="sthref138"></a><a id="sthref139" name="sthref139"></a><a id="sthref140" name="sthref140"></a>Use a <span class="bold">Version Mapping</span> to specify the field used for optimistic locking. If the entity is associated with multiple tables, you should use a version mapping only with the primary table. You should have only a single version mapping per persistent entity. Version mappings may be used only with the following attribute types:</p>
-<ul>
-<li>
-<p><code>int</code></p>
-</li>
-<li>
-<p><code>Integer</code></p>
-</li>
-<li>
-<p><code>short, Short</code></p>
-</li>
-<li>
-<p><code>long, Long</code></p>
-</li>
-<li>
-<p><code>Timestamp</code></p>
-</li>
-</ul>
-<p>To create a version mapping:</p>
-<ol start="1">
-<li>
-<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
-</li>
-<li>
-<p>Right-click the field and then select <span class="bold">Map As &gt; Version</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
-</li>
-<li>
-<p>Use this table to complete the remaining fields in the JPA Details view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t28">Property</th>
-<th align="left" valign="bottom" id="r1c2-t28">Description</th>
-<th align="left" valign="bottom" id="r1c3-t28">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t28" headers="r1c1-t28">Mapped Entity Hyperlink</td>
-<td align="left" headers="r2c1-t28 r1c2-t28">Defines the mapping as Version. This corresponds to the <code>@Version</code> annotation.</td>
-<td align="left" headers="r2c1-t28 r1c3-t28">Version</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t28" headers="r1c1-t28">Column</td>
-<td align="left" headers="r3c1-t28 r1c2-t28">The database column mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.</td>
-<td align="left" headers="r3c1-t28 r1c3-t28">By default, the Column is assumed to be named identically to the attribute and always included in the <code>INSERT</code> and <code>UPDATE</code> statements.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t28" headers="r1c1-t28">Table</td>
-<td align="left" headers="r4c1-t28 r1c2-t28">Name of the database table. This must be the primary table associated with the attribute's entity.</td>
-<td align="left" headers="r4c1-t28 r1c3-t28"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t28" headers="r1c1-t28">Temporal</td>
-<td align="left" headers="r5c1-t28 r1c2-t28">Specifies the type of data. See <a href="ref_mapping_general.htm#CACEAJGD">"Temporal"</a> for details.
-<ul>
-<li>
-<p>Date</p>
-</li>
-<li>
-<p>Time</p>
-</li>
-<li>
-<p>Timestamp</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r5c1-t28 r1c3-t28"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-</ol>
-<p>Eclipse adds the following annotations to the field:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@Version
-@Column(table="<span class="italic">&lt;COLUMN_TABLE&gt;</span>", name="&lt;<span class="italic">COLUMN_NAME</span>&gt;")
-
-</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
-<!-- class="sect2" -->
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm
deleted file mode 100644
index 15b7a7dbcd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:48 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Generating entities from tables</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Generating entities from tables" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABBAGFI" name="BABBAGFI"></a></p>
-<div class="sect1">
-<h1>Generating entities from tables</h1>
-<p><a id="sthref141" name="sthref141"></a><a id="sthref142" name="sthref142"></a>Use this procedure to generate Java persistent entities from database tables. You must create a JPA project and establish a database connection <span class="italic">before</span> generating persistent entities. See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> for more information.</p>
-<ol start="1">
-<li>
-<p>Right-click the JPA project in the <span class="gui-object-title">Package Explorer</span> and select <span class="gui-object-action">JPA Tools &gt; Generate Entities</span>.</p>
-<div class="figure"><a id="sthref143" name="sthref143"></a>
-<p class="titleinfigure">Generating Entities</p>
-<img src="img/generate_entities.png" alt="Using the JPA Tools &gt; Generate Entities menu option." title="Using the JPA Tools &gt; Generate Entities menu option." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>If you are not currently connected to the database, the Database Connection page appears. Select your database connection and schema, and click <span class="bold">Reconnect</span>.</p>
-<p>To create a new database connection, click <span class="bold">Add connection</span>.</p>
-<p>After connecting to the database, click <span class="bold">Next</span>.</p>
-</li>
-<li>
-<p><a id="sthref144" name="sthref144"></a><a id="sthref145" name="sthref145"></a>On the <a href="task_generate_entities.htm#CACDAFJD">Generate Entities from Tables dialog</a> dialog, select the tables from which to generate Java persistent entities and click <span class="bold">Finish</span>.</p>
-</li>
-</ol>
-<p>Eclipse creates a Java persistent entity for each database table. Each entity contains fields based on the table's columns. Eclipse will also generate entity relationships (such as one-to-one) based on the table constraints. <a href="#CIHJIJJC">Figure: Generating Entities from Tables</a> illustrates how Eclipse generates entities from tables.</p>
-<div class="figure"><a id="CIHJIJJC" name="CIHJIJJC"></a>
-<p class="titleinfigure">Generating Entities from Tables</p>
-<img src="img/table_entity.png" alt="This figure shows the EMPLOYEE and ADDRESS entities generated from database tables." title="This figure shows the EMPLOYEE and ADDRESS entities generated from database tables." /><br /></div>
-<!-- class="figure" -->
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; JPA Options</a></div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm
deleted file mode 100644
index 246f1e40da..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:48 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Generating DDL from Entities</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Generating DDL from Entities" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIHJIGBE" name="CIHJIGBE"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Generating DDL from Entities</h1>
-<p>When using a vendor-specific platform, you can create a DDL script from your persistent entities.</p>
-<p>To generate a DDL script:</p>
-<p>Right-click the JPA project in the <span class="gui-object-title">Package Explorer</span> and select <span class="gui-object-action">JPA Tools &gt; Generate DDL</span>.</p>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<p><a href="tasks001.htm#BABFBJBG">Creating a JPA Entity</a></p>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; JPA Options</a></div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks022.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks022.htm
deleted file mode 100644
index 892855f71c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks022.htm
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:48 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Validating mappings and reporting problems</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Validating mappings and reporting problems" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABFAIBA" name="BABFAIBA"></a></p>
-<div class="sect1">
-<h1>Validating mappings and reporting problems</h1>
-<p><a id="sthref146" name="sthref146"></a><a id="sthref147" name="sthref147"></a><a id="sthref148" name="sthref148"></a><a id="sthref149" name="sthref149"></a>Errors and warnings on persistent entities and mappings are indicated with a red error or yellow warning next to the resource with the error, as well as the parent containers up to the project.</p>
-<div class="figure"><a id="sthref150" name="sthref150"></a>
-<p class="titleinfigure">Sample Errors and Warnings</p>
-<img src="img/error_sample.png" alt="This figure shows sample error and warning icons in the Explorer view." title="This figure shows sample error and warning icons in the Explorer view." /><br /></div>
-<!-- class="figure" -->
-<p>This section contains information on the following:</p>
-<ul>
-<li>
-<p><a href="tasks023.htm#CIHFEDEI">Error messages</a></p>
-</li>
-<li>
-<p><a href="tasks024.htm#CIHGEAIJ">Warning messages</a></p>
-</li>
-</ul>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<p><a href="../org.eclipse.platform.doc.user/concepts/cprbview.htm">Problems view</a></p>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" --></div>
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm
deleted file mode 100644
index af2541b288..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Error messages</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Error messages" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIHFEDEI" name="CIHFEDEI"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Error messages<a id="sthref151" name="sthref151"></a></h1>
-<p>This section contains information on error messages (including how to resolve the issue) you may encounter while working with Dali.</p>
-<a id="sthref152" name="sthref152"></a>
-<p class="subhead2">Attribute "<span class="italic">&lt;ATTRIBUTE__NAME&gt;</span>" has invalid mapping type in this context</p>
-<p>The mapped attribute is invalid. Either change the mapping type or change the entity type.</p>
-<p>See <a href="task_mapping.htm#BABDGBIJ">"Mapping an entity"</a> for more information.</p>
-<a id="sthref153" name="sthref153"></a>
-<p class="subhead2">Attribute "<span class="italic">&lt;ATTRIBUTE_NAME&gt;</span>" cannot be resolved.</p>
-<p>Dali cannot map the attribute to a database table and column. Verify that you database connection information is correct.</p>
-<p>See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> for more information.</p>
-<a id="sthref154" name="sthref154"></a>
-<p class="subhead2">Class "<span class="italic">&lt;CLASS_NAME&gt;</span>" is not annotated as a persistent class.</p>
-<p>The class has not been identified as a persistent class. Configure the class as an Entity, Mapped Superclass, or Embeddable persistent entity.</p>
-<p>See <a href="task_add_persistence.htm#BABHICAI">"Adding persistence to a class"</a>.</p>
-<a id="sthref155" name="sthref155"></a>
-<p class="subhead2">Column "<span class="italic">&lt;COLUMN_NAME&gt;</span>" cannot be resolved.</p>
-<p>You mapped an entity's field to an incorrect or invalid column in the database table. By default, Dali will attempt to map each field in the entity with an identically named row in the database table. If the field's name differs from the row's name, you must explicitly create the mapping.</p>
-<p>Map the field to a valid row in the database table as shown in <a href="task_mapping.htm#BABDGBIJ">"Mapping an entity"</a>.</p>
-<a id="sthref156" name="sthref156"></a>
-<p class="subhead2">Duplicate class "<span class="italic">&lt;CLASS_NAME&gt;</span>".</p>
-<p>You created to persistence classes with the same name. Each Java class must have a unique name. See <a href="task_add_persistence.htm#BABHICAI">"Adding persistence to a class"</a> for more information.</p>
-<a id="sthref157" name="sthref157"></a>
-<p class="subhead2">Entity does not have an Id or Embedded Id.</p>
-<p>You created a persistent entity without identifying its primary key. A persistent entity must have a primary key field designated with an <code>@Id</code> or <code>@EmbeddedId</code> annotation.</p>
-<p>Add an ID mapping to the entity as shown in <a href="tasks013.htm#BABGCBHG">"ID mapping"</a> or <a href="tasks012.htm#CIHDIAEE">"Embedded ID mapping"</a>.</p>
-<a id="sthref158" name="sthref158"></a>
-<p class="subhead2">Multiple persistence.xml files in project.</p>
-<p>You created a JPA project with more than one <code>persistence.xml</code> file. Each JPA project must contain a <span class="italic">single</span> <code>persistence.xml</code> file.</p>
-<p>See <a href="task_manage_persistence.htm#CIHDAJID">"Managing the persistence.xml file"</a> for more information.</p>
-<a id="sthref159" name="sthref159"></a>
-<p class="subhead2">No persistence unit defined.</p>
-<p>There is no persistence unit defined in the <code>persistence.xml</code> file. Use the &lt;persistence-unit name="<span class="italic">&lt;PERSISTENCE_UNIT_NAME&gt;</span>" tag to define the persistent unit.</p>
-<p>See <a href="task_manage_orm.htm#CIHDGDCD">"Managing the orm.xml file"</a> for more information.</p>
-<a id="sthref160" name="sthref160"></a>
-<p class="subhead2">No persistence.xml file in project.</p>
-<p>You created a JPA project without a <code>persistence.xml</code> file. Each JPA project must contain a <span class="italic">single</span> <code>persistence.xml</code> file.</p>
-<p>See <a href="task_manage_persistence.htm#CIHDAJID">"Managing the persistence.xml file"</a> for more information.</p>
-<a id="sthref161" name="sthref161"></a>
-<p class="subhead2">Referenced column "<span class="italic">&lt;COLUMN_NAME&gt;</span>" in join column "<span class="italic">&lt;COLUMN_NAME&gt;</span>" cannot be resolved.</p>
-<p>The column that you selected to join a relationship mapping does not exist on the database table. Either select a different column on the <a href="reference014.htm#CACBAEBC">Join Table Information</a> or create the necessary column on the database table.</p>
-<p>See <a href="ref_persistence_map_view.htm#BABIFBAF">"JPA Details view (for attributes)"</a> for more information.</p>
-<a id="sthref162" name="sthref162"></a>
-<p class="subhead2">Schema "&lt;<span class="italic">SCHEMA_NAME</span>&gt;" cannot be resolved for table/join table "&lt;<span class="italic">TABLE_NAME</span>&gt;".</p>
-<p>Define the default database schema information in the persistence unit.</p>
-<p>See <a href="task_manage_orm.htm#CIHDGDCD">"Managing the orm.xml file"</a> for more information.</p>
-<a id="sthref163" name="sthref163"></a>
-<p class="subhead2">Table "<span class="italic">&lt;TABLE_NAME&gt;</span>" cannot be resolved.</p>
-<p>You associated a persistent entity to an incorrect or invalid database table. By default, Dali will attempt to associate each persistent entity with an identically named database table. If the entity's name differs from the table's name, you must explicitly create the association.</p>
-<p>Associate the entity with a valid database table as shown in <a href="task_add_persistence.htm#BABHICAI">"Adding persistence to a class"</a>.</p>
-<a id="sthref164" name="sthref164"></a>
-<p class="subhead2">Unresovlved generator "<span class="italic">&lt;GENERATOR_NAME&gt;</span>" is defined in persistence unit.</p>
-<p>You created a persistence entity that uses sequencing or a table generator, but did not define the generator in the persistence unit. Either define the generator by using an annotation or including it in the XML mapping file.</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<p><a href="../org.eclipse.platform.doc.user/concepts/cprbview.htm">Problems view</a></p>
-</div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm
deleted file mode 100644
index fbcdec3bde..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Warning messages</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Warning messages" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CIHGEAIJ" name="CIHGEAIJ"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Warning messages</h1>
-<p>This section contains information on warning messages (including how to resolve the issue) you may encounter while working with Dali.</p>
-<a id="sthref165" name="sthref165"></a>
-<p class="subhead2">Connection "<span class="italic">&lt;CONNECTION_NAME&gt;</span>" is not active. No validation will be done against the data source.</p>
-<p>The database connection you specified to use with the JPA project is not active. The JPA project requires an active connection.</p>
-<a id="sthref166" name="sthref166"></a>
-<p class="subhead2">No connection specified for the project. No data-specific validation will be performed.</p>
-<p>You created a JPA project without specifying a database connection. The JPA project requires an active connection.</p>
-<p>See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> or <a href="tasks025.htm#BABDBCBI">"Modifying persistent project properties"</a> for information on specifying a database connection.</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<p><a href="../org.eclipse.platform.doc.user/concepts/cprbview.htm">Problems view</a></p>
-</div>
-<!-- class="sect2" -->
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm
deleted file mode 100644
index ae5f8006c6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Modifying persistent project properties</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Modifying persistent project properties" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BABDBCBI" name="BABDBCBI"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Modifying persistent project properties</h1>
-<p>Each persistent project must be associated with a database connection. To create a new database connection, click <span class="gui-object-action">Database Connection</span> use the New Connection wizard.</p>
-<p>Use this procedure to modify the vender-specific platform and database connection associated with your JPA project.</p>
-<ol start="1">
-<li>
-<p>Right-click the project in the <span class="gui-object-title">Explorer</span> view and select <span class="gui-object-action">Properties</span>. The Properties page appears.</p>
-<div class="figure"><a id="sthref167" name="sthref167"></a>
-<p class="titleinfigure">The Properties Page</p>
-<img src="img/project_properties_tasks.png" alt="The Persistence page." title="The Persistence page." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Use this table to complete the remaining fields on the Properties &ndash; JPA page and click <span class="bold">OK</span>.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Properties - Java Persistence dialog." summary="This table lists the fields in the Properties - Java Persistence dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t29">Property</th>
-<th align="left" valign="bottom" id="r1c2-t29">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t29" headers="r1c1-t29">Platform</td>
-<td align="left" headers="r2c1-t29 r1c2-t29">Select the vendor-specific platform for the JPA implementation.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t29" headers="r1c1-t29">Database Connection</td>
-<td align="left" headers="r3c1-t29 r1c2-t29">Database connection to use to store the persistent entities. To create a new connection, click <span class="bold">Add Connection</span>.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t29" headers="r1c1-t29">&nbsp;&nbsp;Override default schema from connection</td>
-<td align="left" headers="r4c1-t29 r1c2-t29">Select a schema other than the default one derived from the connection information. Use this option if the default schema cannot be used. For example, use this option in cases where the deployment login differs from the design-time login.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-</ol>
-<p>To create a new connection, click <span class="bold">Add connections</span>.</p>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; JPA Options</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a></div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tips_and_tricks.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tips_and_tricks.htm
deleted file mode 100644
index 4b31111351..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tips_and_tricks.htm
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:53 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Tips and tricks</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content=" Tips and tricks" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CHDHGHBF" name="CHDHGHBF"></a></p>
-<h1>Tips and tricks</h1>
-<p>The following tips and tricks give some helpful ideas for increasing your productivity.</p>
-<ul>
-<li>
-<p><a href="#BABFIIHA"><span class="bold">Database Connections</span></a></p>
-</li>
-<li>
-<p><a href="#BABCHAHF"><span class="bold">Schema-based persistence.xml</span></a></p>
-</li>
-</ul>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the tips and tricks in this category." summary="This table lists the tips and tricks in this category." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t2">Tip</th>
-<th align="left" valign="bottom" id="r1c2-t2">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t2" headers="r1c1-t2"><a id="BABFIIHA" name="BABFIIHA"></a><span class="bold">Database Connections</span></td>
-<td align="left" headers="r2c1-t2 r1c2-t2">When starting a new workbench session, be sure to reconnect to your database (if you are working online). This allows Dali to provide database-related mapping assistance and validation.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t2" headers="r1c1-t2"><a id="BABCHAHF" name="BABCHAHF"></a><span class="bold">Schema-based persistence.xml</span></td>
-<td align="left" headers="r3c1-t2 r1c2-t2">If you are behind a firewall, you may need to configure your Eclipse workspace proxy in the <a href="../org.eclipse.platform.doc.user/reference/ref-72.htm">Preferences dialog</a> (<span class="gui-object-action">Preferences &gt; Internet &gt; Proxy Settings</span>) to properly validate a schema-based <code>persistence.xml</code> file.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml b/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml
deleted file mode 100644
index c7d9998ef2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- User Guide -->
-  <toc label="Dali Java Persistence Tools User Guide">
-    <topic href="getting_started.htm" label="Getting started">
-      <topic href="getting_started001.htm" label="Requirements and installation" />
-      <topic href="getting_started002.htm" label="Dali quick start">
-        <topic href="getting_started003.htm" label="Creating a new JPA project" />
-        <topic href="getting_started004.htm" label="Creating a Java persistent entity with persistent fields" />
-      </topic>
-    </topic>
-    <topic href="concepts.htm" label=" Concepts">
-      <topic href="concept_persistence.htm" label="Understanding Java persistence" />
-      <topic href="concept_mapping.htm" label="Understanding OR mappings" />
-      <topic href="concepts001.htm" label="Understanding EJB 3.0 Java Persistence API">
-        <topic href="concepts002.htm" label="The persistence.xml file" />
-        <topic href="concepts003.htm" label="The orm.xml file" />
-      </topic>
-    </topic>
-    <topic href="tasks.htm" label=" Tasks">
-      <topic href="task_create_new_project.htm" label="Creating a new JPA project" />
-      <topic href="tasks001.htm" label="Creating a JPA Entity" />
-      <topic href="task_manage_persistence.htm" label="Managing the persistence.xml file">
-        <topic href="tasks002.htm" label="Using the XML Editor to edit the persistence.xml file" />
-        <topic href="tasks003.htm" label="Synchronizing classes" />
-      </topic>
-      <topic href="task_manage_orm.htm" label="Managing the orm.xml file">
-        <topic href="tasks004.htm" label="Creating an orm.xml file" />
-        <topic href="tasks005.htm" label="Working with orm.xml file" />
-      </topic>
-      <topic href="task_add_persistence.htm" label="Adding persistence to a class">
-        <topic href="tasks006.htm" label="Entity" />
-        <topic href="tasks007.htm" label="Embeddable" />
-        <topic href="tasks008.htm" label="Mapped superclass" />
-      </topic>
-      <topic href="task_additonal_tables.htm" label="Specifying additional tables" />
-      <topic href="task_inheritance.htm" label="Specifying entity inheritance" />
-      <topic href="tasks009.htm" label="Creating Named Queries" />
-      <topic href="task_mapping.htm" label="Mapping an entity">
-        <topic href="tasks010.htm" label="Basic mapping" />
-        <topic href="tasks011.htm" label="Embedded mapping" />
-        <topic href="tasks012.htm" label="Embedded ID mapping" />
-        <topic href="tasks013.htm" label="ID mapping" />
-        <topic href="tasks014.htm" label="Many-to-many mapping" />
-        <topic href="tasks015.htm" label="Many-to-one mapping" />
-        <topic href="tasks016.htm" label="One-to-many mapping" />
-        <topic href="tasks017.htm" label="One-to-one mapping" />
-        <topic href="tasks018.htm" label="Transient mapping" />
-        <topic href="tasks019.htm" label="Version mapping" />
-      </topic>
-      <topic href="tasks020.htm" label="Generating entities from tables" />
-      <topic href="tasks021.htm" label="Generating DDL from Entities" />
-      <topic href="tasks022.htm" label="Validating mappings and reporting problems">
-        <topic href="tasks023.htm" label="Error messages" />
-        <topic href="tasks024.htm" label="Warning messages" />
-      </topic>
-      <topic href="tasks025.htm" label="Modifying persistent project properties" />
-    </topic>
-    <topic label=" Reference">
-      <topic label="Wizards">
-        <topic href="ref_new_jpa_project_wizard.htm" label="Create New JPA Project wizard">
-          <topic href="ref_new_jpa_project.htm" label="New JPA Project page" />
-          <topic href="ref_jpa_facet.htm" label="JPA Facet page" />
-        </topic>
-        <topic href="reference002.htm" label="Create JPA Entity wizard">
-          <topic href="reference003.htm" label="Entity Class page" />
-          <topic href="reference004.htm" label="Entity Properties page" />
-        </topic>
-        <topic href="reference005.htm" label="Mapping File Wizard">
-          <topic href="reference006.htm#sthref171" label="Mapping File" />
-        </topic>
-        <topic href="reference007.htm#sthref174" label="Generate DDL from Entities Wizard" />
-      </topic>
-      <topic label="Property pages">
-        <topic href="ref_persistence_prop_view.htm" label="JPA Details view (for entities)">
-          <topic href="reference009.htm" label="General information" />
-          <topic href="reference010.htm" label="Attribute overrides" />
-          <topic href="reference011.htm" label="Secondary table information" />
-          <topic href="reference012.htm" label="Inheritance information" />
-          <topic href="reference013.htm#sthref187" label="Queries" />
-        </topic>
-        <topic href="ref_persistence_map_view.htm" label="JPA Details view (for attributes)">
-          <topic href="ref_mapping_general.htm" label="General information" />
-          <topic href="reference014.htm" label="Join Table Information" />
-          <topic href="reference015.htm" label="Join Columns Information" />
-          <topic href="ref_primary_key.htm" label="Primary Key Generation information" />
-        </topic>
-        <topic href="ref_details_orm.htm" label="JPA Details view (for orm.xml)">
-          <topic href="reference016.htm" label="General information" />
-          <topic href="reference017.htm" label="Persistence Unit information" />
-        </topic>
-        <topic href="ref_persistence_outline.htm" label="JPA Structure view" />
-        <topic href="reference018.htm" label="persistence.xml Editor">
-          <topic href="reference019.htm" label="General" />
-          <topic href="reference020.htm" label="Connection" />
-          <topic href="reference021.htm" label="Customization" />
-          <topic href="reference022.htm" label="Caching" />
-          <topic href="reference023.htm" label="Logging" />
-          <topic href="reference024.htm" label="Options" />
-          <topic href="reference025.htm" label="Schema Generation" />
-          <topic href="reference026.htm" label="Properties" />
-          <topic href="reference027.htm" label="Source" />
-        </topic>
-      </topic>
-      <topic label="Preferences">
-        <topic href="ref_project_properties.htm" label="Project Properties page - JPA Options" />
-      </topic>
-      <topic label="Dialogs">
-        <topic href="task_generate_entities.htm" label="Generate Entities from Tables dialog" />
-        <topic href="reference030.htm" label="Edit Join Columns Dialog" />
-      </topic>
-      <topic href="ref_persistence_perspective.htm" label="JPA Development perspective" />
-      <topic label="Icons and buttons">
-        <topic href="reference032.htm" label="Icons" />
-        <topic href="reference033.htm" label="Buttons" />
-      </topic>
-      <topic href="reference034.htm" label="Dali Developer Documentation" />
-    </topic>
-    <topic href="tips_and_tricks.htm" label="Tips and tricks">
-      <topic href="whats_new001.htm" label="Create JPA Entity Wizard" />
-      <topic href="whats_new002.htm" label="Named Query Support" />
-      <topic href="whats_new003.htm" label="persistence.xml Editor" />
-      <topic href="whats_new004.htm" label="Override the Default Schema for Connection" />
-      <topic href="whats_new005.htm" label="New Mapping File Wizard" />
-      <topic href="whats_new006.htm" label="Convert to Java Project" />
-      <topic href="whats_new007.htm" label="Column Definition Support" />
-    </topic>
-    <topic href="legal.htm" label=" Legal">
-      <topic href="about.htm" label="About this content" />
-    </topic>
-</toc>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm
deleted file mode 100644
index b07f07eb11..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:53 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>What's new</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content=" What's new" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="sthref249" name="sthref249"></a> What's new</p>
-<p>This section contains descriptions of the following new features and significant changes made to the Dali OR Mapping Tool for Release 2.0:</p>
-<ul>
-<li>
-<p><a href="whats_new001.htm#BGGCJHAG">Create JPA Entity Wizard</a></p>
-</li>
-<li>
-<p><a href="whats_new002.htm#BGGIHJCJ">Named Query Support</a></p>
-</li>
-<li>
-<p><a href="whats_new003.htm#BGGGACCD">persistence.xml Editor</a></p>
-</li>
-<li>
-<p><a href="whats_new004.htm#BGGIICEF">Override the Default Schema for Connection</a></p>
-</li>
-<li>
-<p><a href="whats_new005.htm#BGGGDGIE">New Mapping File Wizard</a></p>
-</li>
-<li>
-<p><a href="whats_new006.htm#BGGCGDJG">The Convert to Java Project Option</a></p>
-</li>
-<li>
-<p><a href="whats_new007.htm#BGGFGBHJ">Defining Columns in JPA Details View for Entity Attributes</a></p>
-</li>
-<li style="list-style: none"><a href="whats_new008.htm#CEGIDCCE">Generate DDL from Entities wizard</a></li>
-</ul>
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm
deleted file mode 100644
index a54720615f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:53 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Create JPA Entity Wizard</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Create JPA Entity Wizard" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BGGCJHAG" name="BGGCJHAG"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Create JPA Entity Wizard</h1>
-<p>Use the Create JPA Entity wizard to quickly create an entity. This wizard automatically creates a Java class annotated with <code>@Entity</code> and enables users to add persistence fields to the entity.</p>
-<div class="figure"><a id="sthref250" name="sthref250"></a>
-<p class="titleinfigure">The Create New JPA Entity Wizard</p>
-<img src="img/create_jpa_entity_new.png" alt="The Entity Class page of the Create New JPA Entity wizard." title="The Entity Class page of the Create New JPA Entity wizard." /><br /></div>
-<!-- class="figure" -->
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a><br />
-<a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a><br />
-<a href="reference005.htm#CIAIJCCE">Mapping File Wizard</a>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related tasks" title="Related tasks" /><br />
-<br />
-<a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a><br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a><br />
-<a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a></div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm
deleted file mode 100644
index fc1912cf8c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:53 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Named Query Support</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Named Query Support" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BGGIHJCJ" name="BGGIHJCJ"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Named Query Support</h1>
-<p>The JPA Details view for an entity includes functions for adding named and named native queries to an entity.</p>
-<div class="figure"><a id="sthref251" name="sthref251"></a>
-<p class="titleinfigure">Entering a Named Query</p>
-<img src="img/entering_query_new.png" alt="The Queries section of the JPA Details view." title="The Queries section of the JPA Details view." /><br /></div>
-<!-- class="figure" -->
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="tasks009.htm#BABIGBGG">Creating Named Queries</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm
deleted file mode 100644
index bcd134cc07..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:54 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>persistence.xml Editor</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="persistence.xml Editor" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BGGGACCD" name="BGGGACCD"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>persistence.xml Editor</h1>
-<p>Rather than edit the XML for <code>persistence.xml</code>, this release of Dali provides an editor that automatically populates the file's <code>&lt;persistence-unit&gt;</code> element, its <code>transaction type</code> attribute as well as its <code>&lt;provider&gt;</code>, <code>&lt;class&gt;</code>, data source and <code>&lt;properties&gt;</code> sub-elements. The edtior also enables you to edit the file directly.</p>
-<div class="figure"><a id="sthref252" name="sthref252"></a>
-<p class="titleinfigure">The persistence.xml Editor</p>
-<img src="img/persistence_editor_new.png" alt="The General page of the persistence.xml Editor." title="The General page of the persistence.xml Editor." /><br /></div>
-<!-- class="figure" -->
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="reference018.htm#CIACCHID">persistence.xml Editor</a>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a><br /></div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm
deleted file mode 100644
index 7d8acf3534..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:54 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Override the Default Schema for Connection</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Override the Default Schema for Connection" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="BGGIICEF" name="BGGIICEF"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Override the Default Schema for Connection</h1>
-<p>In some cases, Dali cannot calculate the correct schema for a project. If such an instance arises, you can override the default schema derived from the connection information using the <span class="bold">Override the Default Schema for Connection</span> option in the JPA Facet page of the Create New JPA Entity wizard (illustrated in <a href="#BGGJFFCD">Figure: Changing the Schema for a Project</a>) or through the properties for the JPA project (accessed by selecting the JPA project and then <span class="bold">Properties &gt; JPA</span>). Use this option when the default login information cannot be used, such as when the deployment login differs from the design-time login.</p>
-<div class="figure"><a id="BGGJFFCD" name="BGGJFFCD"></a>
-<p class="titleinfigure">Changing the Schema for a Project</p>
-<img src="img/change_connection_profile.png" alt="The JPA Facet page of the Create New JPA Project wizard with the Override defualt schema selected." title="The JPA Facet page of the Create New JPA Project wizard with the Override defualt schema selected." /><br /></div>
-<!-- class="figure" -->
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a>
-<p>&nbsp;</p>
-</div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm
deleted file mode 100644
index ccd08ee090..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:54 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Changing the Schema for a Project</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Changing the Schema for a Project" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref253" name="sthref253"></a>
-<h1>New Mapping File Wizard</h1>
-<p>The Mapping File wizard enables you to add an object map (orm.xml) to a JPA project if no object map exists at the location specified. Completing the wizard results in a stub <code>orm.xml</code> file.</p>
-<div class="figure"><a id="BGGGDGIE" name="BGGGDGIE"></a>
-<p class="titleinfigure">New Mapping File Wizard</p>
-<img src="img/mapping_file_new.png" alt="The Mapping File page of the New Mapping File wizard." title="The Mapping File page of the New Mapping File wizard." /><br /></div>
-<!-- class="figure" -->
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="reference005.htm#CIAIJCCE">Mapping File Wizard</a>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_manage_orm.htm#CIHDGDCD">Managing the orm.xml file</a><br />
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concepts003.htm#CHDBIJAC">The orm.xml file</a><br /></div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new006.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new006.htm
deleted file mode 100644
index e06dfdf434..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new006.htm
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:54 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>New Mapping File Wizard</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="New Mapping File Wizard" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref254" name="sthref254"></a>
-<h1>Convert to Java Project</h1>
-<p>The Convert to JPA Project option (accessed by selecting a Java project and then clicking <span class="bold">New &gt; JPA Tools &gt; Convert to JPA Project</span>) enables you to convert a non-faceted Java project into a faceted Java project. Selecting this option invokes the Modify Faceted Project wizard, which prompts you to add the JPA facet.</p>
-<div class="figure"><a id="BGGCGDJG" name="BGGCGDJG"></a>
-<p class="titleinfigure">The Convert to Java Project Option</p>
-<img src="img/convert_java_project_new.png" alt="A Java project in the Navigator with the JPA Tools &gt; Convert to Java option selected." title="A Java project in the Navigator with the JPA Tools &gt; Convert to Java option selected." /><br /></div>
-<!-- class="figure" --></div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new007.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new007.htm
deleted file mode 100644
index 3ffd422541..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new007.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:54 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>The Convert to Java Project Option</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="The Convert to Java Project Option" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref255" name="sthref255"></a>
-<h1>Column Definition Support</h1>
-<p>The JPA Details view for attributes enables you to modify the nullable and unique column constraints and such column properties as length, scale, and precision.</p>
-<div class="figure"><a id="BGGFGBHJ" name="BGGFGBHJ"></a>
-<p class="titleinfigure">Defining Columns in JPA Details View for Entity Attributes</p>
-<img src="img/column_support_new.png" alt="The JPA Details View for an entity with its Details section expanded to show the column configuration parameters." title="The JPA Details View for an entity with its Details section expanded to show the column configuration parameters." /><br /></div>
-<!-- class="figure" -->
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a><br />
-<a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a>
-<p>&nbsp;</p>
-</div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new008.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new008.htm
deleted file mode 100644
index 098e2ea801..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new008.htm
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:54 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Generate DDL from Entities wizard</title>
- 
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Generate DDL from Entities wizard" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CEGIDCCE" name="CEGIDCCE"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Generate DDL from Entities wizard</h1>
-<p>Use the <span class="gui-object-title">Generate DDL</span> wizard to quickly create DDL scripts from your persistent entities. Dali automatically creates the necessary primary and foreign keys, based on the entity mappings.</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="tasks021.htm#CIHJIGBE">Generating DDL from Entities</a></div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/.classpath b/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/.classpath
deleted file mode 100644
index 9600ce84df..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/persistence.jar" sourcepath="org.eclipse.jpt.eclipselink.core.ddlgensrc.zip"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/.cvsignore b/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/.cvsignore
deleted file mode 100644
index c5e82d7458..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/.project b/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/.project
deleted file mode 100644
index 376311f646..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jpt.eclipselink.core.ddlgen</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/.settings/org.eclipse.jdt.core.prefs b/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8041bc2076..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Wed Apr 30 17:24:41 EDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/META-INF/MANIFEST.MF
deleted file mode 100644
index db2b450ba5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.jpt.eclipselink.core.ddlgen;singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-ClassPath: lib/persistence.jar
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jpt.eclipselink.core;bundle-version="[1.0.0,2.0.0)"
-Export-Package: javax.persistence,
- javax.persistence.spi,
- org.eclipse.jpt.eclipselink.core.ddlgen
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/about.html b/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/about.html
deleted file mode 100644
index 071f586b21..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/about.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H2>About This Content</H2>
-
-<P>May 02, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor's license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-<h3>Third Party Content</h3>
-<p>The Content includes items that have been sourced from third parties as set 
-  out below. If you did not receive this Content directly from the Eclipse Foundation, 
-  the following is provided for informational purposes only, and you should look 
-  to the Redistributor&#8217;s license for terms and conditions of use.</p>
-
-<h4><a name="JPA" id="JPA"></a>Java Persistence API (JPA) v1.0</h4>
-
-<blockquote>
-  <p>The Java Persistence API (JPA) which is distributed under <a href="https://glassfish.dev.java.net/public/CDDLv1.0.html">CDDL 
-    v1.0</a> is required by the Dali Java Persistence Tools Project in order 
-    to support this standard.</p>
-</blockquote>
-</BODY>
-</HTML>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/build.properties b/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/build.properties
deleted file mode 100644
index 0f7bce31e6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2008 Oracle.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle. - initial API and implementation
-###############################################################################
-javacSource=1.5
-javacTarget=1.5
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               META-INF/,\
-               lib/persistence.jar,\
-               about.html,\
-               plugin.properties
-jars.compile.order = .
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/lib/persistence.jar b/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/lib/persistence.jar
deleted file mode 100644
index 1a1b232921..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/lib/persistence.jar
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/plugin.properties b/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/plugin.properties
deleted file mode 100644
index 0e31122359..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/plugin.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2008 Oracle.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle. - initial API and implementation
-###############################################################################
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = Java Persistence API Tools - EclipseLink Support - DDL Generation
-providerName = Eclipse.org
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/src/org/eclipse/jpt/eclipselink/core/ddlgen/Main.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/src/org/eclipse/jpt/eclipselink/core/ddlgen/Main.java
deleted file mode 100644
index c1b91c325b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/src/org/eclipse/jpt/eclipselink/core/ddlgen/Main.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2007, 2008 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.ddlgen;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Map.Entry;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.SchemaGeneration;
-
-/** 
- * This class creates a EclipseLink <code>EntityManagerFactory</code>, 
- * and executes the DDL generator with the command set in the properties: 
- *     <code>eclipselink.ddl-generation.output-mode</code> 
- *     <code>eclipselink.application-location</code>
- * 
- * Current command-line arguments:
- *     [-pu puName] - persistence unit name
- *     [-p propertiesFilePath] - properties for EclipseLink EntityManager
- *  
- *  Example of a properties file:
- *  	eclipselink.jdbc.bind-parameters=false
- *  	eclipselink.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
- *  	eclipselink.jdbc.url=jdbc\:derby\:c\:/derbydb/testdb;create\=true
- *  	eclipselink.jdbc.user=tran
- *  	eclipselink.jdbc.password=
- *  	eclipselink.logging.level=FINEST
- *  	eclipselink.logging.timestamp=false
- *  	eclipselink.logging.thread=false
- *  	eclipselink.logging.session=false
- *  	eclipselink.logging.exceptions=true
- *  	eclipselink.orm.throw.exceptions=true
- *  	eclipselink.ddl-generation.output-mode=database
- *  	eclipselink.ddl-generation=drop-and-create-tables
- *  	eclipselink.application-location=c\:/_Projects_/ExampleDDL
- */
-public class Main
-{
-	protected EntityManagerFactory emf;
-	private Map<String, String> eclipseLinkProperties;
-	private String createDDLFileName;
-	private String dropDDLFileName;
-	private String appLocation;
-	private String eclipseLinkPropertiesPath;
-	private boolean isDebugMode;
-	
-	// ********** constructors **********
-	
-	public static void main(String[] args) {
-		new Main().execute(args);
-	}
-
-	private Main() {
-		super();
-	}
-
-	// ********** behavior **********
-	
-	protected void execute(String[] args) {
-		this.initializeWith(args);
-		
-		this.emf = Persistence.createEntityManagerFactory(this.getPUName(args), this.eclipseLinkProperties);
-		this.perform();
-		this.closeEntityManagerFactory();
-		
-		this.dispose();
-		return;
-	}
-	
-	protected void perform() {
-		// create an EM to generate schema.
-		this.emf.createEntityManager().close();
-	}
-	
-	protected void closeEntityManagerFactory() {
-		this.emf.close();
-	}
-	
-	private void initializeWith(String[] args) {
-
-		this.eclipseLinkPropertiesPath = this.getEclipseLinkPropertiesPath(args);
-		this.eclipseLinkProperties = this.getProperties(this.eclipseLinkPropertiesPath);
-		
-		this.createDDLFileName = this.getConfigPropertyAsString( 
-						SchemaGeneration.ECLIPSELINK_CREATE_FILE_NAME, 
-						this.eclipseLinkProperties,  
-						SchemaGeneration.DEFAULT_SCHEMA_GENERATION_CREATE_FILE_NAME);
-
-		this.dropDDLFileName = this.getConfigPropertyAsString(
-						SchemaGeneration.ECLIPSELINK_DROP_FILE_NAME, 
-						this.eclipseLinkProperties,  
-						SchemaGeneration.DEFAULT_SCHEMA_GENERATION_DROP_FILE_NAME); 
-		
-		this.appLocation = this.eclipseLinkProperties.get(
-						SchemaGeneration.ECLIPSELINK_APPLICATION_LOCATION);
-
-		this.isDebugMode = this.getDebugMode(args);
-	}
-	
-	private void dispose() {
-
-		if( ! this.isDebugMode) {
-			new File(this.appLocation + "/" + this.createDDLFileName).delete();
-			new File(this.appLocation + "/" + this.dropDDLFileName).delete();
-			new File(this.eclipseLinkPropertiesPath).delete();
-		}
-	}
-	
-	private Map<String, String> getProperties(String eclipseLinkPropertiesPath) {
-		
-		Set<Entry<Object, Object>> propertiesSet = null;
-		try {
-			propertiesSet = this.loadEclipseLinkProperties(eclipseLinkPropertiesPath);
-		}
-		catch (IOException e) {
-			throw new RuntimeException("Missing: " + eclipseLinkPropertiesPath, e);
-		}
-		
-		Map<String, String> properties = new HashMap<String, String>();
-		for(Entry<Object, Object> property : propertiesSet) {
-			properties.put((String)property.getKey(), (String)property.getValue());
-		}
-		return properties;
-	}
-
-    private Set<Entry<Object, Object>> loadEclipseLinkProperties(String eclipseLinkPropertiesPath) throws IOException {
-		
-        FileInputStream stream = new FileInputStream(eclipseLinkPropertiesPath);
-        
-        Properties properties = new Properties();
-        properties.load(stream);
-        
-        return properties.entrySet();
-	}
-
-	// ********** argument queries **********
-    
-	private String getPUName(String[] args) {
-
-		return this.getArgumentValue("-pu", args);
-	}
-	
-	private String getEclipseLinkPropertiesPath(String[] args) {
-
-		return this.getArgumentValue("-p", args);
-	}
-
-	private boolean getDebugMode(String[] args) {
-
-		return this.argumentExists("-debug", args);
-	}
-	
-	private String getArgumentValue(String argument, String[] args) {
-		for (int i = 0; i < args.length; i++) {
-			String arg = args[i];
-			if (arg.toLowerCase().equals(argument)) {
-				int j = i + 1;
-				if (j < args.length) {
-					return args[j];
-				}
-			}
-		}
-		return null;
-	}
-	
-	private boolean argumentExists(String argument, String[] args) {
-		for (int i = 0; i < args.length; i++) {
-			String arg = args[i];
-			if (arg.toLowerCase().equals(argument)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	// ****** utility methods *******
-	
-    /**
-     * Check the provided map for an object with the given key.  If that object is not available, check the
-     * System properties.  If it is not available from either location, return the default value.
-     * @param propertyKey 
-     * @param map 
-     * @param defaultValue 
-     * @return 
-     */
-    protected String getConfigPropertyAsString(String propertyKey, Map<String, String> overrides, String defaultValue){
-    	String value = this.getConfigPropertyAsString(propertyKey, overrides);
-        if (value == null){
-            value = defaultValue;
-        }
-        return value;
-    }
-    
-    protected String getConfigPropertyAsString(String propertyKey, Map<String, String> overrides){
-        String value = null;
-        if (overrides != null){
-            value = (String)overrides.get(propertyKey);
-        }
-        if (value == null){
-            value = System.getProperty(propertyKey);
-        }
-        return value;
-    }
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/.classpath b/jpa/plugins/org.eclipse.jpt.eclipselink.core/.classpath
deleted file mode 100644
index 912395245d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/.classpath
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="property_files"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/jpt/core/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/jpt/utility/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/.cvsignore b/jpa/plugins/org.eclipse.jpt.eclipselink.core/.cvsignore
deleted file mode 100644
index 76e64421ad..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-@dot
-temp.folder
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/.project b/jpa/plugins/org.eclipse.jpt.eclipselink.core/.project
deleted file mode 100644
index 7fa880fb4e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jpt.eclipselink.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/.settings/org.eclipse.core.resources.prefs b/jpa/plugins/org.eclipse.jpt.eclipselink.core/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 916989d454..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Feb 05 14:28:53 EST 2009
-eclipse.preferences.version=1
-encoding//schemas/eclipselink_orm_1_0.xsd=UTF8
-encoding/<project>=ISO-8859-1
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/.settings/org.eclipse.jdt.core.prefs b/jpa/plugins/org.eclipse.jpt.eclipselink.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index dcfa502030..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Sun Feb 24 21:25:34 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.eclipselink.core/META-INF/MANIFEST.MF
deleted file mode 100644
index a2b735093b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,56 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.jpt.eclipselink.core;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.commands;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="2.0.100",
- org.eclipse.jpt.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jpt.db;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jpt.utility;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="1.4.0",
- org.eclipse.wst.common.emf;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="1.3.3",
- org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)"
-Export-Package: org.eclipse.jpt.eclipselink.core,
- org.eclipse.jpt.eclipselink.core.context,
- org.eclipse.jpt.eclipselink.core.context.java,
- org.eclipse.jpt.eclipselink.core.context.orm,
- org.eclipse.jpt.eclipselink.core.internal;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.internal.context;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.internal.context.java;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.internal.context.orm;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.internal.context.persistence;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.internal.context.persistence.general;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.internal.context.persistence.options;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.internal.ddlgen;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.internal.operations;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.internal.resource.java;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.internal.resource.orm;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.resource.java,
- org.eclipse.jpt.eclipselink.core.resource.orm,
- org.eclipse.jpt.eclipselink1_1.core.internal.resource.orm.translators,
- org.eclipse.jpt.eclipselink1_1.core.resource.orm,
- org.eclipse.jpt.eclipselink1_1.core.resource.orm.util
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/about.html b/jpa/plugins/org.eclipse.jpt.eclipselink.core/about.html
deleted file mode 100644
index be534ba44f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 02, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor's license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/build.properties b/jpa/plugins/org.eclipse.jpt.eclipselink.core/build.properties
deleted file mode 100644
index 0f41eaec1c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/build.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2008 Oracle.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle. - initial API and implementation
-###############################################################################
-javacSource=1.5
-javacTarget=1.5
-source.. = src/,\
-               property_files/
-output.. = bin/
-bin.includes = .,\
-               META-INF/,\
-               about.html,\
-               plugin.xml,\
-               plugin.properties,\
-               schemas/
-jars.compile.order = .
-src.includes = model/
-src.includes = model/,\
-               schemas/
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink1_1_orm.ecore b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink1_1_orm.ecore
deleted file mode 100644
index a5fa2fccdc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink1_1_orm.ecore
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="orm"
-    nsURI="jpt.eclipselink1_1.orm.xmi" nsPrefix="org.eclipse.jpt.eclipselink1_1.core.resource.orm">
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings" eSuperTypes="eclipselink_orm.ecore#//XmlEntityMappings"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlAttributeMapping" abstract="true"
-      interface="true" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlAttributeMapping">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="access" eType="ecore:EEnum ../../org.eclipse.jpt.core/model/orm.ecore#//AccessType"
-        defaultValueLiteral="PROPERTY"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlId" abstract="true" interface="true"
-      eSuperTypes="eclipselink_orm.ecore#//XmlId #//XmlAttributeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlIdImpl" eSuperTypes="eclipselink_orm.ecore#//XmlIdImpl #//XmlId"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddedId" abstract="true" interface="true"
-      eSuperTypes="eclipselink_orm.ecore#//XmlEmbeddedId #//XmlAttributeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddedIdImpl" eSuperTypes="eclipselink_orm.ecore#//XmlEmbeddedIdImpl #//XmlEmbeddedId"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbedded" abstract="true" interface="true"
-      eSuperTypes="eclipselink_orm.ecore#//XmlEmbedded #//XmlAttributeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddedImpl" eSuperTypes="eclipselink_orm.ecore#//XmlEmbeddedImpl #//XmlEmbedded"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBasic" abstract="true" interface="true"
-      eSuperTypes="eclipselink_orm.ecore#//XmlBasic #//XmlAttributeMapping">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="generatedValue" eType="ecore:EClass ../../org.eclipse.jpt.core/model/orm.ecore#//XmlGeneratedValue"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tableGenerator" eType="ecore:EClass ../../org.eclipse.jpt.core/model/orm.ecore#//XmlTableGenerator"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sequenceGenerator" eType="ecore:EClass ../../org.eclipse.jpt.core/model/orm.ecore#//XmlSequenceGenerator"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBasicImpl" eSuperTypes="eclipselink_orm.ecore#//XmlBasicImpl #//XmlBasic"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlVersion" abstract="true" interface="true"
-      eSuperTypes="eclipselink_orm.ecore#//XmlVersion #//XmlAttributeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlVersionImpl" eSuperTypes="eclipselink_orm.ecore#//XmlVersionImpl #//XmlVersion"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne" abstract="true" interface="true"
-      eSuperTypes="eclipselink_orm.ecore#//XmlOneToOne #//XmlAttributeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOneImpl" eSuperTypes="eclipselink_orm.ecore#//XmlOneToOneImpl #//XmlOneToOne"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany" abstract="true" interface="true"
-      eSuperTypes="eclipselink_orm.ecore#//XmlOneToMany #//XmlAttributeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlOneToManyImpl" eSuperTypes="eclipselink_orm.ecore#//XmlOneToManyImpl #//XmlOneToMany"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne" abstract="true" interface="true"
-      eSuperTypes="eclipselink_orm.ecore#//XmlManyToOne #//XmlAttributeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlManyToOneImpl" eSuperTypes="eclipselink_orm.ecore#//XmlManyToOneImpl #//XmlManyToOne"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany" abstract="true" interface="true"
-      eSuperTypes="eclipselink_orm.ecore#//XmlManyToMany #//XmlAttributeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlManyToManyImpl" eSuperTypes="eclipselink_orm.ecore#//XmlManyToManyImpl #//XmlManyToMany"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBasicCollection" abstract="true"
-      interface="true" eSuperTypes="eclipselink_orm.ecore#//XmlBasicCollection #//XmlAttributeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBasicCollectionImpl" eSuperTypes="eclipselink_orm.ecore#//XmlBasicCollectionImpl #//XmlBasicCollection"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBasicMap" abstract="true" interface="true"
-      eSuperTypes="eclipselink_orm.ecore#//XmlBasicMap #//XmlAttributeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBasicMapImpl" eSuperTypes="eclipselink_orm.ecore#//XmlBasicMapImpl #//XmlBasicMap"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTransformation" abstract="true" interface="true"
-      eSuperTypes="eclipselink_orm.ecore#//XmlTransformation #//XmlAttributeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTransformationImpl" eSuperTypes="eclipselink_orm.ecore#//XmlTransformationImpl #//XmlTransformation"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlVariableOneToOne" abstract="true"
-      interface="true" eSuperTypes="eclipselink_orm.ecore#//XmlVariableOneToOne #//XmlAttributeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlVariableOneToOneImpl" eSuperTypes="eclipselink_orm.ecore#//XmlVariableOneToOneImpl #//XmlVariableOneToOne"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTransient" abstract="true" interface="true"
-      eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlTransient #//XmlAttributeMapping"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTransientImpl" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlTransientImpl #//XmlTransient"/>
-</ecore:EPackage>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore
deleted file mode 100644
index d773ac1445..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore
+++ /dev/null
@@ -1,351 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="orm"
-    nsURI="jpt.eclipselink.orm.xmi" nsPrefix="org.eclipse.jpt.eclipselink.core.resource.orm">
-  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedConverter" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlConverter" abstract="true" interface="true"
-      eSuperTypes="#//XmlNamedConverter">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlConverterImpl" eSuperTypes="#//XmlConverter"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTypeConverter" abstract="true" interface="true"
-      eSuperTypes="#//XmlNamedConverter">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="objectType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTypeConverterImpl" eSuperTypes="#//XmlTypeConverter"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlConversionValue" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="objectValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlConversionValueImpl" eSuperTypes="#//XmlConversionValue"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlObjectTypeConverter" abstract="true"
-      interface="true" eSuperTypes="#//XmlNamedConverter">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="objectType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="conversionValues" upperBound="-1"
-        eType="#//XmlConversionValue" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultObjectValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlObjectTypeConverterImpl" eSuperTypes="#//XmlObjectTypeConverter"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlStructConverter" abstract="true"
-      interface="true" eSuperTypes="#//XmlNamedConverter">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="converter" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlStructConverterImpl" eSuperTypes="#//XmlStructConverter"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlConvertersHolder" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="converters" upperBound="-1"
-        eType="#//XmlConverter" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="typeConverters" upperBound="-1"
-        eType="#//XmlTypeConverter" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="objectTypeConverters" upperBound="-1"
-        eType="#//XmlObjectTypeConverter" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="structConverters" upperBound="-1"
-        eType="#//XmlStructConverter" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="XmlDirection">
-    <eLiterals name="IN"/>
-    <eLiterals name="OUT" value="1" literal="OUT"/>
-    <eLiterals name="IN_OUT" value="2" literal="IN_OUT"/>
-    <eLiterals name="OUT_CURSOR" value="3" literal="OUT_CURSOR"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlStoredProcedureParameter">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="direction" eType="#//XmlDirection"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="queryParameter" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="jdbcType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="jdbcTypeName" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlNamedStoredProcedureQuery">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resultClass" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resultSetMapping" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="procedureName" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="returnsResultSet" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="hints" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.jpt.core/model/orm.ecore#//XmlQueryHint"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
-        eType="#//XmlStoredProcedureParameter" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEntityMappings #//XmlConvertersHolder">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="namedStoredProcedureQueries"
-        upperBound="-1" eType="#//XmlNamedStoredProcedureQuery" containment="true"
-        resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitMetadata" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlPersistenceUnitMetadata">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultMappings"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlCustomizer">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="customizerClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlCustomizerHolder" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="customizer" eType="#//XmlCustomizer"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="XmlChangeTrackingType">
-    <eLiterals name="ATTRIBUTE" literal="ATTRIBUTE"/>
-    <eLiterals name="OBJECT" value="1"/>
-    <eLiterals name="DEFERRED" value="2"/>
-    <eLiterals name="AUTO" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlChangeTracking">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//XmlChangeTrackingType"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlChangeTrackingHolder" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="changeTracking" eType="#//XmlChangeTracking"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlCopyPolicy">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="class" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlInstantiationPolicy"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlCloneCopyPolicy">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="method" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="workingCopyMethod" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddable" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEmbeddable #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlConvertersHolder">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="copyPolicy" eType="#//XmlCopyPolicy"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="instantiationCopyPolicy"
-        eType="#//XmlCopyPolicy" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cloneCopyPolicy" eType="#//XmlCopyPolicy"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//XmlProperty" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultMappings"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlReadOnly" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="readOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="CacheType">
-    <eLiterals name="FULL"/>
-    <eLiterals name="WEAK" value="1"/>
-    <eLiterals name="SOFT" value="2"/>
-    <eLiterals name="SOFT_WEAK" value="3"/>
-    <eLiterals name="HARD_WEAK" value="4"/>
-    <eLiterals name="CACHE" value="5"/>
-    <eLiterals name="NONE" value="6"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="CacheCoordinationType">
-    <eLiterals name="SEND_OBJECT_CHANGES"/>
-    <eLiterals name="INVALIDATE_CHANGED_OBJECTS" value="1"/>
-    <eLiterals name="SEND_NEW_OBJECTS_WITH_CHANGES" value="2"/>
-    <eLiterals name="NONE" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTimeOfDay">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hour" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minute" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="second" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="millisecond" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlCache">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="expiry" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="size" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="shared" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//CacheType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alwaysRefresh" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="refreshOnlyIfNewer" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="disableHits" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="coordinationType" eType="#//CacheCoordinationType"
-        defaultValueLiteral=""/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="expiryTimeOfDay" eType="#//XmlTimeOfDay"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="ExistenceType">
-    <eLiterals name="CHECK_CACHE"/>
-    <eLiterals name="CHECK_DATABASE" value="1"/>
-    <eLiterals name="ASSUME_EXISTENCE" value="2"/>
-    <eLiterals name="ASSUME_NON_EXISTENCE" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlCacheHolder" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cache" eType="#//XmlCache"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="existenceChecking" eType="#//ExistenceType"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="XmlOptimisticLockingType">
-    <eLiterals name="ALL_COLUMNS"/>
-    <eLiterals name="CHANGED_COLUMNS" value="1" literal="CHANGED_COLUMNS"/>
-    <eLiterals name="SELECTED_COLUMNS" value="2" literal="SELECTED_COLUMNS"/>
-    <eLiterals name="VERSION_COLUMN" value="3" literal="VERSION_COLUMN"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlOptimisticLocking">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//XmlOptimisticLockingType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascade" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="selectedColumns" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.jpt.core/model/orm.ecore#//XmlColumn"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEntity" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEntity #//XmlReadOnly #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlCacheHolder #//XmlConvertersHolder">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="optimisticLocking" eType="#//XmlOptimisticLocking"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="copyPolicy" eType="#//XmlCopyPolicy"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="instantiationCopyPolicy"
-        eType="#//XmlCopyPolicy" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cloneCopyPolicy" eType="#//XmlCopyPolicy"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="namedStoredProcedureQueries"
-        upperBound="-1" eType="#//XmlNamedStoredProcedureQuery" containment="true"
-        resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//XmlProperty" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultMappings"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlMappedSuperclass #//XmlReadOnly #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlCacheHolder #//XmlConvertersHolder">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="optimisticLocking" eType="#//XmlOptimisticLocking"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="copyPolicy" eType="#//XmlCopyPolicy"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="instantiationCopyPolicy"
-        eType="#//XmlCopyPolicy" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cloneCopyPolicy" eType="#//XmlCopyPolicy"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//XmlProperty" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultMappings"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlMutable" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mutable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlConverterHolder" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="converter" eType="#//XmlConverter"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="typeConverter" eType="#//XmlTypeConverter"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="objectTypeConverter" eType="#//XmlObjectTypeConverter"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="structConverter" eType="#//XmlStructConverter"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlConvertibleMapping" abstract="true"
-      interface="true" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlConvertibleMapping #//XmlConverterHolder">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="convert" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlAccessMethods">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="getMethod" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="setMethod" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlAccessMethodsHolder" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="accessMethods" eType="#//XmlAccessMethods"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlProperty">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlId" abstract="true" interface="true"
-      eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlId #//XmlMutable #//XmlConvertibleMapping #//XmlAccessMethodsHolder">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//XmlProperty" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlIdImpl" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlIdImpl #//XmlId"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddedId" abstract="true" interface="true"
-      eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEmbeddedId #//XmlAccessMethodsHolder">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//XmlProperty" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddedIdImpl" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEmbeddedIdImpl #//XmlEmbeddedId"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbedded" abstract="true" interface="true"
-      eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEmbedded #//XmlAccessMethodsHolder">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//XmlProperty" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddedImpl" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEmbeddedImpl #//XmlEmbedded"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBasic" abstract="true" interface="true"
-      eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlBasic #//XmlMutable #//XmlConvertibleMapping #//XmlAccessMethodsHolder">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//XmlProperty" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBasicImpl" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlBasicImpl #//XmlBasic"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlVersion" abstract="true" interface="true"
-      eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlVersion #//XmlMutable #//XmlConvertibleMapping #//XmlAccessMethodsHolder">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//XmlProperty" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlVersionImpl" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlVersionImpl #//XmlVersion"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlPrivateOwned" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="privateOwned" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="XmlJoinFetchType">
-    <eLiterals name="INNER"/>
-    <eLiterals name="OUTER" value="1" literal="OUTER"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlJoinFetch" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="joinFetch" eType="#//XmlJoinFetchType"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne" abstract="true" interface="true"
-      eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlOneToOne #//XmlPrivateOwned #//XmlJoinFetch #//XmlAccessMethodsHolder">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//XmlProperty" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOneImpl" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlOneToOneImpl #//XmlOneToOne"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany" abstract="true" interface="true"
-      eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlOneToMany #//XmlPrivateOwned #//XmlJoinFetch #//XmlAccessMethodsHolder">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//XmlProperty" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlOneToManyImpl" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlOneToManyImpl #//XmlOneToMany"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne" abstract="true" interface="true"
-      eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlManyToOne #//XmlJoinFetch #//XmlAccessMethodsHolder">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//XmlProperty" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlManyToOneImpl" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlManyToOneImpl #//XmlManyToOne"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany" abstract="true" interface="true"
-      eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlManyToMany #//XmlJoinFetch #//XmlAccessMethodsHolder">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//XmlProperty" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlManyToManyImpl" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlManyToManyImpl #//XmlManyToMany"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBasicCollection" abstract="true"
-      interface="true" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlAttributeMapping #//XmlAccessMethodsHolder">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//XmlProperty" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBasicCollectionImpl" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlBasicCollection"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBasicMap" abstract="true" interface="true"
-      eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlAttributeMapping #//XmlAccessMethodsHolder">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//XmlProperty" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlBasicMapImpl" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlBasicMap"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTransformation" abstract="true" interface="true"
-      eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlAttributeMapping #//XmlAccessMethodsHolder">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//XmlProperty" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlTransformationImpl" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlTransformation"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlVariableOneToOne" abstract="true"
-      interface="true" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlAttributeMapping #//XmlAccessMethodsHolder">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//XmlProperty" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XmlVariableOneToOneImpl" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlVariableOneToOne"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Attributes" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//Attributes">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="basicCollections" upperBound="-1"
-        eType="#//XmlBasicCollection" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="basicMaps" upperBound="-1"
-        eType="#//XmlBasicMap" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="transformations" upperBound="-1"
-        eType="#//XmlTransformation" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variableOneToOnes" upperBound="-1"
-        eType="#//XmlVariableOneToOne" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/jptEclipseLink1_1ResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/jptEclipseLink1_1ResourceModels.genmodel
deleted file mode 100644
index ed80101ba8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/jptEclipseLink1_1ResourceModels.genmodel
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jpt.eclipselink.core/src"
-    creationCommands="false" creationIcons="false" editDirectory="" editorDirectory=""
-    modelPluginID="org.eclipse.jpt.eclipselink.core" modelName="EclipseLinkCore" editPluginClass=""
-    editorPluginClass="" updateClasspath="false" rootExtendsInterface="org.eclipse.jpt.core.resource.xml.JpaEObject"
-    rootExtendsClass="org.eclipse.jpt.core.resource.xml.AbstractJpaEObject" suppressInterfaces="true"
-    testsDirectory="" testSuiteClass="" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.jpt.core/model/jptResourceModels.genmodel#//orm">
-  <foreignModel>eclipselink1_1_orm.ecore</foreignModel>
-  <genPackages prefix="EclipseLink1_1Orm" basePackage="org.eclipse.jpt.eclipselink1_1.core.resource"
-      disposableProviderFactory="true" ecorePackage="eclipselink1_1_orm.ecore#/">
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlEntityMappings"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlAttributeMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink1_1_orm.ecore#//XmlAttributeMapping/access"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlId"/>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlIdImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlEmbeddedId"/>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlEmbeddedIdImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlEmbedded"/>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlEmbeddedImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlBasic">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink1_1_orm.ecore#//XmlBasic/generatedValue"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink1_1_orm.ecore#//XmlBasic/tableGenerator"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink1_1_orm.ecore#//XmlBasic/sequenceGenerator"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlBasicImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlVersion"/>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlVersionImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlOneToOne"/>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlOneToOneImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlOneToMany"/>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlOneToManyImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlManyToOne"/>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlManyToOneImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlManyToMany"/>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlManyToManyImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlBasicCollection"/>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlBasicCollectionImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlBasicMap"/>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlBasicMapImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlTransformation"/>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlTransformationImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlVariableOneToOne"/>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlVariableOneToOneImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlTransient"/>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlTransientImpl"/>
-  </genPackages>
-  <genPackages prefix="EclipseLinkOrm" basePackage="org.eclipse.jpt.eclipselink.core.resource"
-      disposableProviderFactory="true" adapterFactory="false" ecorePackage="eclipselink_orm.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//XmlDirection">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlDirection/IN"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlDirection/OUT"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlDirection/IN_OUT"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlDirection/OUT_CURSOR"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//XmlChangeTrackingType">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlChangeTrackingType/ATTRIBUTE"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlChangeTrackingType/OBJECT"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlChangeTrackingType/DEFERRED"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlChangeTrackingType/AUTO"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//CacheType">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/FULL"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/WEAK"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/SOFT"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/SOFT_WEAK"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/HARD_WEAK"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/CACHE"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/NONE"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//CacheCoordinationType">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheCoordinationType/SEND_OBJECT_CHANGES"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheCoordinationType/INVALIDATE_CHANGED_OBJECTS"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheCoordinationType/SEND_NEW_OBJECTS_WITH_CHANGES"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheCoordinationType/NONE"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//ExistenceType">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//ExistenceType/CHECK_CACHE"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//ExistenceType/CHECK_DATABASE"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//ExistenceType/ASSUME_EXISTENCE"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//ExistenceType/ASSUME_NON_EXISTENCE"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//XmlOptimisticLockingType">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlOptimisticLockingType/ALL_COLUMNS"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlOptimisticLockingType/CHANGED_COLUMNS"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlOptimisticLockingType/SELECTED_COLUMNS"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlOptimisticLockingType/VERSION_COLUMN"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//XmlJoinFetchType">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlJoinFetchType/INNER"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlJoinFetchType/OUTER"/>
-    </genEnums>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlNamedConverter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedConverter/name"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlConverter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlConverter/className"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlConverterImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTypeConverter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTypeConverter/dataType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTypeConverter/objectType"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTypeConverterImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlConversionValue">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlConversionValue/dataValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlConversionValue/objectValue"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlConversionValueImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlObjectTypeConverter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlObjectTypeConverter/dataType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlObjectTypeConverter/objectType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlObjectTypeConverter/conversionValues"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlObjectTypeConverter/defaultObjectValue"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlObjectTypeConverterImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlStructConverter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStructConverter/converter"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlStructConverterImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlConvertersHolder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConvertersHolder/converters"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConvertersHolder/typeConverters"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConvertersHolder/objectTypeConverters"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConvertersHolder/structConverters"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlStoredProcedureParameter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/direction"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/queryParameter"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/jdbcType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/jdbcTypeName"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/resultClass"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/resultSetMapping"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/procedureName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/returnsResultSet"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/hints"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/parameters"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlEntityMappings">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntityMappings/namedStoredProcedureQueries"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlPersistenceUnitMetadata">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlPersistenceUnitMetadata/excludeDefaultMappings"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlCustomizer">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCustomizer/customizerClassName"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlCustomizerHolder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlCustomizerHolder/customizer"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlChangeTracking">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlChangeTracking/type"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlChangeTrackingHolder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlChangeTrackingHolder/changeTracking"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlCopyPolicy">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCopyPolicy/class"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlInstantiationPolicy"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlCloneCopyPolicy">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCloneCopyPolicy/method"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCloneCopyPolicy/workingCopyMethod"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlEmbeddable">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEmbeddable/copyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEmbeddable/instantiationCopyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEmbeddable/cloneCopyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEmbeddable/properties"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlEmbeddable/excludeDefaultMappings"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlReadOnly">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlReadOnly/readOnly"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTimeOfDay">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/hour"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/minute"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/second"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/millisecond"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlCache">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/expiry"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/size"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/shared"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/alwaysRefresh"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/refreshOnlyIfNewer"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/disableHits"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/coordinationType"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlCache/expiryTimeOfDay"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlCacheHolder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlCacheHolder/cache"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCacheHolder/existenceChecking"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOptimisticLocking">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlOptimisticLocking/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlOptimisticLocking/cascade"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlOptimisticLocking/selectedColumns"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlEntity">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/optimisticLocking"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/copyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/instantiationCopyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/cloneCopyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/namedStoredProcedureQueries"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/properties"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlEntity/excludeDefaultMappings"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlMappedSuperclass">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMappedSuperclass/optimisticLocking"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMappedSuperclass/copyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMappedSuperclass/instantiationCopyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMappedSuperclass/cloneCopyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMappedSuperclass/properties"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlMappedSuperclass/excludeDefaultMappings"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlMutable">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlMutable/mutable"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlConverterHolder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConverterHolder/converter"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConverterHolder/typeConverter"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConverterHolder/objectTypeConverter"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConverterHolder/structConverter"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlConvertibleMapping">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlConvertibleMapping/convert"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlAccessMethods">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlAccessMethods/getMethod"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlAccessMethods/setMethod"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlAccessMethodsHolder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlAccessMethodsHolder/accessMethods"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlProperty">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlProperty/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlProperty/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlProperty/valueType"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlId">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlId/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlIdImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlEmbeddedId">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEmbeddedId/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlEmbeddedIdImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlEmbedded">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEmbedded/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlEmbeddedImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlBasic">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlBasic/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlBasicImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlVersion">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlVersion/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlVersionImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlPrivateOwned">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlPrivateOwned/privateOwned"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlJoinFetch">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlJoinFetch/joinFetch"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOneToOne">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlOneToOne/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOneToOneImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOneToMany">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlOneToMany/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOneToManyImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlManyToOne">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlManyToOne/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlManyToOneImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlManyToMany">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlManyToMany/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlManyToManyImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlBasicCollection">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlBasicCollection/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlBasicCollectionImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlBasicMap">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlBasicMap/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlBasicMapImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlTransformation">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlTransformation/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTransformationImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlVariableOneToOne">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlVariableOneToOne/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlVariableOneToOneImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//Attributes">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//Attributes/basicCollections"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//Attributes/basicMaps"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//Attributes/transformations"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//Attributes/variableOneToOnes"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/jptEclipseLinkResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/jptEclipseLinkResourceModels.genmodel
deleted file mode 100644
index 9820b9de4e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/jptEclipseLinkResourceModels.genmodel
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jpt.eclipselink.core/src"
-    creationCommands="false" creationIcons="false" editDirectory="" editorDirectory=""
-    modelPluginID="org.eclipse.jpt.eclipselink.core" modelName="EclipseLinkCore" editPluginClass=""
-    editorPluginClass="" updateClasspath="false" rootExtendsInterface="org.eclipse.jpt.core.resource.xml.JpaEObject"
-    rootExtendsClass="org.eclipse.jpt.core.resource.xml.AbstractJpaEObject" suppressInterfaces="true"
-    testsDirectory="" testSuiteClass="" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.jpt.core/model/jptResourceModels.genmodel#//orm">
-  <foreignModel>eclipselink_orm.ecore</foreignModel>
-  <genPackages prefix="EclipseLinkOrm" basePackage="org.eclipse.jpt.eclipselink.core.resource"
-      disposableProviderFactory="true" adapterFactory="false" ecorePackage="eclipselink_orm.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//XmlDirection">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlDirection/IN"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlDirection/OUT"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlDirection/IN_OUT"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlDirection/OUT_CURSOR"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//XmlChangeTrackingType">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlChangeTrackingType/ATTRIBUTE"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlChangeTrackingType/OBJECT"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlChangeTrackingType/DEFERRED"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlChangeTrackingType/AUTO"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//CacheType">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/FULL"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/WEAK"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/SOFT"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/SOFT_WEAK"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/HARD_WEAK"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/CACHE"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheType/NONE"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//CacheCoordinationType">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheCoordinationType/SEND_OBJECT_CHANGES"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheCoordinationType/INVALIDATE_CHANGED_OBJECTS"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheCoordinationType/SEND_NEW_OBJECTS_WITH_CHANGES"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//CacheCoordinationType/NONE"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//ExistenceType">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//ExistenceType/CHECK_CACHE"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//ExistenceType/CHECK_DATABASE"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//ExistenceType/ASSUME_EXISTENCE"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//ExistenceType/ASSUME_NON_EXISTENCE"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//XmlOptimisticLockingType">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlOptimisticLockingType/ALL_COLUMNS"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlOptimisticLockingType/CHANGED_COLUMNS"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlOptimisticLockingType/SELECTED_COLUMNS"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlOptimisticLockingType/VERSION_COLUMN"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//XmlJoinFetchType">
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlJoinFetchType/INNER"/>
-      <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//XmlJoinFetchType/OUTER"/>
-    </genEnums>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlNamedConverter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedConverter/name"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlConverter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlConverter/className"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlConverterImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTypeConverter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTypeConverter/dataType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTypeConverter/objectType"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTypeConverterImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlConversionValue">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlConversionValue/dataValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlConversionValue/objectValue"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlConversionValueImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlObjectTypeConverter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlObjectTypeConverter/dataType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlObjectTypeConverter/objectType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlObjectTypeConverter/conversionValues"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlObjectTypeConverter/defaultObjectValue"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlObjectTypeConverterImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlStructConverter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStructConverter/converter"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlStructConverterImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlConvertersHolder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConvertersHolder/converters"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConvertersHolder/typeConverters"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConvertersHolder/objectTypeConverters"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConvertersHolder/structConverters"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlStoredProcedureParameter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/direction"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/queryParameter"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/jdbcType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlStoredProcedureParameter/jdbcTypeName"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/resultClass"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/resultSetMapping"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/procedureName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/returnsResultSet"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/hints"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlNamedStoredProcedureQuery/parameters"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlEntityMappings">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntityMappings/namedStoredProcedureQueries"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlPersistenceUnitMetadata">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlPersistenceUnitMetadata/excludeDefaultMappings"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlCustomizer">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCustomizer/customizerClassName"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlCustomizerHolder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlCustomizerHolder/customizer"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlChangeTracking">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlChangeTracking/type"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlChangeTrackingHolder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlChangeTrackingHolder/changeTracking"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlCopyPolicy">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCopyPolicy/class"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlInstantiationPolicy"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlCloneCopyPolicy">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCloneCopyPolicy/method"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCloneCopyPolicy/workingCopyMethod"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlEmbeddable">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEmbeddable/copyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEmbeddable/instantiationCopyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEmbeddable/cloneCopyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEmbeddable/properties"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlEmbeddable/excludeDefaultMappings"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlReadOnly">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlReadOnly/readOnly"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTimeOfDay">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/hour"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/minute"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/second"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/millisecond"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlCache">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/expiry"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/size"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/shared"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/alwaysRefresh"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/refreshOnlyIfNewer"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/disableHits"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/coordinationType"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlCache/expiryTimeOfDay"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlCacheHolder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlCacheHolder/cache"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCacheHolder/existenceChecking"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOptimisticLocking">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlOptimisticLocking/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlOptimisticLocking/cascade"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlOptimisticLocking/selectedColumns"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlEntity">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/optimisticLocking"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/copyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/instantiationCopyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/cloneCopyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/namedStoredProcedureQueries"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEntity/properties"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlEntity/excludeDefaultMappings"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlMappedSuperclass">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMappedSuperclass/optimisticLocking"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMappedSuperclass/copyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMappedSuperclass/instantiationCopyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMappedSuperclass/cloneCopyPolicy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlMappedSuperclass/properties"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlMappedSuperclass/excludeDefaultMappings"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlMutable">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlMutable/mutable"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlConverterHolder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConverterHolder/converter"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConverterHolder/typeConverter"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConverterHolder/objectTypeConverter"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlConverterHolder/structConverter"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlConvertibleMapping">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlConvertibleMapping/convert"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlAccessMethods">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlAccessMethods/getMethod"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlAccessMethods/setMethod"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlAccessMethodsHolder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlAccessMethodsHolder/accessMethods"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlProperty">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlProperty/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlProperty/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlProperty/valueType"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlId">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlId/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlIdImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlEmbeddedId">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEmbeddedId/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlEmbeddedIdImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlEmbedded">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlEmbedded/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlEmbeddedImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlBasic">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlBasic/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlBasicImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlVersion">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlVersion/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlVersionImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlPrivateOwned">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlPrivateOwned/privateOwned"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlJoinFetch">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlJoinFetch/joinFetch"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOneToOne">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlOneToOne/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOneToOneImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOneToMany">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlOneToMany/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOneToManyImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlManyToOne">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlManyToOne/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlManyToOneImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlManyToMany">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlManyToMany/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlManyToManyImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlBasicCollection">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlBasicCollection/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlBasicCollectionImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlBasicMap">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlBasicMap/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlBasicMapImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlTransformation">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlTransformation/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTransformationImpl"/>
-    <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlVariableOneToOne">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlVariableOneToOne/properties"/>
-    </genClasses>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//XmlVariableOneToOneImpl"/>
-    <genClasses ecoreClass="eclipselink_orm.ecore#//Attributes">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//Attributes/basicCollections"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//Attributes/basicMaps"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//Attributes/transformations"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//Attributes/variableOneToOnes"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.properties b/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.properties
deleted file mode 100644
index 21a71c95eb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2008 Oracle.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle. - initial API and implementation
-###############################################################################
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = Java Persistence API Tools - EclipseLink Support - Core
-providerName = Eclipse.org
-
-ECLIPSELINK_ORM_XML_CONTENT = EclipseLink ORM XML Content
-ECLIPSELINK_PLATFORM = EclipseLink
-
-ECLIPSELINK1_1_ORM_XML_CONTENT = EclipseLink 1.1 ORM XML Content
-ECLIPSELINK1_1_PLATFORM = EclipseLink 1.1
-
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml b/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml
deleted file mode 100644
index b7eb8849a2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-	
-	<extension
-		point="org.eclipse.core.runtime.contentTypes">
-		
-		<content-type
-			id="org.eclipse.jpt.eclipselink.core.content.orm"
-			name="%ECLIPSELINK_ORM_XML_CONTENT"
-			base-type="org.eclipse.jpt.core.content.mappingFile">
-			<describer
-				class="org.eclipse.jpt.eclipselink.core.internal.resource.orm.XMLRootElementContentDescriber2">
-				<parameter 
-					name="element" 
-					value="{http://www.eclipse.org/eclipselink/xsds/persistence/orm}entity-mappings:1.0"/>
-			</describer>
-		</content-type>
-  <content-type
-        base-type="org.eclipse.jpt.eclipselink.core.content.orm"
-        id="org.eclipse.jpt.eclipselink1_1.core.content.orm"
-        name="%ECLIPSELINK1_1_ORM_XML_CONTENT">
-     <describer
-           class="org.eclipse.jpt.eclipselink.core.internal.resource.orm.XMLRootElementContentDescriber2">
-        <parameter
-              name="element"
-              value="{http://www.eclipse.org/eclipselink/xsds/persistence/orm}entity-mappings:1.1">
-        </parameter>
-     </describer>
-  </content-type>
-		
-	</extension>
-	
-	
-	<extension
-		point="org.eclipse.jpt.core.jpaPlatforms">
-		
-		<jpaPlatform
-			id="org.eclipse.eclipselink.platform"
-            factoryClass="org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaPlatformFactory"
-			label="%ECLIPSELINK_PLATFORM">
-		</jpaPlatform>
-	    
-	    <jpaPlatform
-	        id="eclipselink1_1"
-	        factoryClass="org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaPlatformFactory"
-	        label="%ECLIPSELINK1_1_PLATFORM">
-	    </jpaPlatform>
-		
-	</extension>
-
-
-	
-	<!--
-	******************************************
-	* Library Provider Framework Integration *
-	******************************************
-	-->
-	
-	<extension 
-		point="org.eclipse.jst.common.project.facet.core.libraryProviders">
-		
-		<provider id="jpa-eclipselink-user-library-provider" extends="wtp-user-library-provider">
-			<param name="validator" value="org.eclipse.jst.common.project.facet.core.libprov.user.KeyClassesValidator"/>
-			<param name="validator.param.0" value="javax.persistence.Entity"/>
-			<param name="validator.param.1" value="org.eclipse.persistence.annotations.Cache"/>
-			<enablement>
-				<and>
-					<with variable="requestingProjectFacet">
-						<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jpt.jpa" forcePluginActivation="true"/>
-					</with>
-					<with variable="jpaPlatform">
-						<equals value="org.eclipse.eclipselink.platform"/>
-					</with>
-				</and>
-			</enablement>
-		</provider>
-		
-		<!-- eclipselink 1.1 library provider is for now a simple copy of eclipselink library provider -->
-		<provider id="jpa-eclipselink1_1-user-library-provider" extends="wtp-user-library-provider">
-			<param name="validator" value="org.eclipse.jst.common.project.facet.core.libprov.user.KeyClassesValidator"/>
-			<param name="validator.param.0" value="javax.persistence.Entity"/>
-			<param name="validator.param.1" value="org.eclipse.persistence.annotations.Cache"/>
-			<enablement>
-				<and>
-					<with variable="requestingProjectFacet">
-						<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jpt.jpa" forcePluginActivation="true"/>
-					</with>
-					<with variable="jpaPlatform">
-						<equals value="eclipselink1_1"/>
-					</with>
-				</and>
-			</enablement>
-		</provider>
-		
-		
-	
-	</extension>
-	
-	
-	<!-- ***** WTP extensions ***** -->
-
-	<extension
-		point="org.eclipse.wst.common.modulecore.resourceFactories">
-		
-		<resourceFactory
-			class="org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResourceFactory"
-			isDefault="true">
-			<contentTypeBinding
-				contentTypeId="org.eclipse.jpt.eclipselink.core.content.orm">
-			</contentTypeBinding>
-		</resourceFactory>
-	    
-	    <resourceFactory
-	        class="org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmXmlResourceFactory"
-	        isDefault="true">
-	       	<contentTypeBinding
-	             contentTypeId="org.eclipse.jpt.eclipselink1_1.core.content.orm">
-	       	</contentTypeBinding>
-	    </resourceFactory>
-	 </extension>
-	
-	<extension 
-		point="org.eclipse.wst.xml.core.catalogContributions">
-		
-		<catalogContribution id="default">
-			<uri
-				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_1_0.xsd"
-				uri="schemas/eclipselink_orm_1_0.xsd" />
-			
-			<public
-				publicId="http://www.eclipse.org/eclipselink/xsds/persistence/orm"
-				uri="schemas/eclipselink_orm_1_0.xsd"/>
-				
-			<uri
-				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_1_1.xsd"
-				uri="schemas/eclipselink_orm_1_1.xsd" />
-			
-			<public
-				publicId="http://www.eclipse.org/eclipselink/xsds/persistence/orm"
-				uri="schemas/eclipselink_orm_1_1.xsd"/>
-			
-		</catalogContribution>
-		
-    </extension>
-	
-</plugin>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/property_files/eclipselink_jpa_validation.properties b/jpa/plugins/org.eclipse.jpt.eclipselink.core/property_files/eclipselink_jpa_validation.properties
deleted file mode 100644
index 12df2233e2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/property_files/eclipselink_jpa_validation.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-# Copyright (c) 2008 Oracle. All rights reserved.
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v1.0, which accompanies this distribution
-# and is available at http://www.eclipse.org/legal/epl-v10.html.
-# 
-# Contributors:
-#     Oracle - initial API and implementation
-################################################################################
-
-CACHE_EXPIRY_AND_EXPIRY_TIME_OF_DAY_BOTH_SPECIFIED=The @Cache annotation on entity \"{0}\" has both expiry() and expiryTimeOfDay() specified. Only one of the two may be specified
-CONVERTER_CLASS_IMPLEMENTS_CONVERTER=The converter class \"{0}\" does not implement the org.eclipse.persistence.mappings.converters.Converter interface
-CUSTOMIZER_CLASS_IMPLEMENTS_DESCRIPTOR_CUSTOMIZER=The customizer class \"{0}\" does not implement the org.eclipse.persistence.config.DescriptorCustomizer interface
-MULTIPLE_OBJECT_VALUES_FOR_DATA_VALUE=Multiple object values are specified for the data value \"{0}\"
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_orm_1_0.xsd b/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_orm_1_0.xsd
deleted file mode 100644
index af1d1dadad..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_orm_1_0.xsd
+++ /dev/null
@@ -1,3128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Java Persistence API object-relational mapping file schema -->
-<xsd:schema targetNamespace="http://www.eclipse.org/eclipselink/xsds/persistence/orm" 
-  xmlns:orm="http://www.eclipse.org/eclipselink/xsds/persistence/orm" 
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-  elementFormDefault="qualified" 
-  attributeFormDefault="unqualified" 
-  version="1.0">
-
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)eclipselink_orm_1_0.xsd 1.0  February 1 2008
-    </xsd:documentation>
-  </xsd:annotation>
-  <xsd:annotation>
-     <xsd:documentation><![CDATA[
-
-       This is the XML Schema for the new native EclipseLink XML metadata
-       format used for JPA and native deployment xml files. 
-
-     ]]></xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:complexType name="emptyType"/>
-
-  <xsd:simpleType name="versionType">
-    <xsd:restriction base="xsd:token">
-      <xsd:pattern value="[0-9]+(\.[0-9]+)*"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:element name="entity-mappings">
-    <xsd:complexType>
-      <xsd:annotation>
-        <xsd:documentation>
-
-        The entity-mappings element is the root element of an mapping
-        file. It contains the following four types of elements:
-
-        1. The persistence-unit-metadata element contains metadata
-        for the entire persistence unit. It is undefined if this element
-        occurs in multiple mapping files within the same persistence unit.
-        
-        2. The package, schema, catalog and access elements apply to all of
-        the entity, mapped-superclass and embeddable elements defined in
-        the same file in which they occur.
-
-        3. The sequence-generator, table-generator, named-query,
-        named-native-query and sql-result-set-mapping elements are global
-        to the persistence unit. It is undefined to have more than one
-        sequence-generator or table-generator of the same name in the same
-        or different mapping files in a persistence unit. It is also 
-        undefined to have more than one named-query or named-native-query
-        of the same name in the same or different mapping files in a 
-        persistence unit.
-
-        4. The entity, mapped-superclass and embeddable elements each define
-        the mapping information for a managed persistent class. The mapping
-        information contained in these elements may be complete or it may
-        be partial.
-
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:sequence>
-        <xsd:element name="description" type="xsd:string"
-                     minOccurs="0"/>
-        <xsd:element name="persistence-unit-metadata" 
-                     type="orm:persistence-unit-metadata"
-                     minOccurs="0"/>
-        <xsd:element name="package" type="xsd:string"
-                     minOccurs="0"/>
-        <xsd:element name="schema" type="xsd:string"
-                     minOccurs="0"/>
-        <xsd:element name="catalog" type="xsd:string"
-                     minOccurs="0"/>
-        <xsd:element name="access" type="orm:access-type"
-                     minOccurs="0"/>
-        <xsd:element name="converter" type="orm:converter" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="type-converter" type="orm:type-converter" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="object-type-converter" type="orm:object-type-converter" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="struct-converter" type="orm:struct-converter" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="sequence-generator" type="orm:sequence-generator"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="table-generator" type="orm:table-generator" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="named-query" type="orm:named-query" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="named-native-query" type="orm:named-native-query"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="named-stored-procedure-query" type="orm:named-stored-procedure-query"
-                     minOccurs="0" maxOccurs="unbounded"/>             
-        <xsd:element name="sql-result-set-mapping" 
-                     type="orm:sql-result-set-mapping" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="mapped-superclass" type="orm:mapped-superclass" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="entity" type="orm:entity" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="embeddable" type="orm:embeddable" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:attribute name="version" type="orm:versionType" 
-                     fixed="1.0" use="required"/>
-    </xsd:complexType>
-  </xsd:element>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-unit-metadata">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Metadata that applies to the persistence unit and not just to 
-        the mapping file in which it is contained. 
-
-        If the xml-mapping-metadata-complete element is specified then 
-        the complete set of mapping metadata for the persistence unit 
-        is contained in the XML mapping files for the persistence unit.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="xml-mapping-metadata-complete" type="orm:emptyType"
-                   minOccurs="0"/>
-      <xsd:element name="exclude-default-mappings" type="orm:emptyType"
-                   minOccurs="0"/>             
-      <xsd:element name="persistence-unit-defaults" 
-                   type="orm:persistence-unit-defaults"
-                   minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-unit-defaults">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        These defaults are applied to the persistence unit as a whole 
-        unless they are overridden by local annotation or XML 
-        element settings. 
-        
-        schema - Used as the schema for all tables or secondary tables
-            that apply to the persistence unit
-        catalog - Used as the catalog for all tables or secondary tables
-            that apply to the persistence unit
-        access - Used as the access type for all managed classes in
-            the persistence unit
-        cascade-persist - Adds cascade-persist to the set of cascade options
-            in entity relationships of the persistence unit
-        entity-listeners - List of default entity listeners to be invoked 
-            on each entity in the persistence unit. 
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-        <xsd:element name="schema" type="xsd:string"
-                     minOccurs="0"/>
-        <xsd:element name="catalog" type="xsd:string"
-                     minOccurs="0"/>
-        <xsd:element name="access" type="orm:access-type"
-                     minOccurs="0"/>
-        <xsd:element name="cascade-persist" type="orm:emptyType" 
-                     minOccurs="0"/>
-        <xsd:element name="entity-listeners" type="orm:entity-listeners"
-                     minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="entity">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Defines the settings and mappings for an entity. Is allowed to be
-        sparsely populated and used in conjunction with the annotations.
-        Alternatively, the metadata-complete attribute can be used to 
-        indicate that no annotations on the entity class (and its fields
-        or properties) are to be processed. If this is the case then 
-        the defaulting rules for the entity and its subelements will 
-        be recursively applied.
-
-        @Target(TYPE) @Retention(RUNTIME)
-          public @interface Entity {
-          String name() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="customizer" type="orm:customizer" minOccurs="0"/>
-      <xsd:element name="change-tracking" type="orm:change-tracking" 
-                   minOccurs="0"/>
-      <xsd:element name="table" type="orm:table" minOccurs="0"/>
-      <xsd:element name="secondary-table" type="orm:secondary-table" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="primary-key-join-column" 
-                   type="orm:primary-key-join-column" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="id-class" type="orm:id-class" minOccurs="0"/>
-      <xsd:element name="inheritance" type="orm:inheritance" minOccurs="0"/>
-      <xsd:element name="discriminator-value" type="orm:discriminator-value" 
-                   minOccurs="0"/>
-      <xsd:element name="discriminator-column" 
-                   type="orm:discriminator-column" 
-                   minOccurs="0"/>
-      <xsd:element name="optimistic-locking" type="orm:optimistic-locking"
-                   minOccurs="0"/>
-      <xsd:element name="cache" type="orm:cache" minOccurs="0"/>
-      <xsd:element name="converter" type="orm:converter" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="type-converter" type="orm:type-converter" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="object-type-converter" type="orm:object-type-converter" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="struct-converter" type="orm:struct-converter" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="copy-policy" type="orm:copy-policy" 
-                     minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="instantiation-copy-policy" type="orm:instantiation-copy-policy" 
-                     minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="clone-copy-policy" type="orm:clone-copy-policy" 
-                     minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="sequence-generator" type="orm:sequence-generator" 
-                   minOccurs="0"/>
-      <xsd:element name="table-generator" type="orm:table-generator" 
-                   minOccurs="0"/>
-      <xsd:element name="named-query" type="orm:named-query" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="named-native-query" type="orm:named-native-query" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="named-stored-procedure-query" type="orm:named-stored-procedure-query"
-                   minOccurs="0" maxOccurs="unbounded"/>             
-      <xsd:element name="sql-result-set-mapping" 
-                   type="orm:sql-result-set-mapping" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="exclude-default-listeners" type="orm:emptyType" 
-                   minOccurs="0"/>
-      <xsd:element name="exclude-superclass-listeners" type="orm:emptyType" 
-                   minOccurs="0"/>
-      <xsd:element name="entity-listeners" type="orm:entity-listeners" 
-                   minOccurs="0"/>
-      <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/>
-      <xsd:element name="post-persist" type="orm:post-persist" 
-                   minOccurs="0"/>
-      <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/>
-      <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/>
-      <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/>
-      <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/>
-      <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/>
-      <xsd:element name="property" type="orm:property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="attribute-override" type="orm:attribute-override" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="association-override" type="orm:association-override"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="attributes" type="orm:attributes" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="class" type="xsd:string" use="required"/>
-    <xsd:attribute name="access" type="orm:access-type"/>
-    <xsd:attribute name="metadata-complete" type="xsd:boolean"/>
-    <xsd:attribute name="read-only" type="xsd:boolean"/>
-    <xsd:attribute name="existence-checking" type="orm:existence-type"/>
-    <xsd:attribute name="exclude-default-mappings" type="xsd:boolean"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="attributes">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This element contains the entity field or property mappings.
-        It may be sparsely populated to include only a subset of the
-        fields or properties. If metadata-complete for the entity is true
-        then the remainder of the attributes will be defaulted according
-        to the default rules.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:choice>
-        <xsd:element name="id" type="orm:id" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="embedded-id" type="orm:embedded-id" 
-                     minOccurs="0"/>
-      </xsd:choice>
-      <xsd:element name="basic" type="orm:basic"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="basic-collection" type="orm:basic-collection"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="basic-map" type="orm:basic-map"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="version" type="orm:version"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="many-to-one" type="orm:many-to-one"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="one-to-many" type="orm:one-to-many"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="one-to-one" type="orm:one-to-one"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="variable-one-to-one" type="orm:variable-one-to-one"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="many-to-many" type="orm:many-to-many" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="embedded" type="orm:embedded"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="transformation" type="orm:transformation"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="transient" type="orm:transient"
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="access-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This element determines how the persistence provider accesses the
-        state of an entity or embedded object.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="PROPERTY"/>
-      <xsd:enumeration value="FIELD"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="entity-listeners">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface EntityListeners {
-          Class[] value();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="entity-listener" type="orm:entity-listener" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="entity-listener">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Defines an entity listener to be invoked at lifecycle events
-        for the entities that list this listener.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/>
-      <xsd:element name="post-persist" type="orm:post-persist" 
-                   minOccurs="0"/>
-      <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/>
-      <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/>
-      <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/>
-      <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/>
-      <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="class" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="pre-persist">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PrePersist {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="post-persist">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PostPersist {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="pre-remove">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PreRemove {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="post-remove">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PostRemove {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="pre-update">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PreUpdate {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="post-update">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PostUpdate {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="post-load">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PostLoad {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-  
-  <xsd:complexType name="property">
-    <xsd:annotation>
-      <xsd:documentation>
-        A user defined mapping's property.
-		@Target({METHOD, FIELD, TYPE})
-		@Retention(RUNTIME)
-		public @interface Property {
-			/**
-			* Property name.
-			*/ 
-			String name();
-			
-			/**
-			* String representation of Property value,
-			* converted to an instance of valueType.
-			*/ 
-			String value();
-			
-			/**
-			* Property value type.
-			* The value converted to valueType by ConversionManager.
-			* If specified must be a simple type that could be handled by 
-			* ConversionManager: 
-			* numerical, boolean, temporal.  
-			*/ 
-			Class valueType() default String.class;
-		}
-	</xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="value" type="xsd:string" use="required"/>
-    <xsd:attribute name="value-type" type="xsd:string"/>
-    </xsd:complexType>
-    
-    <!-- **************************************************** -->
-
-  <xsd:complexType name="query-hint">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({}) @Retention(RUNTIME) 
-        public @interface QueryHint {
-          String name();
-          String value();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="value" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="named-query">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface NamedQuery {
-          String name();
-          String query();
-          QueryHint[] hints() default {};
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="query" type="xsd:string"/>
-      <xsd:element name="hint" type="orm:query-hint" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="named-native-query">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface NamedNativeQuery {
-          String name();
-          String query();
-          QueryHint[] hints() default {};
-          Class resultClass() default void.class;
-          String resultSetMapping() default ""; //named SqlResultSetMapping
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="query" type="xsd:string"/>
-      <xsd:element name="hint" type="orm:query-hint" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="result-class" type="xsd:string"/>
-    <xsd:attribute name="result-set-mapping" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="sql-result-set-mapping">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface SqlResultSetMapping {
-          String name();
-          EntityResult[] entities() default {};
-          ColumnResult[] columns() default {};
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="entity-result" type="orm:entity-result" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="column-result" type="orm:column-result" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="entity-result">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({}) @Retention(RUNTIME)
-        public @interface EntityResult {
-          Class entityClass();
-          FieldResult[] fields() default {};
-          String discriminatorColumn() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="field-result" type="orm:field-result" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="entity-class" type="xsd:string" use="required"/>
-    <xsd:attribute name="discriminator-column" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="field-result">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({}) @Retention(RUNTIME)
-        public @interface FieldResult {
-          String name();
-          String column();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="column" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="column-result">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({}) @Retention(RUNTIME)
-        public @interface ColumnResult {
-          String name();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="table">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface Table {
-          String name() default "";
-          String catalog() default "";
-          String schema() default "";
-          UniqueConstraint[] uniqueConstraints() default {};
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="unique-constraint" type="orm:unique-constraint" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="catalog" type="xsd:string"/>
-    <xsd:attribute name="schema" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="secondary-table">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface SecondaryTable {
-          String name();
-          String catalog() default "";
-          String schema() default "";
-          PrimaryKeyJoinColumn[] pkJoinColumns() default {};
-          UniqueConstraint[] uniqueConstraints() default {};
-         }
-
-       </xsd:documentation>
-     </xsd:annotation>
-     <xsd:sequence>
-       <xsd:element name="primary-key-join-column" 
-                    type="orm:primary-key-join-column" 
-                    minOccurs="0" maxOccurs="unbounded"/>
-       <xsd:element name="unique-constraint" type="orm:unique-constraint" 
-                    minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="catalog" type="xsd:string"/>
-    <xsd:attribute name="schema" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="unique-constraint">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({}) @Retention(RUNTIME)
-        public @interface UniqueConstraint {
-          String[] columnNames();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="column-name" type="xsd:string" 
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="column">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Column {
-          String name() default "";
-          boolean unique() default false;
-          boolean nullable() default true;
-          boolean insertable() default true;
-          boolean updatable() default true;
-          String columnDefinition() default "";
-          String table() default "";
-          int length() default 255;
-          int precision() default 0; // decimal precision
-          int scale() default 0; // decimal scale
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="unique" type="xsd:boolean"/>
-    <xsd:attribute name="nullable" type="xsd:boolean"/>
-    <xsd:attribute name="insertable" type="xsd:boolean"/>
-    <xsd:attribute name="updatable" type="xsd:boolean"/>
-    <xsd:attribute name="column-definition" type="xsd:string"/>
-    <xsd:attribute name="table" type="xsd:string"/>
-    <xsd:attribute name="length" type="xsd:int"/>
-    <xsd:attribute name="precision" type="xsd:int"/>
-    <xsd:attribute name="scale" type="xsd:int"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="join-column">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface JoinColumn {
-          String name() default "";
-          String referencedColumnName() default "";
-          boolean unique() default false;
-          boolean nullable() default true;
-          boolean insertable() default true;
-          boolean updatable() default true;
-          String columnDefinition() default "";
-          String table() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="referenced-column-name" type="xsd:string"/>
-    <xsd:attribute name="unique" type="xsd:boolean"/>
-    <xsd:attribute name="nullable" type="xsd:boolean"/>
-    <xsd:attribute name="insertable" type="xsd:boolean"/>
-    <xsd:attribute name="updatable" type="xsd:boolean"/>
-    <xsd:attribute name="column-definition" type="xsd:string"/>
-    <xsd:attribute name="table" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="generation-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum GenerationType { TABLE, SEQUENCE, IDENTITY, AUTO };
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="TABLE"/>
-      <xsd:enumeration value="SEQUENCE"/>
-      <xsd:enumeration value="IDENTITY"/>
-      <xsd:enumeration value="AUTO"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="access-methods">
-    <xsd:annotation>
-      <xsd:documentation>
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="get-method" type="xsd:string" use="required"/>
-    <xsd:attribute name="set-method" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="attribute-override">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface AttributeOverride {
-          String name();
-          Column column();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="column" type="orm:column"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="association-override">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface AssociationOverride {
-          String name();
-          JoinColumn[] joinColumns();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="join-column" type="orm:join-column"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="id-class">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface IdClass {
-          Class value();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="class" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="id">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Id {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="column" type="orm:column" minOccurs="0"/>
-      <xsd:element name="generated-value" type="orm:generated-value" minOccurs="0"/>
-      <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/>
-      <xsd:element name="convert" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="table-generator" type="orm:table-generator" minOccurs="0"/>
-      <xsd:element name="sequence-generator" type="orm:sequence-generator" minOccurs="0"/>
-      <xsd:element name="property" type="orm:property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="access-methods" type="orm:access-methods" 
-                       minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="mutable" type="xsd:boolean"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="embedded-id">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface EmbeddedId {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="attribute-override" type="orm:attribute-override" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="property" type="orm:property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="access-methods" type="orm:access-methods" 
-                       minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="transient">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Transient {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="version">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Version {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="column" type="orm:column" minOccurs="0"/>
-      <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/>
-      <xsd:element name="convert" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="property" type="orm:property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="access-methods" type="orm:access-methods" 
-                       minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="mutable" type="xsd:boolean"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="basic">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Basic {
-          FetchType fetch() default EAGER;
-          boolean optional() default true;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="column" type="orm:column" minOccurs="0"/>
-      <xsd:choice>
-        <xsd:element name="lob" type="orm:lob" minOccurs="0"/>
-        <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/>
-        <xsd:element name="enumerated" type="orm:enumerated" minOccurs="0"/>
-        <xsd:element name="convert" type="xsd:string" minOccurs="0"/>
-      </xsd:choice>
-      <xsd:element name="property" type="orm:property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="access-methods" type="orm:access-methods" 
-                       minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-    <xsd:attribute name="optional" type="xsd:boolean"/>
-    <xsd:attribute name="mutable" type="xsd:boolean"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="read-transformer">
-    <xsd:annotation>
-      <xsd:documentation>
-
-		/**
-		 * Annotation for org.eclipse.persistence.mappings.TransformationMapping.
-		 * Unless the TransformationMapping is write-only, it should have a 
-		 * ReadTransformer, it defines transformation of database column(s) 
-		 * value(s)into attribute value.
-		 *  
-		 * Also unless it's a read-only mapping, either WriteTransformer 
-		 * annotation or WriteTransformers annotation should be specified. Each 
-		 * WriteTransformer defines transformation of the attribute value to a 
-		 * single database column value (column is specified in the 
-		 * WriteTransformer). 
-		 */ 
-		@Target({METHOD, FIELD})
-		@Retention(RUNTIME)
-		public @interface ReadTransformer {
-		    /**
-		     * User-defined class that must implement the 
-		     * org.eclipse.persistence.mappings.transformers.AttributeTransformer 
-		     * interface. The class will be instantiated, its 
-		     * buildAttributeValue will be used to create the value to be 
-		     * assigned to the attribute.
-		     * Either transformerClass or method must be specified, but not both.
-		     */ 
-		    Class transformerClass() default void.class;
-		
-		    /**
-		     * The mapped class must have a method with this name which returns 
-		     * a value to be assigned to the attribute (not assigns the value to 
-		     * the attribute). Either transformerClass or method must be 
-		     * specified, but not both.
-		     */ 
-		    String method() default "";
-		}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="transformer-class" type="xsd:string"/>
-    <xsd:attribute name="method" type="xsd:string"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="write-transformer">
-    <xsd:annotation>
-      <xsd:documentation>
-
-		/**
-		 * Annotation for org.eclipse.persistence.mappings.TransformationMapping.
-		 * WriteTransformer defines transformation of the attribute value to a 
-		 * single database column value (column is specified in the 
-		 * WriteTransformer).
-		 *  
-		 * A single WriteTransformer may be specified directly on the method or 
-		 * attribute. Multiple WriteTransformers should be wrapped into 
-		 * WriteTransformers annotation. No WriteTransformers specified for 
-		 * read-only mapping. Unless the TransformationMapping is write-only, it 
-		 * should have a ReadTransformer, it defines transformation of database 
-		 * column(s) value(s)into attribute value.
-		 */ 
-		@Target({METHOD, FIELD})
-		@Retention(RUNTIME)
-		public @interface WriteTransformer {
-		    /**
-		     * User-defined class that must implement the 
-		     * org.eclipse.persistence.mappings.transformers.FieldTransformer 
-		     * interface. The class will be instantiated, its buildFieldValue 
-		     * will be used to create the value to be written into the database 
-		     * column. Note that for ddl generation and returning to be 
-		     * supported the method buildFieldValue in the class should be 
-		     * defined to return the relevant Java type, not just Object as 
-		     * defined in the interface, for instance:
-		     * public Time buildFieldValue(Object instance, String fieldName, Session session).
-		     * Either transformerClass or method must be specified, but not both.
-		     */ 
-		    Class transformerClass() default void.class;
-		
-		    /**
-		     * The mapped class must have a method with this name which returns 
-		     * a value to be written into the database column.
-		     * Note that for ddl generation and returning to be supported the 
-		     * method should be defined to return a particular type, not just 
-		     * Object, for instance:
-		     * public Time getStartTime().
-		     * The method may require a Transient annotation to avoid being 
-		     * mapped as Basic by default.
-		     * Either transformerClass or method must be specified, but not both.
-		     */ 
-		    String method() default "";
-		
-		    /**
-		     * Specify here the column into which the value should be written.
-		     * The only case when this could be skipped is if a single 
-		     * WriteTransformer annotates an attribute - the attribute's name 
-		     * will be used as a column name.
-		     */ 
-		    Column column() default @Column;
-		}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="column" type="orm:column"/>
-    </xsd:sequence>
-    <xsd:attribute name="transformer-class" type="xsd:string"/>
-    <xsd:attribute name="method" type="xsd:string"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="transformation">
-    <xsd:annotation>
-      <xsd:documentation>
-
-		/**
-		 * Transformation is an optional annotation for 
-		 * org.eclipse.persistence.mappings.TransformationMapping.
-		 * TransformationMapping allows to map an attribute to one or more 
-		 * database columns.
-		 * 
-		 * Transformation annotation is an optional part of 
-		 * TransformationMapping definition. Unless the TransformationMapping is 
-		 * write-only, it should have a ReadTransformer, it defines 
-		 * transformation of database column(s) value(s)into attribute value.
-		 * Also unless it's a read-only mapping, either WriteTransformer 
-		 * annotation or WriteTransformers annotation should be specified. Each 
-		 * WriteTransformer defines transformation of the attribute value to a 
-		 * single database column value (column is specified in the 
-		 * WriteTransformer). 
-		 */ 
-		@Target({METHOD, FIELD})
-		@Retention(RUNTIME)
-		public @interface Transformation {
-		    /**
-		     * (Optional) Defines whether the value of the field or property 
-		     * should be lazily loaded or must be eagerly fetched. The EAGER 
-		     * strategy is a requirement on the persistence provider runtime 
-		     * that the value must be eagerly fetched. The LAZY strategy is a 
-		     * hint to the persistence provider runtime. If not specified, 
-		     * defaults to EAGER.
-		     */
-		    FetchType fetch() default EAGER;
-		    
-		    /**
-		     * (Optional) The optional element is a hint as to whether the value
-		     *  of the field or property may be null. It is disregarded
-		     *  for primitive types, which are considered non-optional.
-		     */
-		    boolean optional() default true;
-		}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="read-transformer" type="orm:read-transformer"/>
-      <xsd:element name="write-transformer" type="orm:write-transformer" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="access" type="orm:access-type" minOccurs="0"/>
-      <xsd:element name="property" type="orm:property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="access-methods" type="orm:access-methods" 
-                       minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-    <xsd:attribute name="optional" type="xsd:boolean"/>
-    <xsd:attribute name="mutable" type="xsd:boolean"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="fetch-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum FetchType { LAZY, EAGER };
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="LAZY"/>
-      <xsd:enumeration value="EAGER"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="lob">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Lob {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="temporal">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Temporal {
-          TemporalType value();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="orm:temporal-type"/>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="temporal-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum TemporalType {
-          DATE, // java.sql.Date
-          TIME, // java.sql.Time
-          TIMESTAMP // java.sql.Timestamp
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-      <xsd:restriction base="xsd:token">
-        <xsd:enumeration value="DATE"/>
-        <xsd:enumeration value="TIME"/>
-        <xsd:enumeration value="TIMESTAMP"/>
-     </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="enumerated">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Enumerated {
-          EnumType value() default ORDINAL;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="orm:enum-type"/>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="enum-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum EnumType {
-          ORDINAL,
-          STRING
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="ORDINAL"/>
-      <xsd:enumeration value="STRING"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="many-to-one">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface ManyToOne {
-          Class targetEntity() default void.class;
-          CascadeType[] cascade() default {};
-          FetchType fetch() default EAGER;
-          boolean optional() default true;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:choice>       
-        <xsd:element name="join-column" type="orm:join-column" minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="join-table" type="orm:join-table" minOccurs="0"/>
-      </xsd:choice>       
-      <xsd:element name="cascade" type="orm:cascade-type" minOccurs="0"/>
-      <xsd:element name="join-fetch" type="orm:join-fetch-type" minOccurs="0"/>
-      <xsd:element name="property" type="orm:property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="access-methods" type="orm:access-methods" 
-                       minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="target-entity" type="xsd:string"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-    <xsd:attribute name="optional" type="xsd:boolean"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="cascade-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH};
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="cascade-all" type="orm:emptyType"
-                   minOccurs="0"/>
-      <xsd:element name="cascade-persist" type="orm:emptyType"
-                   minOccurs="0"/>
-      <xsd:element name="cascade-merge" type="orm:emptyType"
-                   minOccurs="0"/>
-      <xsd:element name="cascade-remove" type="orm:emptyType"
-                   minOccurs="0"/>
-      <xsd:element name="cascade-refresh" type="orm:emptyType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="one-to-one">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface OneToOne {
-          Class targetEntity() default void.class;
-          CascadeType[] cascade() default {};
-          FetchType fetch() default EAGER;
-          boolean optional() default true;
-          String mappedBy() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:choice>
-        <xsd:element name="primary-key-join-column" type="orm:primary-key-join-column" minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="join-column" type="orm:join-column" minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="join-table" type="orm:join-table" minOccurs="0"/>
-      </xsd:choice>
-      <xsd:element name="cascade" type="orm:cascade-type" minOccurs="0"/>
-      <xsd:element name="private-owned" type="orm:emptyType" minOccurs="0"/>
-      <xsd:element name="join-fetch" type="orm:join-fetch-type" minOccurs="0"/>
-      <xsd:element name="property" type="orm:property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="access-methods" type="orm:access-methods" 
-                       minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="target-entity" type="xsd:string"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-    <xsd:attribute name="optional" type="xsd:boolean"/>
-    <xsd:attribute name="mapped-by" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="one-to-many">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface OneToMany {
-          Class targetEntity() default void.class;
-          CascadeType[] cascade() default {};
-          FetchType fetch() default LAZY;
-          String mappedBy() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="order-by" type="orm:order-by" minOccurs="0"/>
-      <xsd:element name="map-key" type="orm:map-key" minOccurs="0"/>
-      <xsd:choice>       
-        <xsd:element name="join-table" type="orm:join-table" minOccurs="0"/>
-        <xsd:element name="join-column" type="orm:join-column" minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:choice>       
-      <xsd:element name="cascade" type="orm:cascade-type" minOccurs="0"/>
-      <xsd:element name="private-owned" type="orm:emptyType" minOccurs="0"/>
-      <xsd:element name="join-fetch" type="orm:join-fetch-type" minOccurs="0"/>
-      <xsd:element name="property" type="orm:property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="access-methods" type="orm:access-methods" 
-                       minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="target-entity" type="xsd:string"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-    <xsd:attribute name="mapped-by" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="join-table">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD})
-        public @interface JoinTable {
-          String name() default "";
-          String catalog() default "";
-          String schema() default "";
-          JoinColumn[] joinColumns() default {};
-          JoinColumn[] inverseJoinColumns() default {};
-          UniqueConstraint[] uniqueConstraints() default {};
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="join-column" type="orm:join-column" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="inverse-join-column" type="orm:join-column" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="unique-constraint" type="orm:unique-constraint" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="catalog" type="xsd:string"/>
-    <xsd:attribute name="schema" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="many-to-many">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface ManyToMany {
-          Class targetEntity() default void.class;
-          CascadeType[] cascade() default {};
-          FetchType fetch() default LAZY;
-          String mappedBy() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="order-by" type="orm:order-by" minOccurs="0"/>
-      <xsd:element name="map-key" type="orm:map-key" minOccurs="0"/>
-      <xsd:element name="join-table" type="orm:join-table" minOccurs="0"/>
-      <xsd:element name="cascade" type="orm:cascade-type" minOccurs="0"/>
-      <xsd:element name="join-fetch" type="orm:join-fetch-type" minOccurs="0"/>
-      <xsd:element name="property" type="orm:property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="access-methods" type="orm:access-methods" 
-                       minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="target-entity" type="xsd:string"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-    <xsd:attribute name="mapped-by" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="generated-value">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface GeneratedValue {
-          GenerationType strategy() default AUTO;
-          String generator() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="strategy" type="orm:generation-type"/>
-    <xsd:attribute name="generator" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="map-key">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface MapKey {
-          String name() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="order-by">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface OrderBy {
-          String value() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="inheritance">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface Inheritance {
-          InheritanceType strategy() default SINGLE_TABLE;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="strategy" type="orm:inheritance-type"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="inheritance-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum InheritanceType
-          { SINGLE_TABLE, JOINED, TABLE_PER_CLASS};
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="SINGLE_TABLE"/>
-      <xsd:enumeration value="JOINED"/>
-      <xsd:enumeration value="TABLE_PER_CLASS"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="discriminator-value">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface DiscriminatorValue {
-          String value();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="discriminator-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum DiscriminatorType { STRING, CHAR, INTEGER };
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="STRING"/>
-      <xsd:enumeration value="CHAR"/>
-      <xsd:enumeration value="INTEGER"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="primary-key-join-column">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface PrimaryKeyJoinColumn {
-          String name() default "";
-          String referencedColumnName() default "";
-          String columnDefinition() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="referenced-column-name" type="xsd:string"/>
-    <xsd:attribute name="column-definition" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="discriminator-column">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface DiscriminatorColumn {
-          String name() default "DTYPE";
-          DiscriminatorType discriminatorType() default STRING;
-          String columnDefinition() default "";
-          int length() default 31;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="discriminator-type" type="orm:discriminator-type"/>
-    <xsd:attribute name="column-definition" type="xsd:string"/>
-    <xsd:attribute name="length" type="xsd:int"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="embeddable">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Defines the settings and mappings for embeddable objects. Is 
-        allowed to be sparsely populated and used in conjunction with 
-        the annotations. Alternatively, the metadata-complete attribute 
-        can be used to indicate that no annotations are to be processed 
-        in the class. If this is the case then the defaulting rules will 
-        be recursively applied.
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface Embeddable {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="customizer" type="orm:customizer" minOccurs="0"/>
-      <xsd:element name="change-tracking" type="orm:change-tracking" 
-                   minOccurs="0"/>
-      <xsd:element name="converter" type="orm:converter" minOccurs="0" 
-                   maxOccurs="unbounded"/>
-      <xsd:element name="type-converter" type="orm:type-converter" minOccurs="0" 
-                   maxOccurs="unbounded"/>
-      <xsd:element name="object-type-converter" type="orm:object-type-converter" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="struct-converter" type="orm:struct-converter" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="property" type="orm:property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="attributes" type="orm:attributes" 
-                   minOccurs="0"/>
-      <xsd:element name="copy-policy" type="orm:copy-policy" 
-                     minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="instantiation-copy-policy" type="orm:instantiation-copy-policy" 
-                     minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="clone-copy-policy" type="orm:clone-copy-policy" 
-                     minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="class" type="xsd:string" use="required"/>
-    <xsd:attribute name="access" type="orm:access-type"/>
-    <xsd:attribute name="metadata-complete" type="xsd:boolean"/>
-    <xsd:attribute name="exclude-default-mappings" type="xsd:boolean"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="embedded">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Embedded {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="attribute-override" type="orm:attribute-override" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="property" type="orm:property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="access-methods" type="orm:access-methods" 
-                       minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="mapped-superclass">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Defines the settings and mappings for a mapped superclass. Is 
-        allowed to be sparsely populated and used in conjunction with 
-        the annotations. Alternatively, the metadata-complete attribute 
-        can be used to indicate that no annotations are to be processed 
-        If this is the case then the defaulting rules will be recursively 
-        applied.
-
-        @Target(TYPE) @Retention(RUNTIME)
-        public @interface MappedSuperclass{}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="customizer" type="orm:customizer" minOccurs="0"/>
-      <xsd:element name="change-tracking" type="orm:change-tracking" 
-                   minOccurs="0"/>
-      <xsd:element name="id-class" type="orm:id-class" minOccurs="0"/>
-      <xsd:element name="optimistic-locking" type="orm:optimistic-locking"
-                   minOccurs="0"/>
-      <xsd:element name="cache" type="orm:cache" minOccurs="0"/>
-      <xsd:element name="converter" type="orm:converter" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="type-converter" type="orm:type-converter" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="object-type-converter" type="orm:object-type-converter" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="struct-converter" type="orm:struct-converter" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="copy-policy" type="orm:copy-policy" 
-                     minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="instantiation-copy-policy" type="orm:instantiation-copy-policy" 
-                     minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="clone-copy-policy" type="orm:clone-copy-policy" 
-                     minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="exclude-default-listeners" type="orm:emptyType" 
-                   minOccurs="0"/>
-      <xsd:element name="exclude-superclass-listeners" type="orm:emptyType" 
-                   minOccurs="0"/>
-      <xsd:element name="entity-listeners" type="orm:entity-listeners" 
-                   minOccurs="0"/>
-      <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/>
-      <xsd:element name="post-persist" type="orm:post-persist" 
-                   minOccurs="0"/>
-      <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/>
-      <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/>
-      <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/>
-      <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/>
-      <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/>
-      <xsd:element name="property" type="orm:property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="attributes" type="orm:attributes" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="class" type="xsd:string" use="required"/>
-    <xsd:attribute name="access" type="orm:access-type"/>
-    <xsd:attribute name="metadata-complete" type="xsd:boolean"/>
-    <xsd:attribute name="read-only" type="xsd:boolean"/>
-    <xsd:attribute name="existence-checking" type="orm:existence-type"/>
-    <xsd:attribute name="exclude-default-mappings" type="xsd:boolean"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="sequence-generator">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface SequenceGenerator {
-          String name();
-          String sequenceName() default "";
-          int initialValue() default 1;
-          int allocationSize() default 50;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="sequence-name" type="xsd:string"/>
-    <xsd:attribute name="initial-value" type="xsd:int"/>
-    <xsd:attribute name="allocation-size" type="xsd:int"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="table-generator">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface TableGenerator {
-          String name();
-          String table() default "";
-          String catalog() default "";
-          String schema() default "";
-          String pkColumnName() default "";
-          String valueColumnName() default "";
-          String pkColumnValue() default "";
-          int initialValue() default 0;
-          int allocationSize() default 50;
-          UniqueConstraint[] uniqueConstraints() default {};
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="unique-constraint" type="orm:unique-constraint" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="table" type="xsd:string"/>
-    <xsd:attribute name="catalog" type="xsd:string"/>
-    <xsd:attribute name="schema" type="xsd:string"/>
-    <xsd:attribute name="pk-column-name" type="xsd:string"/>
-    <xsd:attribute name="value-column-name" type="xsd:string"/>
-    <xsd:attribute name="pk-column-value" type="xsd:string"/>
-    <xsd:attribute name="initial-value" type="xsd:int"/>
-    <xsd:attribute name="allocation-size" type="xsd:int"/>
-  </xsd:complexType>
-  
-  <!-- **************************************************** -->
-  
-  <xsd:complexType name="converter">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE, METHOD, FIELD})
-        @Retention(RUNTIME)
-        public @interface Converter {
-          /**
-           * (Required) Name this converter. The name should be unique across 
-           * the whole persistence unit.
-           */
-          String name();
-
-          /**
-           * (Required) The converter class to be used. This class must implement
-           * the org.eclipse.persistence.mappings.converters.Converter interface.
-           */
-          Class converterClass(); 
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="class" type="xsd:string" use="required"/>
-  </xsd:complexType>
-  
-  <!-- **************************************************** -->
-  
-  <xsd:complexType name="type-converter">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE, METHOD, FIELD})
-        @Retention(RUNTIME)
-        public @interface TypeConverter {
-          /**
-           * (Required) Name this converter. The name should be unique
-           * across the whole persistence unit.
-           */
-           String name();
-
-          /**
-           * (Optional) Specify the type stored on the database. The
-           * default is inferred from the type of the persistence field 
-           * or property.
-           */
-          Class dataType() default void.class;
-
-          /**
-           * (Optional) Specify the type stored on the entity. The
-           * default is inferred from the type of the persistent field 
-           * or property.
-           */
-          Class objectType() default void.class;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="data-type" type="xsd:string"/>
-    <xsd:attribute name="object-type" type="xsd:string"/>
-  </xsd:complexType>
-  
-  <!-- **************************************************** -->
-  
-  <xsd:complexType name="object-type-converter">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE, METHOD, FIELD})
-        @Retention(RUNTIME)
-        public @interface ObjectTypeConverter {
-          /**
-           * (Required) Name this converter. The name should be unique
-           * across the whole persistence unit.
-           */
-          String name();
-
-          /**
-           * (Optional) Specify the type stored on the database. The
-           * default is inferred from the type of the persistence
-           * field or property.
-           */
-          Class dataType() default void.class;
-
-          /**
-           * (Optional) Specify the type stored on the entity. The
-           * default is inferred from the type of the persistent 
-           * field or property.
-           */
-          Class objectType() default void.class;
-
-          /**
-           * (Required) Specify the conversion values to be used 
-           * with the object converter.
-           */
-          ConversionValue[] conversionValues();
-
-           /**
-            * (Optional) Specify a default object value. Used for 
-            * legacy data if the data value is missing.
-            */
-           String defaultObjectValue() default "";
-         }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="conversion-value" type="orm:conversion-value" minOccurs="1" maxOccurs="unbounded"/>
-      <xsd:element name="default-object-value" type="xsd:string" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="data-type" type="xsd:string"/>
-    <xsd:attribute name="object-type" type="xsd:string"/>
-  </xsd:complexType>
-  
-  <!-- **************************************************** -->
-  
-  <xsd:complexType name="conversion-value">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({})
-        @Retention(RUNTIME)
-        public @interface ConversionValue {
-          /**
-           * (Required) Specify the database value.
-           */
-          String dataValue();
-
-          /**
-           * (Required) Specify the object value.
-           */
-          String objectValue();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="data-value" type="xsd:string" use="required"/>
-    <xsd:attribute name="object-value" type="xsd:string" use="required"/>
-  </xsd:complexType>
-  
-  <!-- **************************************************** -->
-  
-  <xsd:complexType name="struct-converter">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE, METHOD, FIELD})
-        @Retention(RUNTIME)
-        public @interface StructConverter {
-          /**
-           * (Required) Name this converter. The name should be unique across 
-           * the whole persistence unit.
-           */
-          String name();
-
-          /**
-           * (Required) The converter class to be used. This class must 
-           * implement the EclipseLink interface 
-           * org.eclipse.persistence.mappings.converters.Converter
-           */
-          String converter(); 
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="converter" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-  
-  <xsd:complexType name="copy-policy">
-    <xsd:annotation>
-      <xsd:documentation>
-        /**
-         * A CopyPolicy is used to set a 
-         * org.eclipse.persistence.descriptors.copying.CopyPolicy on an Entity.
-         * It is required that a class that implements 
-         * org.eclipse.persistence.descriptors.copying.CopyPolicy be specified 
-         * as the argument.
-         * 
-         * A CopyPolicy should be specified on an Entity or MappedSuperclass.
-         * 
-         * For instance:
-         * @Entity
-         * @CopyPolicy("example.MyCopyPolicy")
-         */
-        public @interface CopyPolicy {
-
-        /*
-        * (Required)
-        * This defines the class of the copy policy. It must specify a class 
-        * that implements org.eclipse.persistence.descriptors.copying.CopyPolicy
-        */
-        Class value();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="class" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-    <!-- **************************************************** -->
-  
-  <xsd:complexType name="instantiation-copy-policy">
-    <xsd:annotation>
-      <xsd:documentation>
-        /**
-         * An InstantiationCopyPolicy is used to set an 
-         * org.eclipse.persistence.descriptors.copying.InstantiationCopyPolicy 
-         * on an Entity. InstantiationCopyPolicy is the default CopyPolicy in 
-         * EclipseLink and therefore this configuration option is only used to 
-         * override other types of copy policies
-         * 
-         * An InstantiationCopyPolicy should be specified on an Entity or 
-         * MappedSuperclass.
-         * 
-         * Example:
-         * @Entity
-         * @InstantiationCopyPolicy 
-         */
-        public @interface InstantiationCopyPolicy {
-        }
-      </xsd:documentation>
-    </xsd:annotation>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-  
-  <xsd:complexType name="clone-copy-policy">
-    <xsd:annotation>
-      <xsd:documentation>
-        /**
-         * A CloneCopyPolicy is used to set an 
-         * org.eclipse.persistence.descriptors.copying.CloneCopyPolicy on an 
-         * Entity. A CloneCopyPolicy must specify at one or both of the "method" 
-         * or "workingCopyMethod". "workingCopyMethod" is used to clone objects 
-         * that will be returned to the user as they are registered in 
-         * EclipseLink's transactional mechanism, the UnitOfWork. "method" will 
-         * be used for the clone that is used for comparison in conjunction with 
-         * EclipseLink's DeferredChangeDetectionPolicy
-         *  
-         * A CloneCopyPolicy should be specified on an Entity or 
-         * MappedSuperclass.
-         * 
-         * Example:
-         * @Entity
-         * @CloneCopyPolicy(method="myCloneMethod")
-         * 
-         * or:
-         * 
-         * @Entity
-         * @CloneCopyPolicy(method="myCloneMethod", workingCopyMethod="myWorkingCopyCloneMethod")
-         * 
-         * or:
-         * 
-          @Entity
-         * @CloneCopyPolicy(workingCopyMethodName="myWorkingCopyClone")
-         */
-        public @interface CloneCopyPolicy {
-
-            /**
-             * (Optional)
-             * Either method or workingCopyMethod must be specified this defines 
-             * a method that will be used to create a clone that will be used 
-             * for comparison by
-             * EclipseLink's DeferredChangeDetectionPolicy
-             */
-            String method();
-            
-            /**
-             * (Optional)
-             * Either method or workingCopyMethod must be specified
-             * this defines a method that will be used to create a clone that 
-             * will be used to create the object returned when registering an 
-             * Object in an EclipseLink UnitOfWork
-             */
-            String workingCopyMethod();
-            
-        }
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method" type="xsd:string"/>
-    <xsd:attribute name="working-copy-method" type="xsd:string"/>
-  </xsd:complexType>
-  
-  <!-- **************************************************** -->
-  
-  <xsd:complexType name="collection-table">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD})
-        @Retention(RUNTIME)
-        public @interface CollectionTable {
-          /**
-           * (Optional) The name of the collection table. If it is not 
-           * specified, it is defaulted to the concatenation of the following: 
-           * the name of the source entity; "_" ; the name of the relationship 
-           * property or field of the source entity.
-           */
-          String name() default ""; 
-
-          /**
-           * (Optional) The catalog of the table. It defaults to the persistence 
-           * unit default catalog.
-           */
-          String catalog() default ""; 
-
-          /**
-           * (Optional) The schema of the table. It defaults to the persistence 
-           * unit default schema.
-           */
-          String schema() default ""; 
-
-          /**
-           * (Optional) Used to specify a primary key column that is used as a 
-           * foreign key to join to another table. If the source entity uses a 
-           * composite primary key, a primary key join column must be specified 
-           * for each field of the composite primary key. In a single primary 
-           * key case, a primary key join column may optionally be specified. 
-           * Defaulting will apply otherwise as follows:
-           * name, the same name as the primary key column of the primary table 
-           * of the source entity. referencedColumnName, the same name of 
-           * primary key column of the primary table of the source entity.
-           */
-          PrimaryKeyJoinColumn[] primaryKeyJoinColumns() default {}; 
- 
-          /**
-           * (Optional) Unique constraints that are to be placed on the table. 
-           * These are only used if table generation is in effect.
-           */
-          UniqueConstraint[] uniqueConstraints() default {}; 
-       }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="primary-key-join-column" type="orm:primary-key-join-column" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="unique-constraint" type="orm:unique-constraint" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="catalog" type="xsd:string"/>
-    <xsd:attribute name="schema" type="xsd:string"/>
-  </xsd:complexType>
-  
-  <!-- **************************************************** -->
-  
-  <xsd:complexType name="basic-collection">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD})
-        @Retention(RUNTIME)
-        public @interface BasicCollection {
-          /**
-           * (Optional) Defines whether the value of the field or property 
-           * should be lazily loaded or must be eagerly fetched. The EAGER 
-           * strategy is a requirement on the persistence provider runtime that 
-           * the value must be eagerly fetched. The LAZY strategy is a hint to 
-           * the persistence provider runtime. If not specified, defaults to 
-           * LAZY.
-           */
-          FetchType fetch() default LAZY; 
- 
-          /**
-           * (Optional) The name of the value column that holds the direct 
-           * collection data. Defaults to the property or field name.
-           */
-          Column valueColumn() default @Column;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="value-column" type="orm:column" minOccurs="0"/>
-      <xsd:element name="convert" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="collection-table" type="orm:collection-table" minOccurs="0"/>
-      <xsd:element name="private-owned" type="orm:emptyType" minOccurs="0"/>
-      <xsd:element name="join-fetch" type="orm:join-fetch-type" minOccurs="0"/>
-      <xsd:element name="property" type="orm:property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="access-methods" type="orm:access-methods" 
-                       minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-  </xsd:complexType>
-  
-  <!-- **************************************************** -->
-  
-  <xsd:complexType name="basic-map">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD})
-        @Retention(RUNTIME)
-        public @interface BasicMap {
-          /**
-           * (Optional) Defines whether the value of the field or property 
-           * should be lazily loaded or must be eagerly fetched. The EAGER 
-           * strategy is a requirement on the persistence provider runtime that 
-           * the value must be eagerly fetched. The LAZY strategy is a hint to 
-           * the persistence provider runtime. If not specified, defaults to 
-           * LAZY.
-           */
-          FetchType fetch() default LAZY;
-
-          /**
-           * (Optional) The name of the data column that holds the direct map 
-           * key. If the name on te key column is "", the name will default to:
-           * the name of the property or field; "_key".
-           */
-          Column keyColumn();
-
-          /**
-           * (Optional) Specify the key converter. Default is equivalent to 
-           * specifying @Convert("none"), meaning no converter will be added to 
-           * the direct map key.
-           */
-          Convert keyConverter() default @Convert;
-
-          /**
-           * (Optional) The name of the data column that holds the direct 
-           * collection data. Defaults to the property or field name.
-           */
-          Column valueColumn() default @Column;
-
-          /**
-           * (Optional) Specify the value converter. Default is equivalent to 
-           * specifying @Convert("none"), meaning no converter will be added to 
-           * the value column mapping.
-           */
-          Convert valueConverter() default @Convert;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="key-column" type="orm:column" minOccurs="0"/>
-      <xsd:element name="key-converter" type="xsd:string"/>    
-      <xsd:element name="value-column" type="orm:column" minOccurs="0"/>
-      <xsd:element name="value-converter" type="xsd:string"/>    
-      <xsd:element name="collection-table" type="orm:collection-table" minOccurs="0"/>
-      <xsd:element name="private-owned" type="orm:emptyType" minOccurs="0"/>
-      <xsd:element name="join-fetch" type="orm:join-fetch-type" minOccurs="0"/>
-      <xsd:element name="property" type="orm:property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="access-methods" type="orm:access-methods" 
-                       minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-  </xsd:complexType>
-  
-  <!-- **************************************************** -->
-  
-  <xsd:simpleType name="join-fetch-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum JoinFetchType {
-        /**
-         * An inner join is used to fetch the related object.
-         * This does not allow for null/empty values.
-         */
-        INNER,
-
-        /**
-         * An inner join is used to fetch the related object.
-         * This allows for null/empty values.
-         */
-        OUTER,
-      }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="INNER"/>
-      <xsd:enumeration value="OUTER"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  
-  <!-- **************************************************** -->
-  
-  <xsd:complexType name="optimistic-locking">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        /** 
-         * An optimistic-locking element is used to specify the type of 
-         * optimistic locking EclipseLink should use when updating or deleting 
-         * entities. An optimistic-locking specification is supported on
-         * an entity or mapped-superclass.
-         * 
-         * It is used in conjunction with the optimistic-locking-type.
-         */ 
-        @Target({TYPE})
-        @Retention(RUNTIME)
-        public @interface OptimisticLocking {
-          /**
-           * (Optional) The type of optimistic locking policy to use.
-           */
-          OptimisticLockingType type() default VERSION_COLUMN;
-
-          /**
-           * (Optional) For an optimistic locking policy of type 
-           * SELECTED_COLUMNS, this annotation member becomes a (Required) 
-           * field.
-           */
-          Column[] selectedColumns() default {};
-
-          /**
-           * (Optional) Specify where the optimistic locking policy should 
-           * cascade lock. Currently only supported with VERSION_COLUMN locking.
-           */
-          boolean cascade() default false;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="selected-column" type="orm:column" minOccurs="0" maxOccurs="unbounded"/>    
-    </xsd:sequence>
-    <xsd:attribute name="type" type="orm:optimistic-locking-type"/>
-    <xsd:attribute name="cascade" type="xsd:boolean"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-  
-  <xsd:simpleType name="optimistic-locking-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        /** 
-         * A simple type that is used within an optimistic-locking 
-         * specification to specify the type of optimistic-locking that
-         * EclipseLink should use when updating or deleting entities.
-         */
-        public enum OptimisticLockingType {
-          /**
-           * Using this type of locking policy compares every field in the table
-           * in the WHERE clause when doing an update or a delete. If any field
-           * has been changed, an optimistic locking exception will be thrown.
-           */
-          ALL_COLUMNS,
-
-          /**
-           * Using this type of locking policy compares only the changed fields
-           * in the WHERE clause when doing an update. If any field has been
-           * changed, an optimistic locking exception will be thrown. A delete
-           * will only compare the primary key.
-           */
-          CHANGED_COLUMNS,
-
-          /**
-           * Using this type of locking compares selected fields in the WHERE
-           * clause when doing an update or a delete. If any field has been
-           * changed, an optimistic locking exception will be thrown. Note that
-           * the fields specified must be mapped and not be primary keys.
-           */
-          SELECTED_COLUMNS,
-
-          /**
-           * Using this type of locking policy compares a single version number
-           * in the where clause when doing an update. The version field must be
-           * mapped and not be the primary key.
-           */
-          VERSION_COLUMN
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="ALL_COLUMNS"/>
-      <xsd:enumeration value="CHANGED_COLUMNS"/>
-      <xsd:enumeration value="SELECTED_COLUMNS"/>
-      <xsd:enumeration value="VERSION_COLUMN"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-    
-  <xsd:complexType name="cache">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        /** 
-         * The Cache annotation is used to set an 
-         * org.eclipse.persistence.descriptors.invalidation.CacheInvalidationPolicy 
-         * which sets objects in EclipseLink's identity maps to be invalid 
-         * following given rules. By default in EclipseLink, objects do not 
-         * expire in the cache. Several different policies are available to 
-         * allow objects to expire.
-         * 
-         * @see org.eclipse.persistence.annotations.CacheType
-         * 
-         * A Cache anotation may be defined on an Entity or MappedSuperclass. 
-         * In the case of inheritance, a Cache annotation should only be defined 
-         * on the root of the inheritance hierarchy.
-         */
-        @Target({TYPE})
-        @Retention(RUNTIME)
-        public @interface Cache {
-          /**
-           * (Optional) The type of cache to use.
-           */ 
-          CacheType type() default SOFT_WEAK;
-
-          /**
-           * (Optional) The size of cache to use.
-           */ 
-          int size() default 100;
-
-	        /**
-	         * (Optional) Cached instances in the shared cache or a client 
-	         * isolated cache.
-	         */ 
-	        boolean shared() default true;
-	
-	        /**
-	         * (Optional) Expire cached instance after a fix period of time (ms). 
-	         * Queries executed against the cache after this will be forced back 
-	         * to the database for a refreshed copy
-	         */ 
-	        int expiry() default -1; // minus one is no expiry.
-	
-	        /**
-	         * (Optional) Expire cached instance a specific time of day. Queries 
-	         * executed against the cache after this will be forced back to the 
-	         * database for a refreshed copy
-	         */ 
-	        TimeOfDay expiryTimeOfDay() default @TimeOfDay(specified=false);
-	
-	        /**
-	         * (Optional) Force all queries that go to the database to always 
-	         * refresh the cache.
-	         */ 
-	        boolean alwaysRefresh() default false;
-	
-	        /**
-	         * (Optional) For all queries that go to the database, refresh the
-	         * cache only if the data received from the database by a query is 
-	         * newer than the data in the cache (as determined by the optimistic 
-	         * locking field)
-	         */ 
-	        boolean refreshOnlyIfNewer() default false;
-	
-	        /**
-	         * (Optional) Setting to true will force all queries to bypass the 
-	         * cache for hits but still resolve against the cache for identity. 
-	         * This forces all queries to hit the database.
-	         */ 
-	        boolean disableHits() default false;
-	
-	        /**
-	         * (Optional) The cache coordination mode.
-	         */ 
-	        CacheCoordinationType coordinationType() default SEND_OBJECT_CHANGES;
-	      }
-	
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:choice>
-	    <xsd:element name="expiry" type="xsd:integer" minOccurs="0"/>
-	    <xsd:element name="expiry-time-of-day" type="orm:time-of-day" minOccurs="0"/>
-	  </xsd:choice>
-	  <xsd:attribute name="size" type="xsd:integer"/>
-	  <xsd:attribute name="shared" type="xsd:boolean"/>
-	  <xsd:attribute name="type" type="orm:cache-type"/>
-	  <xsd:attribute name="always-refresh" type="xsd:boolean"/>
-	  <xsd:attribute name="refresh-only-if-newer" type="xsd:boolean"/>
-	  <xsd:attribute name="disable-hits" type="xsd:boolean"/>
-	  <xsd:attribute name="coordination-type" type="orm:cache-coordination-type"/>
-	</xsd:complexType>
-
-  <!-- **************************************************** --> 
-
-	<xsd:simpleType name="cache-type">
-	  <xsd:annotation>
-	    <xsd:documentation>
-	
-	      /** 
-         * The CacheType enum is used with the Cache annotation for a 
-         * persistent class. It defines the type of IdentityMap/Cache used for 
-         * the class. By default the SOFT_WEAK cache type is used.
-         * 
-         * @see org.eclipse.persistence.annotations.Cache 
-         */
-	      public enum CacheType {
-	        /**
-	         * Provides full caching and guaranteed identity. Caches all objects
-	         * and does not remove them. 
-	         * WARNING: This method may be memory intensive when many objects are 
-	         * read.
-	         */
-	        FULL,
-	
-	        /**
-	         * Similar to the FULL identity map except that the map holds the
-	         * objects using weak references. This method allows full garbage
-	         * collection and provides full caching and guaranteed identity.
-	         */
-	        WEAK,
-	
-	        /**
-	         * Similar to the FULL identity map except that the map holds the
-	         * objects using soft references. This method allows full garbage
-	         * collection when memory is low and provides full caching and
-	         * guaranteed identity.
-	         */
-	        SOFT,
-	
-	        /**
-	         * Similar to the WEAK identity map except that it maintains a
-	         * most-frequently-used sub-cache. The size of the sub-cache is
-	         * proportional to the size of the identity map as specified by
-	         * descriptor's setIdentityMapSize() method. The sub-cache
-	         * uses soft references to ensure that these objects are
-	         * garbage-collected only if the system is low on memory.
-	         */
-	        SOFT_WEAK,
-	
-	        /**
-	         * Identical to the soft cache weak (SOFT_WEAK) identity map except 
-	         * that it uses hard references in the sub-cache. Use this identity 
-	         * map if soft references do not behave properly on your platform.
-	         */
-	        HARD_WEAK,
-	
-	        /**
-	         * A cache identity map maintains a fixed number of objects
-	         * specified by the application. Objects are removed from the cache
-	         * on a least-recently-used basis. This method allows object
-	         * identity for the most commonly used objects.
-	         * WARNING: Furnishes caching and identity, but does not guarantee 
-	         * identity.
-	         */
-	        CACHE,
-	
-	        /**
-	         * WARNING: Does not preserve object identity and does not cache 
-	         * objects.
-	         */
-	        NONE
-	      }
-	
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:restriction base="xsd:token">
-	    <xsd:enumeration value="FULL"/>
-	    <xsd:enumeration value="WEAK"/>
-	    <xsd:enumeration value="SOFT"/>
-	    <xsd:enumeration value="SOFT_WEAK"/>
-	    <xsd:enumeration value="HARD_WEAK"/>
-	    <xsd:enumeration value="CACHE"/>
-	    <xsd:enumeration value="NONE"/>
-	  </xsd:restriction>
-	</xsd:simpleType>
-
-
-  <!-- **************************************************** -->  
-
-	<xsd:simpleType name="cache-coordination-type">
-	  <xsd:annotation>
-	    <xsd:documentation>
-	
-	      /** 
-         * An enum that is used within the Cache annotation.
-         * 
-         * @see org.eclipse.persistence.annotations.Cache 
-         */ 
-	      public enum CacheCoordinationType {
-	        /**
-	         * Sends a list of changed objects including data about the changes.
-	         * This data is merged into the receiving cache.
-	         */
-	        SEND_OBJECT_CHANGES,
-	
-	         /**
-	          * Sends a list of the identities of the objects that have changed. 
-	          * The receiving cache invalidates the objects (rather than changing 
-	          * any of the data)
-	          */
-	         INVALIDATE_CHANGED_OBJECTS,
-	
-	         /**
-	          * Same as SEND_OBJECT_CHANGES except it also includes any newly
-	          * created objects from the transaction.
-	          */
-	         SEND_NEW_OBJECTS_WITH_CHANGES,
-	
-	         /**
-	          * Does no cache coordination.
-	          */
-	         NONE
-        }
-	
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:restriction base="xsd:token">
-	    <xsd:enumeration value="SEND_OBJECT_CHANGES"/>
-	    <xsd:enumeration value="INVALIDATE_CHANGED_OBJECTS"/>
-	    <xsd:enumeration value="SEND_NEW_OBJECTS_WITH_CHANGES"/>
-	    <xsd:enumeration value="NONE"/>
-	  </xsd:restriction>
-	</xsd:simpleType>
-
-  <!-- **************************************************** -->  
-
-	<xsd:complexType name="time-of-day">
-	  <xsd:annotation>
-	    <xsd:documentation>
-	
-	      @Target({})
-	      @Retention(RUNTIME)
-	      public @interface TimeOfDay {
-	        /**
-	         * (Optional) Hour of the day.
-	         */ 
-	        int hour() default 0;
-	
-	        /**
-	         * (Optional) Minute of the day.
-	         */ 
-	        int minute() default 0;
-	
-	        /**
-	         * (Optional) Second of the day.
-	         */ 
-	        int second() default 0;
-	
-	        /**
-	         * (Optional) Millisecond of the day.
-	         */ 
-	        int millisecond() default 0;
-	
-	        /**
-	         * Internal use. Do not modify.
-	         */ 
-	        boolean specified() default true;
-	      }
-	
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:attribute name="hour" type="xsd:integer"/>
-	  <xsd:attribute name="minute" type="xsd:integer"/>
-	  <xsd:attribute name="second" type="xsd:integer"/>
-	  <xsd:attribute name="millisecond" type="xsd:integer"/>
-	</xsd:complexType>
-  
-  <!-- **************************************************** -->
-  
-  <xsd:complexType name="change-tracking">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        /** 
-         * The ChangeTracking annotation is used to specify the 
-         * org.eclipse.persistence.descriptors.changetracking.ObjectChangePolicy 
-         * which computes changes sets for EclipseLink's UnitOfWork commit 
-         * process. An ObjectChangePolicy is stored on an Entity's descriptor.
-         *
-         * A ChangeTracking annotation may be specified on an Entity or 
-         * MappedSuperclass.
-         */ 
-        @Target({TYPE})
-        @Retention(RUNTIME)
-        public @interface ChangeTracking {
-          /**
-           * (Optional) The type of change tracking to use.
-           */ 
-          ChangeTrackingType value() default AUTO;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="type" type="orm:change-tracking-type" use="required"/>
-  </xsd:complexType>
- 
-  <!-- **************************************************** -->
- 
-  <xsd:simpleType name="change-tracking-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        /** 
-         * An enum that is used within the ChangeTracking annotation. 
-         */ 
-        public enum ChangeTrackingType {
-          /**
-           * An ATTRIBUTE change tracking type allows change tracking at the
-           * attribute level of an object. Objects with changed attributes will
-           * be processed in the commit process to include any changes in the 
-           * results of the commit. Unchanged objects will be ignored.
-           */
-          ATTRIBUTE,
-
-          /**
-           * An OBJECT change tracking policy allows an object to calculate for 
-           * itself whether it has changed. Changed objects will be processed in 
-           * the commit process to include any changes in the results of the 
-           * commit. Unchanged objects will be ignored.
-           */
-          OBJECT,
-
-          /**
-           * A DEFERRED change tracking policy defers all change detection to
-           * the UnitOfWork's change detection process. Essentially, the 
-           * calculateChanges() method will run for all objects in a UnitOfWork. 
-           * This is the default ObjectChangePolicy
-           */
-          DEFERRED,
-
-          /**
-           * Will not set any change tracking policy.
-           */
-          AUTO
-        }
-
-      </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:restriction base="xsd:token">
-	    <xsd:enumeration value="ATTRIBUTE"/>
-	    <xsd:enumeration value="OBJECT"/>
-	    <xsd:enumeration value="DEFERRED"/>
-	    <xsd:enumeration value="AUTO"/>
-	  </xsd:restriction>
-	</xsd:simpleType>
-  
-  <!-- **************************************************** -->
-  
-  <xsd:complexType name="customizer">
-	  <xsd:annotation>
-	    <xsd:documentation>
-	
-      /** 
-       * The Customizer annotation is used to specify a class that implements 
-       * the org.eclipse.persistence.internal.sessions.factories.DescriptorCustomizer 
-       * interface and is to run against an enetity's class descriptor after all 
-       * metadata processing has been completed.
-       *
-       * The Customizer annotation may be defined on an Entity, MappedSuperclass 
-       * or Embeddable class. In the case of inheritance, a Customizer is not 
-       * inherited from its parent classes. 
-       */ 
-	    @Target({TYPE})
-	    @Retention(RUNTIME)
-	    public @interface Customizer {
-	      /**
-	       * (Required) Defines the name of the descriptor customizer class that 
-	       * should be applied for the related entity or embeddable class.
-	       */
-	      Class value(); 
-	    }
-	
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:attribute name="class" type="xsd:string" use="required"/>
-	</xsd:complexType>
-  
-  <!-- **************************************************** -->
-  
-  <xsd:complexType name="named-stored-procedure-query">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        /** 
-         * A NamedStoredProcedureQuery annotation allows the definition of 
-         * queries that call stored procedures as named queries.
-         
-         * A NamedStoredProcedureQuery annotation may be defined on an Entity or
-         * MappedSuperclass. 
-         */ 
-	      @Target({TYPE})
-	      @Retention(RUNTIME)
-	      public @interface NamedStoredProcedureQuery {
-	        /**
-	         * (Required) Unique name that references this stored procedure query.
-	         */
-	        String name();
-	
-	        /**
-	         * (Optional) Query hints.
-	         */
-	        QueryHint[] hints() default {};
-	
-	        /**
-	         * (Optional) Refers to the class of the result.
-	         */
-	        Class resultClass() default void.class;
-	
-	        /**
-	         * (Optional) The name of the SQLResultMapping.
-	         */
-	        String resultSetMapping() default "";
-	
-	        /**
-	         * (Required) The name of the stored procedure.
-	         */
-	        String procedureName();
-	
-	        /**
-	         * (Optional) Whether the query should return a result set.
-	         */
-	        boolean returnsResultSet() default true; 
-	
-	        /**
-	         * (Optional) Defines arguments to the stored procedure.
-	         */
-	        StoredProcedureParameter[] parameters() default {};
-	      }
-	
-	    </xsd:documentation>
-	  </xsd:annotation>
-	    <xsd:sequence>
-	      <xsd:element name="hint" type="orm:query-hint" minOccurs="0" 
-	                   maxOccurs="unbounded"/>
-	      <xsd:element name="parameter" type="orm:stored-procedure-parameter" 
-	                   minOccurs="0" maxOccurs="unbounded"/>
-	    </xsd:sequence>
-	  <xsd:attribute name="name" type="xsd:string" use="required"/>
-	  <xsd:attribute name="result-class" type="xsd:string"/>
-	  <xsd:attribute name="result-set-mapping" type="xsd:string"/>
-	  <xsd:attribute name="procedure-name" type="xsd:string" use="required"/>
-	  <xsd:attribute name="returns-result-set" type="xsd:boolean"/>
-	</xsd:complexType>
-  
-  <!-- **************************************************** -->
-  
-  <xsd:complexType name="stored-procedure-parameter">
-	  <xsd:annotation>
-	    <xsd:documentation>
-	
-        /** 
-         * A StoredProcedureParameter annotation is used within a 
-         * NamedStoredProcedureQuery annotation. 
-         */ 
-	      @Target({})
-	      @Retention(RUNTIME)
-	      public @interface StoredProcedureParameter {
-	        /**
-	         * (Optional) The direction of the stored procedure parameter.
-	         */
-	        Direction direction() default IN;
-	
-	        /**
-	         * (Optional) Stored procedure parameter name.
-	         */
-	        String name() default "";
-	
-	        /**
-	         * (Required) The query parameter name.
-	         */
-	        String queryParameter();
-	
-	        /**
-	         * (Optional) The type of Java class desired back from the procedure, 
-	         * this is dependent on the type returned from the procedure.
-	         */
-	        Class type() default void.class;
-	
-	        /**
-	         * (Optional) The JDBC type code, this dependent on the type returned 
-	         * from the procedure.
-	         */
-	        int jdbcType() default -1;
-	
-	        /**
-	         * (Optional) The JDBC type name, this may be required for ARRAY or 
-	         * STRUCT types.
-	         */
-	        String jdbcTypeName() default "";
-	      }
-	
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:attribute name="direction" type="orm:direction-type"/>
-	  <xsd:attribute name="name" type="xsd:string"/>
-	  <xsd:attribute name="query-parameter" type="xsd:string" use="required"/>
-	  <xsd:attribute name="type" type="xsd:string"/>
-	  <xsd:attribute name="jdbc-type" type="xsd:integer"/>
-	  <xsd:attribute name="jdbc-type-name" type="xsd:string"/>
-	</xsd:complexType>
-	
-	<!-- **************************************************** -->
-	
-	<xsd:simpleType name="direction-type">
-	  <xsd:annotation>
-	    <xsd:documentation>
-	
-        /** 
-         * An enum that is used within the StoredProcedureParameter annotation.
-         * It is used to specify the direction of the stored procedure 
-         * parameters of a named stored procedure query.
-         */
-	      public enum Direction {
-	        /**
-	         * Input parameter
-	         */
-	        IN,
-	
-	        /**
-	         * Output parameter
-	         */
-	        OUT,
-	
-	        /**
-	         * Input and output parameter
-	         */
-	        IN_OUT,
-	
-	        /**
-	         * Output cursor
-	         */
-	        OUT_CURSOR
-	      }
-	
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:restriction base="xsd:token">
-	    <xsd:enumeration value="IN"/>
-	    <xsd:enumeration value="OUT"/>
-	    <xsd:enumeration value="IN_OUT"/>
-	    <xsd:enumeration value="OUT_CURSOR"/>
-	  </xsd:restriction>
-	</xsd:simpleType>
-	
-	<!-- **************************************************** -->
-	
-	<xsd:complexType name="variable-one-to-one">
-    <xsd:annotation>
-      <xsd:documentation>
-				/** 
-				 * Variable one to one mappings are used to represent a pointer 
-				 * references between a java object and an implementer of an interface. 
-				 * This mapping is usually represented by a single pointer (stored in an 
-				 * instance variable) between the source and target objects. In the 
-				 * relational database tables, these mappings are normally implemented 
-				 * using a foreign key and a type code.
-				 * 
-				 * A VariableOneToOne can be specified within an Entity, 
-				 * MappedSuperclass and Embeddable class. 
-				 */ 
-				@Target({METHOD, FIELD}) 
-				@Retention(RUNTIME)
-				public @interface VariableOneToOne {
-				    /**
-				     * (Optional) The interface class that is the target of the 
-				     * association. If not specified it will be inferred from the type 
-				     * of the object being referenced.
-				     */
-				    Class targetInterface() default void.class;
-				    
-				    /**
-				     * (Optional) The operations that must be cascaded to the target of 
-				     * the association.
-				     */
-				    CascadeType[] cascade() default {};
-				    
-				    /**
-				     * (Optional) Defines whether the value of the field or property 
-				     * should be lazily loaded or must be eagerly fetched. The EAGER 
-				     * strategy is a requirement on the persistence provider runtime 
-				     * that the value must be eagerly fetched. The LAZY strategy is a 
-				     * hint to the persistence provider runtime. If not specified, 
-				     * defaults to EAGER.
-				     */
-				    FetchType fetch() default EAGER;
-				    
-				    /**
-				     * (Optional) Whether the association is optional. If set to false 
-				     * then a non-null relationship must always exist.
-				     */
-				    boolean optional() default true;
-				  
-				    /**
-				     * (Optional) The discriminator column will hold the type 
-				     * indicators. If the DiscriminatorColumn is not specified, the name 
-				     * of the discriminator column defaults to "DTYPE" and the 
-				     * discriminator type to STRING.
-				     */
-				    DiscriminatorColumn discriminatorColumn() default @DiscriminatorColumn;
-				    
-            /**
-             * (Optional) The list of discriminator types that can be used with 
-             * this VariableOneToOne. If none are specified then those entities 
-             * within the persistence unit that implement the target interface 
-             * will be added to the list of types. The discriminator type will 
-             * default as follows:
-             *  - If DiscriminatorColumn type is STRING: Entity.name()
-             *  - If DiscriminatorColumn type is CHAR: First letter of the 
-             *    Entity class
-             *  - If DiscriminatorColumn type is INTEGER: The next integer after 
-             *    the highest integer explicitly added.
-             */
-				    DiscriminatorClass[] discriminatorClasses() default {};
-				}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="cascade" type="orm:cascade-type" minOccurs="0"/>
-      <xsd:element name="discriminator-column" type="orm:discriminator-column"
-                   minOccurs="0"/>
-      <xsd:element name="discriminator-class" type="orm:discriminator-class"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="join-column" type="orm:join-column" minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="private-owned" type="orm:emptyType" minOccurs="0"/>
-      <xsd:element name="property" type="orm:property" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="access-methods" type="orm:access-methods" 
-                       minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="target-interface" type="xsd:string"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-    <xsd:attribute name="optional" type="xsd:boolean"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="discriminator-class">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        /** 
-         * A DiscriminatorClass is used within a VariableOneToOne annotation.
-         */ 
-        @Target({}) 
-        @Retention(RUNTIME)
-        public @interface DiscriminatorClass {
-          /**
-           * (Required) The discriminator to be stored on the database. 
-           */
-          String discriminator();
-
-          /**
-           * (Required) The class to the instantiated with the given 
-           * discriminator.
-           */
-          Class value();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="discriminator" type="xsd:string" use="required"/>
-    <xsd:attribute name="value" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-  
-	<xsd:simpleType name="existence-type">
-	  <xsd:annotation>
-	    <xsd:documentation>
-	        /**
-           * The ExistenceChecking annotation is used to specify the type of 
-           * checking EclipseLink should use when updating entities.
-           * 
-           * An existence-checking specification is supported on an Entity or 
-           * MappedSuperclass annotation.
-           */
-          public @interface ExistenceChecking {
-            /**
-             * (Optional) Set the existence check for determining
-             * if an insert or update should occur for an object.
-             */
-             ExistenceType value() default CHECK_CACHE;
-          }
-          
-          /**
-           * Assume that if the objects primary key does not include null and 
-           * it is in the cache, then it must exist.
-           */
-          CHECK_CACHE,
-			
-          /**
-           * Perform does exist check on the database.
-           */
-          CHECK_DATABASE,
-			
-          /**
-           * Assume that if the objects primary key does not include null then 
-           * it must exist. This may be used if the application guarantees or 
-           * does not care about the existence check.
-           */
-          ASSUME_EXISTENCE,
-			
-          /**
-           * Assume that the object does not exist. This may be used if the 
-           * application guarantees or does not care about the existence check.  
-           * This will always force an insert to be called.
-           */
-          ASSUME_NON_EXISTENCE
-		
-      </xsd:documentation>
-    </xsd:annotation>	 
-	  <xsd:restriction base="xsd:token">
-	    <xsd:enumeration value="CHECK_CACHE" />
-	    <xsd:enumeration value="CHECK_DATABASE" />
-	    <xsd:enumeration value="ASSUME_EXISTENCE" />
-	    <xsd:enumeration value="ASSUME_NON_EXISTENCE"/>
-	  </xsd:restriction>
-	</xsd:simpleType>	
-	
-</xsd:schema>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/EclipseLinkJpaProject.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/EclipseLinkJpaProject.java
deleted file mode 100644
index 2fcabd73bd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/EclipseLinkJpaProject.java
+++ /dev/null
@@ -1,41 +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.eclipselink.core;
-
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
-
-/**
- * A JPA project is associated with an Eclipse project (and its corresponding
- * Java project). It holds the "resource" model that corresponds to the various
- * JPA-related resources (the persistence.xml file, its mapping files [orm.xml],
- * and the Java source files). It also holds the "context" model that represents
- * the JPA metadata, as derived from spec-defined defaults, Java source code
- * annotations, and XML descriptors.
- * 
- * 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
-	 * 'META-INF/eclipselink-orm.xml' if that file has the eclipselink ContentType
-	 * 
-	 * @see JptEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_FILE_PATH
-	 */
-	JpaXmlResource getDefaultEclipseLinkOrmXmlResource();
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/EclipseLinkMappingKeys.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/EclipseLinkMappingKeys.java
deleted file mode 100644
index 68e3a96e1e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/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.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/BasicCollectionMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/BasicCollectionMapping.java
deleted file mode 100644
index e396ef0d7c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/BasicCollectionMapping.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.core.context.AttributeMapping;
-
-/**
- * 
- * 
- * 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 BasicCollectionMapping extends AttributeMapping
-{
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/BasicMapMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/BasicMapMapping.java
deleted file mode 100644
index f9a37b3d73..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/BasicMapMapping.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.core.context.AttributeMapping;
-
-/**
- * 
- * 
- * 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 BasicMapMapping extends AttributeMapping
-{
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/CacheCoordinationType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/CacheCoordinationType.java
deleted file mode 100644
index 33bb3c8391..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/CacheCoordinationType.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.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 CacheCoordinationType {
-
-	SEND_OBJECT_CHANGES,
-	INVALIDATE_CHANGED_OBJECTS,
-	SEND_NEW_OBJECTS_WITH_CHANGES,
-	NONE;
-	
-
-	public static CacheCoordinationType fromJavaResourceModel(org.eclipse.jpt.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.eclipselink.core.resource.java.CacheCoordinationType toJavaResourceModel(CacheCoordinationType cacheCoordinationType) {
-		if (cacheCoordinationType == null) {
-			return null;
-		}
-		switch (cacheCoordinationType) {
-			case SEND_OBJECT_CHANGES:
-				return org.eclipse.jpt.eclipselink.core.resource.java.CacheCoordinationType.SEND_OBJECT_CHANGES;
-			case INVALIDATE_CHANGED_OBJECTS:
-				return org.eclipse.jpt.eclipselink.core.resource.java.CacheCoordinationType.INVALIDATE_CHANGED_OBJECTS;
-			case SEND_NEW_OBJECTS_WITH_CHANGES:
-				return org.eclipse.jpt.eclipselink.core.resource.java.CacheCoordinationType.SEND_NEW_OBJECTS_WITH_CHANGES;
-			case NONE:
-				return org.eclipse.jpt.eclipselink.core.resource.java.CacheCoordinationType.NONE;
-			default:
-				throw new IllegalArgumentException("unknown cache coordination type: " + cacheCoordinationType); //$NON-NLS-1$
-		}
-	}
-	
-
-	public static CacheCoordinationType fromOrmResourceModel(org.eclipse.jpt.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.eclipselink.core.resource.orm.CacheCoordinationType toOrmResourceModel(CacheCoordinationType cacheCoordinationType) {
-		if (cacheCoordinationType == null) {
-			return null;
-		}
-		switch (cacheCoordinationType) {
-			case SEND_OBJECT_CHANGES:
-				return org.eclipse.jpt.eclipselink.core.resource.orm.CacheCoordinationType.SEND_OBJECT_CHANGES;
-			case INVALIDATE_CHANGED_OBJECTS:
-				return org.eclipse.jpt.eclipselink.core.resource.orm.CacheCoordinationType.INVALIDATE_CHANGED_OBJECTS;
-			case SEND_NEW_OBJECTS_WITH_CHANGES:
-				return org.eclipse.jpt.eclipselink.core.resource.orm.CacheCoordinationType.SEND_NEW_OBJECTS_WITH_CHANGES;
-			case NONE:
-				return org.eclipse.jpt.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/CacheType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/CacheType.java
deleted file mode 100644
index ade7450182..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/CacheType.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.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 CacheType {
-
-	SOFT_WEAK,
-	HARD_WEAK,
-	WEAK,
-	SOFT,
-	FULL,
-	CACHE,
-	NONE;
-	
-
-	public static CacheType fromJavaResourceModel(org.eclipse.jpt.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.eclipselink.core.resource.java.CacheType toJavaResourceModel(CacheType cacheType) {
-		if (cacheType == null) {
-			return null;
-		}
-		switch (cacheType) {
-			case FULL:
-				return org.eclipse.jpt.eclipselink.core.resource.java.CacheType.FULL;
-			case WEAK:
-				return org.eclipse.jpt.eclipselink.core.resource.java.CacheType.WEAK;
-			case SOFT:
-				return org.eclipse.jpt.eclipselink.core.resource.java.CacheType.SOFT;
-			case SOFT_WEAK:
-				return org.eclipse.jpt.eclipselink.core.resource.java.CacheType.SOFT_WEAK;
-			case HARD_WEAK:
-				return org.eclipse.jpt.eclipselink.core.resource.java.CacheType.HARD_WEAK;
-			case CACHE:
-				return org.eclipse.jpt.eclipselink.core.resource.java.CacheType.CACHE;
-			case NONE:
-				return org.eclipse.jpt.eclipselink.core.resource.java.CacheType.NONE;
-			default:
-				throw new IllegalArgumentException("unknown cache type: " + cacheType); //$NON-NLS-1$
-		}
-	}
-	
-
-	public static CacheType fromOrmResourceModel(org.eclipse.jpt.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.eclipselink.core.resource.orm.CacheType toOrmResourceModel(CacheType cacheType) {
-		if (cacheType == null) {
-			return null;
-		}
-		switch (cacheType) {
-			case FULL:
-				return org.eclipse.jpt.eclipselink.core.resource.orm.CacheType.FULL;
-			case WEAK:
-				return org.eclipse.jpt.eclipselink.core.resource.orm.CacheType.WEAK;
-			case SOFT:
-				return org.eclipse.jpt.eclipselink.core.resource.orm.CacheType.SOFT;
-			case SOFT_WEAK:
-				return org.eclipse.jpt.eclipselink.core.resource.orm.CacheType.SOFT_WEAK;
-			case HARD_WEAK:
-				return org.eclipse.jpt.eclipselink.core.resource.orm.CacheType.HARD_WEAK;
-			case CACHE:
-				return org.eclipse.jpt.eclipselink.core.resource.orm.CacheType.CACHE;
-			case NONE:
-				return org.eclipse.jpt.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/Caching.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/Caching.java
deleted file mode 100644
index 5f9ab68768..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/Caching.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.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 Caching extends JpaContextNode
-{
-	//***************** shared ************************
-	
-	/**
-	 * This is the combination of defaultShared and specifiedShared.
-	 * If getSpecifiedShared() returns null, then return isDefaultShared()
-	 */
-	boolean isShared();
-	
-	boolean isDefaultShared();
-		String DEFAULT_SHARED_PROPERTY = "defaultSharedProperty"; //$NON-NLS-1$
-		boolean DEFAULT_SHARED = true;
-	
-	Boolean getSpecifiedShared();
-	
-	/**
-	 * Setting this to false means that cacheType, cacheSize, alwaysRefresh, 
-	 * refreshOnlyIfNewer, disableHits, cacheCoordinationType will all be set 
-	 * to their default states.  These settings do not apply to a cache that is not shared
-	 * @param newSpecifiedShared
-	 */
-	void setSpecifiedShared(Boolean newSpecifiedShared);
-		String SPECIFIED_SHARED_PROPERTY = "specifiedSharedProperty"; //$NON-NLS-1$
-	
-	
-	//***************** cache type ************************
-		
-	/**
-	 * This is the combination of defaultType and specifiedType.
-	 * If getSpecifiedType() returns null, then return getDefaultType()
-	 */
-	CacheType getType();
-	
-	CacheType getDefaultType();		
-		String DEFAULT_TYPE_PROPERTY = "defaultTypeProperty"; //$NON-NLS-1$
-		CacheType DEFAULT_TYPE = CacheType.SOFT_WEAK;
-		
-	CacheType getSpecifiedType();	
-	void setSpecifiedType(CacheType newSpecifiedType);
-		String SPECIFIED_TYPE_PROPERTY = "specifiedTypeProperty"; //$NON-NLS-1$
-	
-	
-	//***************** size ************************
-			
-	/**
-	 * This is the combination of defaultSize and specifiedSize.
-	 * If getSpecifiedSize() returns null, then return getDefaultSize()
-	 */
-	int getSize();
-
-	int getDefaultSize();
-	int DEFAULT_SIZE = 100;
-		String DEFAULT_SIZE_PROPERTY = "defaultSizeProperty"; //$NON-NLS-1$
-
-	Integer getSpecifiedSize();
-	void setSpecifiedSize(Integer newSpecifiedSize);
-		String SPECIFIED_SIZE_PROPERTY = "spcifiedSizeProperty"; //$NON-NLS-1$
-	
-	//***************** always refresh ************************		
-		
-	/**
-	 * This is the combination of defaultAlwaysRefresh and specifiedAlwaysRefresh.
-	 * If getSpecifiedAlwaysRefresh() returns null, then return isDefaultAlwaysRefresh()
-	 */
-	boolean isAlwaysRefresh();
-	
-	boolean isDefaultAlwaysRefresh();
-		String DEFAULT_ALWAYS_REFRESH_PROPERTY = "defaultAlwaysRefreshProperty"; //$NON-NLS-1$
-		boolean DEFAULT_ALWAYS_REFRESH = false;
-	
-	Boolean getSpecifiedAlwaysRefresh();
-	void setSpecifiedAlwaysRefresh(Boolean newSpecifiedAlwaysRefresh);
-		String SPECIFIED_ALWAYS_REFRESH_PROPERTY = "specifiedAlwaysRefreshProperty"; //$NON-NLS-1$
-
-
-	//***************** refresh only if newer ************************
-		
-	/**
-	 * This is the combination of defaultRefreshOnlyIfNewer and specifiedRefreshOnlyIfNewer.
-	 * If getSpecifiedRefreshOnlyIfNewer() returns null, then return isDefaultRefreshOnlyIfNewer()
-	 */
-	boolean isRefreshOnlyIfNewer();
-	
-	boolean isDefaultRefreshOnlyIfNewer();
-		String DEFAULT_REFRESH_ONLY_IF_NEWER_PROPERTY = "defaultRefreshOnlyIfNewerProperty"; //$NON-NLS-1$
-		boolean DEFAULT_REFRESH_ONLY_IF_NEWER = false;
-	
-	Boolean getSpecifiedRefreshOnlyIfNewer();
-	void setSpecifiedRefreshOnlyIfNewer(Boolean newSpecifiedRefreshOnlyIfNewer);
-		String SPECIFIED_REFRESH_ONLY_IF_NEWER_PROPERTY = "specifiedRefreshOnlyIfNewerProperty"; //$NON-NLS-1$
-
-		
-	//***************** disable hits ************************
-		
-	/**
-	 * This is the combination of defaultDisableHits and specifiedDisableHits.
-	 * If getSpecifiedDisableHits() returns null, then return getDefaultDisableHits()
-	 */
-	boolean isDisableHits();
-	
-	boolean isDefaultDisableHits();
-		String DEFAULT_DISABLE_HITS_PROPERTY = "defaultDisableHitsProperty"; //$NON-NLS-1$
-		boolean DEFAULT_DISABLE_HITS = false;
-	
-	Boolean getSpecifiedDisableHits();
-	void setSpecifiedDisableHits(Boolean newSpecifiedDisableHits);
-		String SPECIFIED_DISABLE_HITS_PROPERTY = "specifiedDisableHitsProperty"; //$NON-NLS-1$
-
-		
-	//***************** coordination type ************************
-	
-	/**
-	 * This is the combination of defaultCoordinationType and specifiedCoordinationType.
-	 * If getSpecifiedCoordinationType() returns null, then return getDefaultCoordinationType()
-	 */
-	CacheCoordinationType getCoordinationType();
-	
-	CacheCoordinationType getDefaultCoordinationType();		
-		String DEFAULT_COORDINATION_TYPE_PROPERTY = "defaultCoordinationTypeProperty"; //$NON-NLS-1$
-		CacheCoordinationType DEFAULT_COORDINATION_TYPE = CacheCoordinationType.SEND_OBJECT_CHANGES;
-		
-	CacheCoordinationType getSpecifiedCoordinationType();	
-	void setSpecifiedCoordinationType(CacheCoordinationType newSpecifiedCoordinationType);
-		String SPECIFIED_COORDINATION_TYPE_PROPERTY = "specifiedCoordinationTypeProperty"; //$NON-NLS-1$
-
-			
-	//***************** existence checking ************************
-	
-	/**
-	 * This is the combination of defaultExistenceType and specifiedExistenceType.
-	 * If getSpecifiedExistenceType() returns null, then return getDefaultExistenceType()
-	 */
-	ExistenceType getExistenceType();
-	
-	ExistenceType getDefaultExistenceType();		
-		String DEFAULT_EXISTENCE_TYPE_PROPERTY = "defaultExistenceTypeProperty"; //$NON-NLS-1$
-		ExistenceType DEFAULT_EXISTENCE_TYPE = ExistenceType.CHECK_DATABASE;
-		
-	ExistenceType getSpecifiedExistenceType();	
-	void setSpecifiedExistenceType(ExistenceType newSpecifiedExistenceType);
-		String SPECIFIED_EXISTENCE_TYPE_PROPERTY = "specifiedExistenceTypeProperty"; //$NON-NLS-1$
-
-		
-	//***************** 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
-	 * @param expiry
-	 */
-	void setExpiry(Integer expiry);
-		String EXPIRY_PROPERTY = "expiryProperty"; //$NON-NLS-1$
-	
-		
-	/**
-	 * 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.
-	 */
-	ExpiryTimeOfDay getExpiryTimeOfDay();
-	
-	/**
-	 * Add Cache expiryTimeOfDay annotation or xml element, this will set 
-	 * Expiry to null as it is not valid to set both expiry and timeOfDayExpiry
-	 */
-	ExpiryTimeOfDay addExpiryTimeOfDay();
-	
-	/**
-	 * Removes the Cache expiryTimeOfDay annotation/xml element
-	 */
-	void removeExpiryTimeOfDay();
-		String EXPIRY_TIME_OF_DAY_PROPERTY = "expiryTimeOfDayProperty"; //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ChangeTracking.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ChangeTracking.java
deleted file mode 100644
index 2f64b2d8b6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ChangeTracking.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.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 ChangeTracking extends JpaContextNode
-{
-	/**
-	 * This is the combination of defaultType and specifiedType.
-	 * If getSpecifiedType() returns null, then return getDefaultType()
-	 */
-	ChangeTrackingType getType();
-	
-	ChangeTrackingType getDefaultType();		
-		String DEFAULT_TYPE_PROPERTY = "defaultTypeProperty"; //$NON-NLS-1$
-		ChangeTrackingType DEFAULT_TYPE = ChangeTrackingType.AUTO;
-		
-	ChangeTrackingType getSpecifiedType();	
-	void setSpecifiedType(ChangeTrackingType newSpecifiedType);
-		String SPECIFIED_TYPE_PROPERTY = "specifiedTypeProperty"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ChangeTrackingType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ChangeTrackingType.java
deleted file mode 100644
index 396500f9f8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ChangeTrackingType.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.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 ChangeTrackingType {
-
-	ATTRIBUTE,
-	OBJECT,
-	DEFERRED,
-	AUTO;
-	
-
-	public static ChangeTrackingType fromJavaResourceModel(org.eclipse.jpt.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.eclipselink.core.resource.java.ChangeTrackingType toJavaResourceModel(ChangeTrackingType changeTrackingType) {
-		if (changeTrackingType == null) {
-			return null;
-		}
-		switch (changeTrackingType) {
-			case ATTRIBUTE:
-				return org.eclipse.jpt.eclipselink.core.resource.java.ChangeTrackingType.ATTRIBUTE;
-			case OBJECT:
-				return org.eclipse.jpt.eclipselink.core.resource.java.ChangeTrackingType.OBJECT;
-			case DEFERRED:
-				return org.eclipse.jpt.eclipselink.core.resource.java.ChangeTrackingType.DEFERRED;
-			case AUTO:
-				return org.eclipse.jpt.eclipselink.core.resource.java.ChangeTrackingType.AUTO;
-			default:
-				throw new IllegalArgumentException("unknown change tracking type: " + changeTrackingType); //$NON-NLS-1$
-		}
-	}
-	
-	public static ChangeTrackingType 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);
-		}
-	}
-	
-	public static XmlChangeTrackingType toOrmResourceModel(ChangeTrackingType 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);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ConversionValue.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ConversionValue.java
deleted file mode 100644
index 0e36428e39..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ConversionValue.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.core.context.JpaContextNode;
-
-/**
- * Corresponds to a ConversionValue 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.1
- * @since 2.1
- */
-public interface ConversionValue extends JpaContextNode
-{
-	String getDataValue();	
-	void setDataValue(String dataValue);
-		String DATA_VALUE_PROPERTY = "dataValueProperty"; //$NON-NLS-1$
-		
-	String getObjectValue();	
-	void setObjectValue(String objectValue);
-		String OBJECT_VALUE_PROPERTY = "objectValueProperty"; //$NON-NLS-1$
-
-	ObjectTypeConverter getParent();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/Convert.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/Convert.java
deleted file mode 100644
index 87a9ff9b04..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/Convert.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.core.context.Converter;
-import org.eclipse.jpt.core.context.JpaContextNode;
-
-/**
- * Corresponds to a Convert 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.1
- * @since 2.1
- */
-public interface Convert extends JpaContextNode, Converter
-{
-	
-	String ECLIPSE_LINK_CONVERTER = "eclipseLinkConverter"; //$NON-NLS-1$
-	
-	String getConverterName();
-	
-	String getDefaultConverterName();
-		String DEFAULT_CONVERTER_NAME_PROPERTY = "defaultConverterNameProperty"; //$NON-NLS-1$
-
-	String getSpecifiedConverterName();
-	
-	void setSpecifiedConverterName(String converterName);
-		String SPECIFIED_CONVERTER_NAME_PROPERTY = "specifiedConverterNameProperty"; //$NON-NLS-1$
-	
-	/**
-	 * Reserved name for specifying a serialized object converter.  In this
-	 * case there does not need to be a corresponding @CustomConverter defined.
-	 */
-	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 a no-args constructor
-	 * In this case there does not need to be a corresponding @CustomConverter defined.
-	 */
-	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 there does not need to be a corresponding @CustomConverter defined.
-	 */
-	String NO_CONVERTER = "none"; //$NON-NLS-1$
-	
-	String[] RESERVED_CONVERTER_NAMES = {NO_CONVERTER, CLASS_INSTANCE_CONVERTER, SERIALIZED_CONVERTER};
-	
-	String DEFAULT_CONVERTER_NAME = NO_CONVERTER;
-
-	/**
-	 * This will return null if there is no converter specified on the mapping
-	 * @return
-	 */
-	EclipseLinkConverter getConverter();
-		String CONVERTER_PROPERTY = "converterProperty"; //$NON-NLS-1$
-	
-	/**
-	 * Possible values for converter type are:
-	 * {@value EclipseLinkNamedConverter#TYPE_CONVERTER}
-	 * {@value EclipseLinkNamedConverter#STRUCT_CONVERTER}
-	 * {@value EclipseLinkNamedConverter#CUSTOM_CONVERTER}
-	 * {@value EclipseLinkNamedConverter#NO_CONVERTER}
-	 * {@value EclipseLinkNamedConverter#OBJECT_TYPE_CONVERTER}
-	 * @param converterType
-	 */
-	void setConverter(String converterType);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/CustomConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/CustomConverter.java
deleted file mode 100644
index ccf8a356e6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/CustomConverter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-/**
- * Corresponds to a CustomConverter 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.1
- * @since 2.1
- */
-public interface CustomConverter extends EclipseLinkConverter
-{
-		
-	String getConverterClass();	
-	void setConverterClass(String converterClass);
-		String CONVERTER_CLASS_PROPERTY = "converterClassProperty"; //$NON-NLS-1$
-		String ECLIPSELINK_CONVERTER_CLASS_NAME = "org.eclipse.persistence.mappings.converters.Converter"; //$NON-NLS-1$
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/Customizer.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/Customizer.java
deleted file mode 100644
index d302f566ab..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/Customizer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.core.context.JpaContextNode;
-
-/**
- * Corresponds to a Customizer 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.1
- * @since 2.1
- */
-public interface Customizer extends JpaContextNode
-{
-	
-	String getCustomizerClass();
-	
-	String getDefaultCustomizerClass();
-		String DEFAULT_CUSTOMIZER_CLASS_PROPERTY = "defaultCustomizerClassProperty"; //$NON-NLS-1$
-	
-	String getSpecifiedCustomizerClass();	
-	void setSpecifiedCustomizerClass(String customizerClass);
-		String SPECIFIED_CUSTOMIZER_CLASS_PROPERTY = "specifiedCustomizerClassProperty"; //$NON-NLS-1$
-		String ECLIPSELINK_DESCRIPTOR_CUSTOMIZER_CLASS_NAME = "org.eclipse.persistence.config.DescriptorCustomizer"; //$NON-NLS-1$
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkBasicMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkBasicMapping.java
deleted file mode 100644
index 3bd5ae1909..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkBasicMapping.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.core.context.BasicMapping;
-
-/**
- * 
- * 
- * 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
-{
-	Mutable getMutable();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkConverter.java
deleted file mode 100644
index b47a1af53c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkConverter.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.core.context.JpaContextNode;
-
-/**
- * Corresponds to a *CustomConverter 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.1
- * @since 2.1
- */
-public interface EclipseLinkConverter extends JpaContextNode
-{
-	/**
-	 * Return a string that represents the type of converter.
-	 * Possibilities are below, NO_CONVERTER, CUSTOM_CONVERTER, 
-	 * OBJECT_TYPE_CONVERTER, STRUCT_CONVERTER, TYPE_CONVERTER
-	 */
-	String getType();
-		String NO_CONVERTER = "noConverter"; //$NON-NLS-1$
-		String CUSTOM_CONVERTER = "customConverter"; //$NON-NLS-1$
-		String OBJECT_TYPE_CONVERTER = "objectTypeConverter"; //$NON-NLS-1$
-		String STRUCT_CONVERTER = "structConverter"; //$NON-NLS-1$
-		String TYPE_CONVERTER = "typeConverter"; //$NON-NLS-1$
-	
-	String getName();	
-	void setName(String name);
-		String NAME_PROPERTY = "nameProperty"; //$NON-NLS-1$
-	
-	/**
-	 * Return whether the converter definition overrides the definition of the 
-	 * given converter
-	 * (e.g. a converter defined in orm.xml overrides one defined in java).
-	 */
-	boolean overrides(EclipseLinkConverter converter);
-	
-	/**
-	 * Return whether the converter is a duplicate of the given converter.
-	 * A converter is not a duplicate of another converter if is the same exact converter,
-	 * if it is a nameless converter (which is an error condition), or if it overrides 
-	 * or is overridden by the other converter. 
-	 */
-	boolean duplicates(EclipseLinkConverter converter);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkEmbeddable.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkEmbeddable.java
deleted file mode 100644
index 03c1395da4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkEmbeddable.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.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.1
- * @since 2.1
- */
-public interface EclipseLinkEmbeddable extends Embeddable
-{
-	Customizer getCustomizer();
-	
-	ChangeTracking getChangeTracking();
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkEntity.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkEntity.java
deleted file mode 100644
index c6683a695c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkEntity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.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.1
- * @since 2.1
- */
-public interface EclipseLinkEntity extends Entity
-{
-	Caching getCaching();
-	
-	ReadOnly getReadOnly();
-	
-	Customizer getCustomizer();
-	
-	ChangeTracking getChangeTracking();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkIdMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkIdMapping.java
deleted file mode 100644
index c5b6ac9cc5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkIdMapping.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.core.context.IdMapping;
-
-/**
- * 
- * 
- * 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
-{
-	Mutable getMutable();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkMappedSuperclass.java
deleted file mode 100644
index 4ab4a1a6a2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkMappedSuperclass.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.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.1
- * @since 2.1
- */
-public interface EclipseLinkMappedSuperclass extends MappedSuperclass
-{
-	Caching getCaching();
-	
-	ReadOnly getReadOnly();
-	
-	Customizer getCustomizer();
-	
-	ChangeTracking getChangeTracking();
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkOneToManyMapping.java
deleted file mode 100644
index 3c1a6a62a4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkOneToManyMapping.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.core.context.OneToManyMapping;
-
-/**
- * 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
-{
-	EclipseLinkOneToManyRelationshipReference getRelationshipReference();
-	
-	PrivateOwned getPrivateOwned();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkOneToManyRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkOneToManyRelationshipReference.java
deleted file mode 100644
index fd1017288a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkOneToManyRelationshipReference.java
+++ /dev/null
@@ -1,33 +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.eclipselink.core.context;
-
-import org.eclipse.jpt.core.context.JoinColumnEnabledRelationshipReference;
-import org.eclipse.jpt.core.context.OneToManyRelationshipReference;
-import org.eclipse.jpt.core.context.RelationshipReference;
-
-
-/**
- * Represents the {@link RelationshipReference} of an 
- * {@link EclipseLinkOneToManyMapping}
- * 
- * 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 EclipseLinkOneToManyRelationshipReference
-	extends OneToManyRelationshipReference,
-		JoinColumnEnabledRelationshipReference
-{
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkOneToOneMapping.java
deleted file mode 100644
index be1c9b3e2f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkOneToOneMapping.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.core.context.OneToOneMapping;
-
-/**
- * 
- * 
- * 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
-{
-	PrivateOwned getPrivateOwned();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkRelationshipMapping.java
deleted file mode 100644
index 26fc3f9711..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkRelationshipMapping.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.core.context.RelationshipMapping;
-
-/**
- * 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
-{
-	JoinFetch getJoinFetch();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkVersionMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkVersionMapping.java
deleted file mode 100644
index 09327bb126..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/EclipseLinkVersionMapping.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.core.context.VersionMapping;
-
-/**
- * 
- * 
- * 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
-{
-	Mutable getMutable();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ExistenceType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ExistenceType.java
deleted file mode 100644
index a1e3807511..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ExistenceType.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.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 ExistenceType {
-
-    CHECK_CACHE,
-    CHECK_DATABASE,
-    ASSUME_EXISTENCE,
-    ASSUME_NON_EXISTENCE;
-	
-
-	public static ExistenceType fromJavaResourceModel(org.eclipse.jpt.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.eclipselink.core.resource.java.ExistenceType toJavaResourceModel(ExistenceType existenceType) {
-		if (existenceType == null) {
-			return null;
-		}
-		switch (existenceType) {
-			case CHECK_CACHE:
-				return org.eclipse.jpt.eclipselink.core.resource.java.ExistenceType.CHECK_CACHE;
-			case CHECK_DATABASE:
-				return org.eclipse.jpt.eclipselink.core.resource.java.ExistenceType.CHECK_DATABASE;
-			case ASSUME_EXISTENCE:
-				return org.eclipse.jpt.eclipselink.core.resource.java.ExistenceType.ASSUME_EXISTENCE;
-			case ASSUME_NON_EXISTENCE:
-				return org.eclipse.jpt.eclipselink.core.resource.java.ExistenceType.ASSUME_NON_EXISTENCE;
-			default:
-				throw new IllegalArgumentException("unknown existence type: " + existenceType); //$NON-NLS-1$
-		}
-	}
-	
-
-	public static ExistenceType fromOrmResourceModel(org.eclipse.jpt.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.eclipselink.core.resource.orm.ExistenceType toOrmResourceModel(ExistenceType existenceType) {
-		if (existenceType == null) {
-			return null;
-		}
-		switch (existenceType) {
-			case CHECK_CACHE:
-				return org.eclipse.jpt.eclipselink.core.resource.orm.ExistenceType.CHECK_CACHE;
-			case CHECK_DATABASE:
-				return org.eclipse.jpt.eclipselink.core.resource.orm.ExistenceType.CHECK_DATABASE;
-			case ASSUME_EXISTENCE:
-				return org.eclipse.jpt.eclipselink.core.resource.orm.ExistenceType.ASSUME_EXISTENCE;
-			case ASSUME_NON_EXISTENCE:
-				return org.eclipse.jpt.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ExpiryTimeOfDay.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ExpiryTimeOfDay.java
deleted file mode 100644
index a5bbdbbfd7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ExpiryTimeOfDay.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.core.context.JpaContextNode;
-
-/**
- * Corresponds to a TimeOfDay 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.1
- * @since 2.1
- */
-public interface ExpiryTimeOfDay extends JpaContextNode
-{
-	
-	Integer getHour();
-	void setHour(Integer hour);
-		String HOUR_PROPERTY = "hourProperty"; //$NON-NLS-1$
-
-	Integer getMinute();
-	void setMinute(Integer minute);
-		String MINUTE_PROPERTY = "minuteProperty"; //$NON-NLS-1$
-	
-	Integer getSecond();
-	void setSecond(Integer second);
-		String SECOND_PROPERTY = "secondProperty"; //$NON-NLS-1$
-	
-	Integer getMillisecond();
-	void setMillisecond(Integer millisecond);
-		String MILLISECOND_PROPERTY = "millisecondProperty"; //$NON-NLS-1$
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/JoinFetch.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/JoinFetch.java
deleted file mode 100644
index da4e7ba413..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/JoinFetch.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.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 JoinFetch extends JpaContextNode
-{
-	JoinFetchType getValue();
-	void setValue(JoinFetchType newJoinFetchValue);
-		String VALUE_PROPERTY = "JoinFetch.valueProperty"; //$NON-NLS-1$
-		JoinFetchType DEFAULT_VALUE = JoinFetchType.INNER;
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/JoinFetchType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/JoinFetchType.java
deleted file mode 100644
index c01b4edfe8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/JoinFetchType.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.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 JoinFetchType {
-
-	INNER,
-	OUTER;
-	
-
-	public static JoinFetchType fromJavaResourceModel(org.eclipse.jpt.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.eclipselink.core.resource.java.JoinFetchType toJavaResourceModel(JoinFetchType joinFetchType) {
-		if (joinFetchType == null) {
-			return null;
-		}
-		switch (joinFetchType) {
-			case INNER:
-				return org.eclipse.jpt.eclipselink.core.resource.java.JoinFetchType.INNER;
-			case OUTER:
-				return org.eclipse.jpt.eclipselink.core.resource.java.JoinFetchType.OUTER;
-			default:
-				throw new IllegalArgumentException("unknown join fetch type: " + joinFetchType); //$NON-NLS-1$
-		}
-	}
-	
-
-	public static JoinFetchType 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(JoinFetchType 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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/Mutable.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/Mutable.java
deleted file mode 100644
index 1913055746..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/Mutable.java
+++ /dev/null
@@ -1,34 +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.eclipselink.core.context;
-
-import org.eclipse.jpt.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 Mutable extends JpaContextNode
-{
-	boolean isMutable();
-	
-	boolean isDefaultMutable();
-		String DEFAULT_MUTABLE_PROPERTY = "defaultMutable";  //$NON-NLS-1$
-	
-	Boolean getSpecifiedMutable();
-	void setSpecifiedMutable(Boolean newSpecifiedMutable);
-		String SPECIFIED_MUTABLE_PROPERTY = "specifiedMutable";  //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ObjectTypeConverter.java
deleted file mode 100644
index e659130306..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ObjectTypeConverter.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import java.util.ListIterator;
-
-/**
- * Corresponds to a ObjectTypeConverter 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.1
- * @since 2.1
- */
-public interface ObjectTypeConverter extends EclipseLinkConverter
-{
-	String getDataType();	
-	void setDataType(String dataType);
-		String DATA_TYPE_PROPERTY = "dataTypeProperty"; //$NON-NLS-1$
-		
-	String getObjectType();	
-	void setObjectType(String objectType);
-		String OBJECT_TYPE_PROPERTY = "objectTypeProperty"; //$NON-NLS-1$
-
-	
-	// **************** conversion values **************************************
-
-	/**
-	 * Return a list iterator of the conversion values.
-	 * This will not be null.
-	 */
-	<T extends ConversionValue> ListIterator<T> conversionValues();
-
-	/**
-	 * Return the number of conversion values.
-	 */
-	int conversionValuesSize();
-
-	/**
-	 * Add a conversion value to the object type mapping return the object 
-	 * representing it.
-	 */
-	ConversionValue addConversionValue(int index);
-
-	/**
-	 * Add a conversion value to the object type mapping return the object 
-	 * representing it.
-	 */
-	ConversionValue addConversionValue();
-
-	/**
-	 * Remove the conversion value at the given index from the entity.
-	 */
-	void removeConversionValue(int index);
-
-	/**
-	 * Remove the conversion value from the entity.
-	 */
-	void removeConversionValue(ConversionValue conversionValue);
-
-	/**
-	 * Move the conversion values from the source index to the target index.
-	 */
-	void moveConversionValue(int targetIndex, int sourceIndex);
-		String CONVERSION_VALUES_LIST = "conversionValuesList"; //$NON-NLS-1$
-
-	
-	/**
-	 * Returns a ListIterator of the ConversionValue dataValues.
-	 * @return
-	 */
-	ListIterator<String> dataValues();
-	
-	
-	// **************** default object value **************************************
-	
-	String getDefaultObjectValue();
-	void setDefaultObjectValue(String defaultObjectValue);
-		String DEFAULT_OBJECT_VALUE_PROPERTY = "defaultObjectValueProperty"; //$NON-NLS-1$
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/PrivateOwned.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/PrivateOwned.java
deleted file mode 100644
index edae11e299..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/PrivateOwned.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.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 PrivateOwned extends JpaContextNode
-{
-	boolean isPrivateOwned();
-	void setPrivateOwned(boolean privateOwned);
-		String PRIVATE_OWNED_PROPERTY = "privateOwnedProperty"; //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ReadOnly.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ReadOnly.java
deleted file mode 100644
index 78f3ceea33..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/ReadOnly.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.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 ReadOnly 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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/StructConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/StructConverter.java
deleted file mode 100644
index c351d591c8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/StructConverter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-/**
- * Corresponds to a StructConverter 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.1
- * @since 2.1
- */
-public interface StructConverter extends EclipseLinkConverter
-{
-	String getConverterClass();	
-	void setConverterClass(String converterClass);
-		String CONVERTER_CLASS_PROPERTY = "converterClassProperty"; //$NON-NLS-1$
-		String ECLIPSELINK_STRUCT_CONVERTER_CLASS_NAME = "org.eclipse.persistence.platform.database.converters.StructConverter"; //$NON-NLS-1$
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/TransformationMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/TransformationMapping.java
deleted file mode 100644
index d2f8015cc3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/TransformationMapping.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-import org.eclipse.jpt.core.context.AttributeMapping;
-
-/**
- * 
- * 
- * 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 TransformationMapping extends AttributeMapping
-{
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/TypeConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/TypeConverter.java
deleted file mode 100644
index 7297776e04..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/TypeConverter.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context;
-
-/**
- * Corresponds to a TypeConverter 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.1
- * @since 2.1
- */
-public interface TypeConverter extends EclipseLinkConverter
-{
-	String getDataType();	
-	void setDataType(String dataType);
-		String DATA_TYPE_PROPERTY = "dataTypeProperty"; //$NON-NLS-1$
-		
-	String getObjectType();	
-	void setObjectType(String objectType);
-		String OBJECT_TYPE_PROPERTY = "objectTypeProperty"; //$NON-NLS-1$
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/VariableOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/VariableOneToOneMapping.java
deleted file mode 100644
index 21068b5d19..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/VariableOneToOneMapping.java
+++ /dev/null
@@ -1,28 +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.eclipselink.core.context;
-
-import org.eclipse.jpt.core.context.AttributeMapping;
-
-/**
- * 
- * 
- * 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 VariableOneToOneMapping extends AttributeMapping
-{
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/java/EclipseLinkJavaEmbeddable.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/java/EclipseLinkJavaEmbeddable.java
deleted file mode 100644
index 7ce177464a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/java/EclipseLinkJavaEmbeddable.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context.java;
-
-import org.eclipse.jpt.core.context.java.JavaEmbeddable;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkEmbeddable;
-
-/**
- * 
- * 
- * 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 EclipseLinkJavaEmbeddable extends EclipseLinkEmbeddable, JavaEmbeddable
-{
-	JavaConverterHolder getConverterHolder();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/java/EclipseLinkJavaEntity.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/java/EclipseLinkJavaEntity.java
deleted file mode 100644
index c8b60cc7bd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/java/EclipseLinkJavaEntity.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context.java;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.java.JavaAssociationOverride;
-import org.eclipse.jpt.core.context.java.JavaAttributeOverride;
-import org.eclipse.jpt.core.context.java.JavaEntity;
-import org.eclipse.jpt.core.context.java.JavaNamedNativeQuery;
-import org.eclipse.jpt.core.context.java.JavaNamedQuery;
-import org.eclipse.jpt.core.context.java.JavaPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaSecondaryTable;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkEntity;
-
-/**
- * 
- * 
- * 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 EclipseLinkJavaEntity extends EclipseLinkEntity, JavaEntity
-{
-	JavaConverterHolder getConverterHolder();
-
-	JavaCaching getCaching();
-	
-	// included these to prevent warnings on the implementation
-	ListIterator<JavaSecondaryTable> secondaryTables();	
-	ListIterator<JavaSecondaryTable> specifiedSecondaryTables();
-	ListIterator<JavaPrimaryKeyJoinColumn> primaryKeyJoinColumns();
-	ListIterator<JavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns();
-	ListIterator<JavaAttributeOverride> attributeOverrides();
-	ListIterator<JavaAttributeOverride> specifiedAttributeOverrides();
-	ListIterator<JavaAttributeOverride> virtualAttributeOverrides();
-	ListIterator<JavaAssociationOverride> associationOverrides();
-	ListIterator<JavaAssociationOverride> specifiedAssociationOverrides();
-	ListIterator<JavaAssociationOverride> virtualAssociationOverrides();
-	ListIterator<JavaNamedQuery> namedQueries();
-	ListIterator<JavaNamedNativeQuery> namedNativeQueries();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/java/EclipseLinkJavaMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/java/EclipseLinkJavaMappedSuperclass.java
deleted file mode 100644
index 2b8aab7da4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/java/EclipseLinkJavaMappedSuperclass.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.context.java.JavaMappedSuperclass;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkMappedSuperclass;
-
-/**
- * 
- * 
- * 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 EclipseLinkJavaMappedSuperclass extends EclipseLinkMappedSuperclass, JavaMappedSuperclass
-{
-	JavaConverterHolder getConverterHolder();
-	
-	//********* covariant overrides ***********
-
-	JavaCaching getCaching();
-	
-	Iterator<JavaPersistentAttribute> overridableAttributes();
-	Iterator<JavaPersistentAttribute> overridableAssociations();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/java/JavaCaching.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/java/JavaCaching.java
deleted file mode 100644
index efee968cba..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/java/JavaCaching.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context.java;
-
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.eclipselink.core.context.Caching;
-
-/**
- * 
- * 
- * 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 JavaCaching extends Caching, 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 hasExistenceChecking();
-	void setExistenceChecking(boolean existenceChecking);
-		String EXISTENCE_CHECKING_PROPERTY = "existenceCheckingProperty"; //$NON-NLS-1$
-	
-	/**
-	 * Initialize the EclipseLinkJavaCaching context model object to match the CacheAnnotation 
-	 * resource model object. This should be called immediately after object creation.
-	 */
-	void initialize(JavaResourcePersistentType resourcePersistentType);
-	
-	/**
-	 * Update the EclipseLinkJavaCaching context model object to match the CacheAnnotation 
-	 * resource model object. see {@link org.eclipse.jpt.core.JpaProject#update()}
-	 */
-	void update(JavaResourcePersistentType resourcePersistentType);	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/java/JavaConverterHolder.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/java/JavaConverterHolder.java
deleted file mode 100644
index 3feaf70186..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/java/JavaConverterHolder.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.context.java;
-
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.eclipselink.core.context.CustomConverter;
-import org.eclipse.jpt.eclipselink.core.context.ObjectTypeConverter;
-import org.eclipse.jpt.eclipselink.core.context.StructConverter;
-import org.eclipse.jpt.eclipselink.core.context.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.2
- */
-public interface JavaConverterHolder extends JavaJpaContextNode
-{
-	/**
-	 * Initialize the JavaConverterHolder context model object to match the JavaResourcePersistentType 
-	 * resource model object. This should be called immediately after object creation.
-	 */
-	void initialize(JavaResourcePersistentType jrpt);
-	
-	/**
-	 * Update the JavaConverterHolder context model object to match the JavaResourcePersistentType 
-	 * resource model object. see {@link org.eclipse.jpt.core.JpaProject#update()}
-	 */
-	void update(JavaResourcePersistentType jrpt);
-	
-	CustomConverter getCustomConverter();
-	CustomConverter addCustomConverter();
-	void removeCustomConverter();
-	String CUSTOM_CONVERTER_PROPERTY = "customConverterProperty"; //$NON-NLS-1$
-	
-	ObjectTypeConverter getObjectTypeConverter();
-	ObjectTypeConverter addObjectTypeConverter();
-	void removeObjectTypeConverter();
-	String OBJECT_TYPE_CONVERTER_PROPERTY = "objectTypeConverterProperty"; //$NON-NLS-1$
-	
-	StructConverter getStructConverter();
-	StructConverter addStructConverter();
-	void removeStructConverter();
-	String STRUCT_CONVERTER_PROPERTY = "structConverterProperty"; //$NON-NLS-1$
-	
-	TypeConverter getTypeConverter();
-	TypeConverter addTypeConverter();
-	void removeTypeConverter();
-	String TYPE_CONVERTER_PROPERTY = "typeCnverterProperty"; //$NON-NLS-1$
-	
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/orm/OrmCaching.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/orm/OrmCaching.java
deleted file mode 100644
index 4300086e4b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/context/orm/OrmCaching.java
+++ /dev/null
@@ -1,19 +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.eclipselink.core.context.orm;
-
-import org.eclipse.jpt.core.context.XmlContextNode;
-import org.eclipse.jpt.eclipselink.core.context.Caching;
-
-public interface OrmCaching
-	extends Caching, XmlContextNode
-{
-	// just combine two interfaces
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/DefaultEclipseLinkJpaValidationMessages.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/DefaultEclipseLinkJpaValidationMessages.java
deleted file mode 100644
index a8198e009f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/DefaultEclipseLinkJpaValidationMessages.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal;
-
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.utility.TextRange;
-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);
-		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
-			JptCorePlugin.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.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1JpaAnnotationDefinitionProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1JpaAnnotationDefinitionProvider.java
deleted file mode 100644
index 5c75079c06..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1JpaAnnotationDefinitionProvider.java
+++ /dev/null
@@ -1,64 +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.eclipselink.core.internal;
-
-import java.util.List;
-import org.eclipse.jpt.core.JpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.core.internal.platform.AbstractJpaAnnotationDefintionProvider;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-
-/**
- * Provides annotations for 1.1 EclipseLink which includes JPA annotations, JPA 2.0 annotation,
- * EclipseLink 1.0 annotation and EclipseLink 1.1 annotations 
- */
-public class EclipseLink1_1JpaAnnotationDefinitionProvider
-	extends AbstractJpaAnnotationDefintionProvider
-{
-	// singleton
-	private static final JpaAnnotationDefinitionProvider INSTANCE = new EclipseLink1_1JpaAnnotationDefinitionProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JpaAnnotationDefinitionProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1JpaAnnotationDefinitionProvider() {
-		super();
-	}
-
-	@Override
-	protected void addTypeMappingAnnotationDefinitionsTo(List<AnnotationDefinition> definitions) {
-		//none
-	}
-	
-	@Override
-	protected void addTypeSupportingAnnotationDefinitionsTo(List<AnnotationDefinition> definitions) {
-		//TODO commented out this code for now, we don't want the java Access annotation work to be exposed yet.
-		//EclipseLink has backed out its JPA 2.0 annotation support until it is released or licensing issues are cleared up.
-//		definitions.add(AccessAnnotationDefinition.instance());
-	}
-
-	@Override
-	protected void addAttributeMappingAnnotationDefinitionsTo(List<AnnotationDefinition> definitions) {
-		//none
-	}
-	
-	@Override
-	protected void addAttributeSupportingAnnotationDefinitionsTo(List<AnnotationDefinition> definitions) {
-		//TODO commented out this code for now, we don't want the java Access annotation work to be exposed yet.
-		//EclipseLink has backed out its JPA 2.0 annotation support until it is released or licensing issues are cleared up.
-//		definitions.add(AccessAnnotationDefinition.instance());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1JpaFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1JpaFactory.java
deleted file mode 100644
index af09c592d8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1JpaFactory.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.eclipselink.core.internal;
-
-import org.eclipse.jpt.core.context.MappingFile;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaBasicMapping;
-import org.eclipse.jpt.core.context.java.JavaEmbeddedIdMapping;
-import org.eclipse.jpt.core.context.java.JavaEmbeddedMapping;
-import org.eclipse.jpt.core.context.java.JavaIdMapping;
-import org.eclipse.jpt.core.context.java.JavaManyToManyMapping;
-import org.eclipse.jpt.core.context.java.JavaManyToOneMapping;
-import org.eclipse.jpt.core.context.java.JavaOneToOneMapping;
-import org.eclipse.jpt.core.context.java.JavaTransientMapping;
-import org.eclipse.jpt.core.context.java.JavaVersionMapping;
-import org.eclipse.jpt.core.context.orm.EntityMappings;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmBasicMapping;
-import org.eclipse.jpt.core.context.orm.OrmEmbeddedIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmEmbeddedMapping;
-import org.eclipse.jpt.core.context.orm.OrmIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmManyToManyMapping;
-import org.eclipse.jpt.core.context.orm.OrmManyToOneMapping;
-import org.eclipse.jpt.core.context.orm.OrmOneToManyMapping;
-import org.eclipse.jpt.core.context.orm.OrmOneToOneMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.context.orm.OrmVersionMapping;
-import org.eclipse.jpt.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaOneToManyMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaBasicCollectionMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaBasicMapMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaTransformationMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaVariableOneToOneMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1EntityMappingsImpl;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmPersistentAttribute;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmPersistentType;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmXml;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1VirtualXmlBasic;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1VirtualXmlBasicCollection;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1VirtualXmlBasicMap;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1VirtualXmlEmbedded;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1VirtualXmlEmbeddedId;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1VirtualXmlId;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1VirtualXmlManyToMany;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1VirtualXmlManyToOne;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1VirtualXmlNullAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1VirtualXmlOneToMany;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1VirtualXmlOneToOne;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1VirtualXmlTransformation;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1VirtualXmlTransient;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1VirtualXmlVariableOneToOne;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1VirtualXmlVersion;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkEntityMappings;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmBasicCollectionMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmBasicMapMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmTransformationMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmVariableOneToOneMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedId;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlId;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOne;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransient;
-
-public class EclipseLink1_1JpaFactory
-	extends EclipseLinkJpaFactory
-{
-	protected EclipseLink1_1JpaFactory() {
-		super();
-	}
-	
-	// **************** Context Nodes ******************************************
-	
-	@Override
-	public MappingFile buildEclipseLinkMappingFile(MappingFileRef parent, JpaXmlResource resource) {
-		return this.buildEclipseLinkOrmXml(parent, resource);
-	}
-	
-	public MappingFile buildEclipseLink1_1MappingFile(MappingFileRef parent, JpaXmlResource resource) {
-		return this.buildEclipseLink1_1OrmXml(parent, resource);
-	}
-	
-	protected EclipseLink1_1OrmXml buildEclipseLink1_1OrmXml(MappingFileRef parent, JpaXmlResource resource) {
-		return new EclipseLink1_1OrmXml(parent, resource);
-	}
-	
-	
-	// **************** Java Context Model *************************************
-	
-	//TODO commented out this code for now, we don't want the java Access annotation work to be exposed yet.
-	//EclipseLink has backed out its JPA 2.0 annotation support until it is released or licensing issues are cleared up.
-//
-//	@Override
-//	public JavaPersistentType buildJavaPersistentType(Owner owner, JavaResourcePersistentType jrpt) {
-//		return new EclipseLink1_1JavaPersistentType(owner, jrpt);
-//	}
-//	
-//	@Override
-//	public JavaPersistentAttribute buildJavaPersistentAttribute(PersistentType parent, JavaResourcePersistentAttribute jrpa) {
-//		return new EclipseLink1_1JavaPersistentAttribute(parent, jrpa);
-//	}
-	
-	// ********** EclipseLink-specific ORM Virtual Resource Model **********
-	
-	public XmlBasic buildEclipseLink1_1VirtualXmlBasic(OrmTypeMapping ormTypeMapping, JavaBasicMapping javaBasicMapping) {
-		return new EclipseLink1_1VirtualXmlBasic(ormTypeMapping, javaBasicMapping);
-	}
-	
-	public XmlId buildEclipseLink1_1VirtualXmlId(OrmTypeMapping ormTypeMapping, JavaIdMapping javaIdMapping) {
-		return new EclipseLink1_1VirtualXmlId(ormTypeMapping, javaIdMapping);
-	}
-	
-	public XmlEmbeddedId buildEclipseLink1_1VirtualXmlEmbeddedId(OrmTypeMapping ormTypeMapping, JavaEmbeddedIdMapping javaEmbeddedIdMapping) {
-		return new EclipseLink1_1VirtualXmlEmbeddedId(ormTypeMapping, javaEmbeddedIdMapping);
-	}
-	
-	public XmlEmbedded buildEclipseLink1_1VirtualXmlEmbedded(OrmTypeMapping ormTypeMapping, JavaEmbeddedMapping javaEmbeddedMapping) {
-		return new EclipseLink1_1VirtualXmlEmbedded(ormTypeMapping, javaEmbeddedMapping);
-	}
-	
-	public XmlManyToMany buildEclipseLink1_1VirtualXmlManyToMany(OrmTypeMapping ormTypeMapping, JavaManyToManyMapping javaManyToManyMapping) {
-		return new EclipseLink1_1VirtualXmlManyToMany(ormTypeMapping, javaManyToManyMapping);
-	}
-	
-	public XmlManyToOne buildEclipseLink1_1VirtualXmlManyToOne(OrmTypeMapping ormTypeMapping, JavaManyToOneMapping javaManyToOneMapping) {
-		return new EclipseLink1_1VirtualXmlManyToOne(ormTypeMapping, javaManyToOneMapping);
-	}
-	
-	public XmlOneToMany buildEclipseLink1_1VirtualXmlOneToMany(OrmTypeMapping ormTypeMapping, EclipseLinkJavaOneToManyMapping javaOneToManyMapping) {
-		return new EclipseLink1_1VirtualXmlOneToMany(ormTypeMapping, javaOneToManyMapping);
-	}
-	
-	public XmlOneToOne buildEclipseLink1_1VirtualXmlOneToOne(OrmTypeMapping ormTypeMapping, JavaOneToOneMapping javaOneToOneMapping) {
-		return new EclipseLink1_1VirtualXmlOneToOne(ormTypeMapping, javaOneToOneMapping);
-	}
-	
-	public XmlVersion buildEclipseLink1_1VirtualXmlVersion(OrmTypeMapping ormTypeMapping, JavaVersionMapping javaVersionMapping) {
-		return new EclipseLink1_1VirtualXmlVersion(ormTypeMapping, javaVersionMapping);
-	}
-	
-	public XmlBasicCollection buildEclipseLink1_1VirtualXmlBasicCollection(OrmTypeMapping ormTypeMapping, JavaBasicCollectionMapping javaBasicCollectionMapping) {
-		return new EclipseLink1_1VirtualXmlBasicCollection(ormTypeMapping, javaBasicCollectionMapping);
-	}
-	
-	public XmlBasicMap buildEclipseLink1_1VirtualXmlBasicMap(OrmTypeMapping ormTypeMapping, JavaBasicMapMapping javaBasicMapMapping) {
-		return new EclipseLink1_1VirtualXmlBasicMap(ormTypeMapping, javaBasicMapMapping);
-	}
-	
-	public XmlTransformation buildEclipseLink1_1VirtualXmlTransformation(OrmTypeMapping ormTypeMapping, JavaTransformationMapping javaTransformationMapping) {
-		return new EclipseLink1_1VirtualXmlTransformation(ormTypeMapping, javaTransformationMapping);
-	}
-	
-	public XmlTransient buildEclipseLink1_1VirtualXmlTransient(OrmTypeMapping ormTypeMapping, JavaTransientMapping javaTransientMapping) {
-		return new EclipseLink1_1VirtualXmlTransient(ormTypeMapping, javaTransientMapping);
-	}
-	
-	public XmlVariableOneToOne buildEclipseLink1_1VirtualXmlVariableOneToOne(OrmTypeMapping ormTypeMapping, JavaVariableOneToOneMapping javaVariableOneToOneMapping) {
-		return new EclipseLink1_1VirtualXmlVariableOneToOne(ormTypeMapping, javaVariableOneToOneMapping);
-	}
-	
-	public XmlNullAttributeMapping buildEclipseLink1_1VirtualXmlNullAttributeMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping) {
-		return new EclipseLink1_1VirtualXmlNullAttributeMapping(ormTypeMapping, javaAttributeMapping);
-	}
-	
-	// ********** EclipseLink1.1-specific ORM Context Model **********
-	
-	public EntityMappings buildEclipseLink1_1EntityMappings(EclipseLink1_1OrmXml parent, XmlEntityMappings xmlEntityMappings) {
-		return new EclipseLink1_1EntityMappingsImpl(parent, xmlEntityMappings);
-	}
-
-	public OrmPersistentType buildEclipseLink1_1OrmPersistentType(EclipseLinkEntityMappings parent, XmlTypeMapping resourceMapping) {
-		return new EclipseLink1_1OrmPersistentType(parent, resourceMapping);
-	}
-
-	public OrmPersistentAttribute buildEclipseLink1_1OrmPersistentAttribute(OrmPersistentType parent, OrmPersistentAttribute.Owner owner, XmlAttributeMapping resourceMapping) {
-		return new EclipseLink1_1OrmPersistentAttribute(parent, owner, resourceMapping);
-	}
-	
-	public OrmBasicMapping buildEclipseLink1_1OrmBasicMapping(OrmPersistentAttribute parent, XmlBasic resourceMapping) {
-		return buildEclipseLinkOrmBasicMapping(parent, resourceMapping);
-	}
-	
-	public OrmIdMapping buildEclipseLink1_1OrmIdMapping(OrmPersistentAttribute parent, XmlId resourceMapping) {
-		return buildEclipseLinkOrmIdMapping(parent, resourceMapping);
-	}
-	
-	public OrmEmbeddedIdMapping buildEclipseLink1_1OrmEmbeddedIdMapping(OrmPersistentAttribute parent, XmlEmbeddedId resourceMapping) {
-		return buildEclipseLinkOrmEmbeddedIdMapping(parent, resourceMapping);
-	}
-	
-	public OrmEmbeddedMapping buildEclipseLink1_1OrmEmbeddedMapping(OrmPersistentAttribute parent, XmlEmbedded resourceMapping) {
-		return buildEclipseLinkOrmEmbeddedMapping(parent, resourceMapping);
-	}
-
-	public OrmManyToManyMapping buildEclipseLink1_1OrmManyToManyMapping(OrmPersistentAttribute parent, XmlManyToMany resourceMapping) {
-		return buildEclipseLinkOrmManyToManyMapping(parent, resourceMapping);
-	}
-	
-	public OrmManyToOneMapping buildEclipseLink1_1OrmManyToOneMapping(OrmPersistentAttribute parent, XmlManyToOne resourceMapping) {
-		return buildEclipseLinkOrmManyToOneMapping(parent, resourceMapping);
-	}
-	
-	public OrmOneToManyMapping buildEclipseLink1_1OrmOneToManyMapping(OrmPersistentAttribute parent, XmlOneToMany resourceMapping) {
-		return buildEclipseLinkOrmOneToManyMapping(parent, resourceMapping);
-	}
-	
-	public OrmOneToOneMapping buildEclipseLink1_1OrmOneToOneMapping(OrmPersistentAttribute parent, XmlOneToOne resourceMapping) {
-		return buildEclipseLinkOrmOneToOneMapping(parent, resourceMapping);
-	}
-	
-	public OrmVersionMapping buildEclipseLink1_1OrmVersionMapping(OrmPersistentAttribute parent, XmlVersion resourceMapping) {
-		return buildEclipseLinkOrmVersionMapping(parent, resourceMapping);
-	}
-		
-	public OrmBasicCollectionMapping buildEclipseLink1_1OrmBasicCollectionMapping(OrmPersistentAttribute parent, XmlBasicCollection resourceMapping) {
-		return buildOrmBasicCollectionMapping(parent, resourceMapping);
-	}
-	
-	public OrmBasicMapMapping buildEclipseLink1_1OrmBasicMapMapping(OrmPersistentAttribute parent, XmlBasicMap resourceMapping) {
-		return buildOrmBasicMapMapping(parent, resourceMapping);
-	}
-	
-	public OrmTransformationMapping buildEclipseLink1_1OrmTransformationMapping(OrmPersistentAttribute parent, XmlTransformation resourceMapping) {
-		return buildOrmTransformationMapping(parent, resourceMapping);
-	}
-	
-	public OrmVariableOneToOneMapping buildEclipseLink1_1OrmVariableOneToOneMapping(OrmPersistentAttribute parent, XmlVariableOneToOne resourceMapping) {
-		return buildOrmVariableOneToOneMapping(parent, resourceMapping);
-	}
-	
-	public OrmAttributeMapping buildEclipseLink1_1OrmNullAttributeMapping(OrmPersistentAttribute parent, XmlNullAttributeMapping resourceMapping) {
-		return buildOrmNullAttributeMapping(parent, resourceMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1JpaPlatformFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1JpaPlatformFactory.java
deleted file mode 100644
index f0119c6c17..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1JpaPlatformFactory.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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.eclipselink.core.internal;
-
-import org.eclipse.jpt.core.JpaAnnotationProvider;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.JpaPlatform;
-import org.eclipse.jpt.core.JpaPlatformFactory;
-import org.eclipse.jpt.core.JpaValidation;
-import org.eclipse.jpt.core.internal.platform.GenericJpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.core.internal.platform.GenericJpaAnnotationProvider;
-import org.eclipse.jpt.core.internal.platform.GenericJpaPlatform;
-import org.eclipse.jpt.core.internal.platform.GenericJpaPlatformProvider;
-
-/**
- * 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,
-			buildJpaFactory(), 
-			buildJpaAnnotationProvider(), 
-			buildJpaValidation(),
-			EclipseLinkJpaPlatformProvider.instance(), 
-			//put eclipselink first because of the default java attribute mapping providers order,
-			//maybe there is a better way to handle that order dependency
-			GenericJpaPlatformProvider.instance(),
-			EclipseLink1_1JpaPlatformProvider.instance());
-	}
-	
-	protected JpaFactory buildJpaFactory() {
-		return new EclipseLink1_1JpaFactory();
-	}
-	
-	protected JpaAnnotationProvider buildJpaAnnotationProvider() {
-		return new GenericJpaAnnotationProvider(
-			GenericJpaAnnotationDefinitionProvider.instance(),
-			EclipseLinkJpaAnnotationDefinitionProvider.instance(),
-			EclipseLink1_1JpaAnnotationDefinitionProvider.instance());
-	}
-	
-	protected JpaValidation buildJpaValidation() {
-		return new JpaValidation() {
-			public Supported getTablePerConcreteClassInheritanceIsSupported() {
-				return Supported.YES;
-			}
-		};
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1JpaPlatformProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1JpaPlatformProvider.java
deleted file mode 100644
index 3f396309bb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1JpaPlatformProvider.java
+++ /dev/null
@@ -1,123 +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.eclipselink.core.internal;
-
-import java.util.List;
-import org.eclipse.jpt.core.JpaPlatformProvider;
-import org.eclipse.jpt.core.JpaResourceModelProvider;
-import org.eclipse.jpt.core.context.MappingFileProvider;
-import org.eclipse.jpt.core.context.java.DefaultJavaAttributeMappingProvider;
-import org.eclipse.jpt.core.context.java.JavaAttributeMappingProvider;
-import org.eclipse.jpt.core.context.java.JavaTypeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmTypeMappingProvider;
-import org.eclipse.jpt.core.internal.platform.AbstractJpaPlatformProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.EclipseLink1_1MappingFileProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmBasicCollectionMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmBasicMapMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmBasicMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmEmbeddedIdMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmEmbeddedMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmIdMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmManyToManyMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmManyToOneMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmNullAttributeMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmOneToManyMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmOneToOneMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmTransformationMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmTransientMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmVariableOneToOneMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmVersionMappingProvider;
-
-/**
- * EclipseLink platform
- */
-public class EclipseLink1_1JpaPlatformProvider
-	extends AbstractJpaPlatformProvider
-{
-	public static final String ID = "eclipselink1_1"; //$NON-NLS-1$
-
-	// singleton
-	private static final JpaPlatformProvider INSTANCE = new EclipseLink1_1JpaPlatformProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JpaPlatformProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1JpaPlatformProvider() {
-		super();
-	}
-
-	
-	// ********* JPA files *********	
-	
-	@Override
-	protected void addResourceModelProvidersTo(List<JpaResourceModelProvider> providers) {
-		providers.add(EclipseLink1_1OrmResourceModelProvider.instance());
-	}
-
-	
-	// ********* java *********	
-
-	@Override
-	protected void addJavaTypeMappingProvidersTo(@SuppressWarnings("unused") List<JavaTypeMappingProvider> providers) {
-		//none specific to EclipseLink1.1
-	}
-
-	@Override
-	protected void addJavaAttributeMappingProvidersTo(@SuppressWarnings("unused") List<JavaAttributeMappingProvider> providers) {
-		//none specific to EclipseLink1.1
-	}
-
-	@Override
-	protected void addDefaultJavaAttributeMappingProvidersTo(@SuppressWarnings("unused") List<DefaultJavaAttributeMappingProvider> providers) {
-		//none specific to EclipseLink1.1
-	}
-	
-	
-	// ********* ORM *********
-	
-	@Override
-	protected void addOrmTypeMappingProvidersTo(@SuppressWarnings("unused") List<OrmTypeMappingProvider> providers) {
-		//none specific to EclipseLink 1.1
-	}
-	
-	@Override
-	protected void addMappingFileProvidersTo(List<MappingFileProvider> providers) {
-		providers.add(EclipseLink1_1MappingFileProvider.instance());
-	}
-
-	@Override
-	protected void addOrmAttributeMappingProvidersTo(List<OrmAttributeMappingProvider> providers) {
-		providers.add(EclipseLink1_1OrmBasicCollectionMappingProvider.instance());
-		providers.add(EclipseLink1_1OrmBasicMapMappingProvider.instance());
-		providers.add(EclipseLink1_1OrmTransformationMappingProvider.instance());
-		providers.add(EclipseLink1_1OrmVariableOneToOneMappingProvider.instance());
-		providers.add(EclipseLink1_1OrmBasicMappingProvider.instance());
-		providers.add(EclipseLink1_1OrmIdMappingProvider.instance());
-		providers.add(EclipseLink1_1OrmEmbeddedIdMappingProvider.instance());
-		providers.add(EclipseLink1_1OrmEmbeddedMappingProvider.instance());
-		providers.add(EclipseLink1_1OrmManyToManyMappingProvider.instance());
-		providers.add(EclipseLink1_1OrmManyToOneMappingProvider.instance());
-		providers.add(EclipseLink1_1OrmOneToManyMappingProvider.instance());
-		providers.add(EclipseLink1_1OrmOneToOneMappingProvider.instance());
-		providers.add(EclipseLink1_1OrmVersionMappingProvider.instance());
-		providers.add(EclipseLink1_1OrmTransientMappingProvider.instance());
-		providers.add(EclipseLink1_1OrmNullAttributeMappingProvider.instance());
-	}
-
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1OrmResourceModelProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1OrmResourceModelProvider.java
deleted file mode 100644
index bdb1f58b21..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1OrmResourceModelProvider.java
+++ /dev/null
@@ -1,50 +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.eclipselink.core.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.JpaResourceModelProvider;
-import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.EclipseLink1_1OrmXmlResourceProvider;
-
-/**
- * EclipseLink orm.xml
- */
-public class EclipseLink1_1OrmResourceModelProvider
-	implements JpaResourceModelProvider
-{
-	// singleton
-	private static final JpaResourceModelProvider INSTANCE = new EclipseLink1_1OrmResourceModelProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JpaResourceModelProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1OrmResourceModelProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE;
-	}
-
-	public JpaXmlResource buildResourceModel(JpaProject jpaProject, IFile file) {
-		return EclipseLink1_1OrmXmlResourceProvider.getXmlResourceProvider(file).getXmlResource();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkConstants.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkConstants.java
deleted file mode 100644
index 3d05212ac8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkConstants.java
+++ /dev/null
@@ -1,22 +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.eclipselink.core.internal;
-
-public interface EclipseLinkConstants
-{
-	String ECLIPSELINK_ORM_NS_URL = "http://www.eclipse.org/eclipselink/xsds/persistence/orm";  //$NON-NLS-1$
-	String ECLIPSELINK_ORM_SCHEMA_LOC_1_0 = "http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_1_0.xsd";  //$NON-NLS-1$
-	String ECLIPSELINK_ORM_SCHEMA_LOC_1_1 = "http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_1_1.xsd";  //$NON-NLS-1$
-	
-	String VERSION_1_0_TEXT		= "1.0"; //$NON-NLS-1$
-
-	String VERSION_1_1_TEXT		= "1.1"; //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaAnnotationDefinitionProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaAnnotationDefinitionProvider.java
deleted file mode 100644
index 0e8b4a4120..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaAnnotationDefinitionProvider.java
+++ /dev/null
@@ -1,100 +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.eclipselink.core.internal;
-
-import java.util.List;
-import org.eclipse.jpt.core.JpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.core.internal.platform.AbstractJpaAnnotationDefintionProvider;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.BasicCollectionImpl.BasicCollectionAnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.BasicMapImpl.BasicMapAnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.CacheImpl.CacheAnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.ChangeTrackingImpl.ChangeTrackingAnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.ConvertImpl.ConvertAnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.ConverterImpl.ConverterAnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.CustomizerImpl.CustomizerAnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.ExistenceCheckingImpl.ExistenceCheckingAnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.JoinFetchImpl.JoinFetchAnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.MutableImpl.MutableAnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.ObjectTypeConverterImpl.ObjectTypeConverterAnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.PrivateOwnedImpl.PrivateOwnedAnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.ReadOnlyImpl.ReadOnlyAnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.ReadTransformerImpl.ReadTransformerAnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.StructConverterImpl.StructConverterAnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.TransformationImpl.TransformationAnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.TypeConverterImpl.TypeConverterAnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.VariableOneToOneImpl.VariableOneToOneAnnotationDefinition;
-import org.eclipse.jpt.eclipselink.core.internal.resource.java.WriteTransformerImpl.WriteTransformerAnnotationDefinition;
-
-/**
- * Provides annotations for 1.0 EclipseLink platform which includes JPA annotations and
- * EclipseLink 1.0 annotations
- */
-public class EclipseLinkJpaAnnotationDefinitionProvider
-	extends AbstractJpaAnnotationDefintionProvider
-{
-	// singleton
-	private static final JpaAnnotationDefinitionProvider INSTANCE = new EclipseLinkJpaAnnotationDefinitionProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JpaAnnotationDefinitionProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkJpaAnnotationDefinitionProvider() {
-		super();
-	}
-	
-	@Override
-	protected void addTypeMappingAnnotationDefinitionsTo(List<AnnotationDefinition> definitions) {
-		//none
-	}
-	
-	@Override
-	protected void addTypeSupportingAnnotationDefinitionsTo(List<AnnotationDefinition> definitions) {
-		definitions.add(CacheAnnotationDefinition.instance());
-		definitions.add(ChangeTrackingAnnotationDefinition.instance());
-		definitions.add(ConverterAnnotationDefinition.instance());
-		definitions.add(CustomizerAnnotationDefinition.instance());
-		definitions.add(ExistenceCheckingAnnotationDefinition.instance());
-		definitions.add(ObjectTypeConverterAnnotationDefinition.instance());
-		definitions.add(ReadOnlyAnnotationDefinition.instance());
-		definitions.add(StructConverterAnnotationDefinition.instance());		
-		definitions.add(TypeConverterAnnotationDefinition.instance());		
-	}
-
-	// 245996 addresses how the attribute mapping annotations should be ordered
-	@Override
-	protected void addAttributeMappingAnnotationDefinitionsTo(List<AnnotationDefinition> definitions) {
-		definitions.add(BasicCollectionAnnotationDefinition.instance());
-		definitions.add(BasicMapAnnotationDefinition.instance());
-		definitions.add(TransformationAnnotationDefinition.instance());
-		definitions.add(VariableOneToOneAnnotationDefinition.instance());
-	}
-	
-	@Override
-	protected void addAttributeSupportingAnnotationDefinitionsTo(List<AnnotationDefinition> definitions) {
-		definitions.add(ConvertAnnotationDefinition.instance());
-		definitions.add(ConverterAnnotationDefinition.instance());
-		definitions.add(JoinFetchAnnotationDefinition.instance());
-		definitions.add(MutableAnnotationDefinition.instance());
-		definitions.add(ObjectTypeConverterAnnotationDefinition.instance());
-		definitions.add(PrivateOwnedAnnotationDefinition.instance());
-		definitions.add(ReadTransformerAnnotationDefinition.instance());		
-		definitions.add(StructConverterAnnotationDefinition.instance());		
-		definitions.add(TypeConverterAnnotationDefinition.instance());		
-		definitions.add(WriteTransformerAnnotationDefinition.instance());		
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaFactory.java
deleted file mode 100644
index 287c4d56dd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaFactory.java
+++ /dev/null
@@ -1,362 +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.eclipselink.core.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.context.MappingFile;
-import org.eclipse.jpt.core.context.PersistentType;
-import org.eclipse.jpt.core.context.java.JavaBasicMapping;
-import org.eclipse.jpt.core.context.java.JavaEmbeddable;
-import org.eclipse.jpt.core.context.java.JavaEmbeddedIdMapping;
-import org.eclipse.jpt.core.context.java.JavaEmbeddedMapping;
-import org.eclipse.jpt.core.context.java.JavaIdMapping;
-import org.eclipse.jpt.core.context.java.JavaManyToManyMapping;
-import org.eclipse.jpt.core.context.java.JavaManyToOneMapping;
-import org.eclipse.jpt.core.context.java.JavaOneToManyMapping;
-import org.eclipse.jpt.core.context.java.JavaOneToOneMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.context.java.JavaVersionMapping;
-import org.eclipse.jpt.core.context.orm.EntityMappings;
-import org.eclipse.jpt.core.context.orm.OrmBasicMapping;
-import org.eclipse.jpt.core.context.orm.OrmEmbeddable;
-import org.eclipse.jpt.core.context.orm.OrmEmbeddedIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmEmbeddedMapping;
-import org.eclipse.jpt.core.context.orm.OrmEntity;
-import org.eclipse.jpt.core.context.orm.OrmIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmManyToManyMapping;
-import org.eclipse.jpt.core.context.orm.OrmManyToOneMapping;
-import org.eclipse.jpt.core.context.orm.OrmMappedSuperclass;
-import org.eclipse.jpt.core.context.orm.OrmOneToManyMapping;
-import org.eclipse.jpt.core.context.orm.OrmOneToOneMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.context.orm.OrmVersionMapping;
-import org.eclipse.jpt.core.context.orm.OrmXml;
-import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata;
-import org.eclipse.jpt.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.core.context.persistence.Persistence;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.core.internal.platform.GenericJpaFactory;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
-import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkJpaProject;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaEntity;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaMappedSuperclass;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaBasicMappingImpl;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaEmbeddableImpl;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaEntityImpl;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaIdMappingImpl;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaManyToManyMappingImpl;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaManyToOneMappingImpl;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaMappedSuperclassImpl;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaOneToManyMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaOneToOneMappingImpl;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaPersistentAttribute;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaVersionMappingImpl;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaBasicCollectionMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaBasicMapMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaTransformationMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaVariableOneToOneMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkEntityMappings;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkEntityMappingsImpl;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmBasicMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmEmbeddableImpl;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmEntityImpl;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmIdMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmManyToManyMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmManyToOneMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmMappedSuperclassImpl;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmOneToManyMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmOneToOneMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmPersistentType;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmVersionMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmXml;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkPersistenceUnitMetadata;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkVirtualXmlBasic;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkVirtualXmlEmbedded;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkVirtualXmlEmbeddedId;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkVirtualXmlId;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkVirtualXmlManyToMany;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkVirtualXmlManyToOne;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkVirtualXmlOneToMany;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkVirtualXmlOneToOne;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkVirtualXmlVersion;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmBasicCollectionMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmBasicMapMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmTransformationMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmVariableOneToOneMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.VirtualXmlBasicCollection;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.VirtualXmlBasicMap;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.VirtualXmlTransformation;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.VirtualXmlVariableOneToOne;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddable;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedId;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlId;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlMappedSuperclass;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOne;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion;
-
-public class EclipseLinkJpaFactory
-	extends GenericJpaFactory
-{
-	protected EclipseLinkJpaFactory() {
-		super();
-	}
-		
-	// ********** Core Model **********
-	
-	@Override
-	public EclipseLinkJpaProject buildJpaProject(JpaProject.Config config) throws CoreException {
-		return new EclipseLinkJpaProjectImpl(config);
-	}
-	
-	
-	// ********** Context Nodes **********
-	
-	public MappingFile buildEclipseLinkMappingFile(MappingFileRef parent, JpaXmlResource resource) {
-		return this.buildEclipseLinkOrmXml(parent, resource);
-	}
-	
-	protected EclipseLinkOrmXml buildEclipseLinkOrmXml(MappingFileRef parent, JpaXmlResource resource) {
-		return new EclipseLinkOrmXml(parent, resource);
-	}
-	
-	
-	// ********** Persistence Context Model **********
-	
-	@Override
-	public PersistenceUnit buildPersistenceUnit(Persistence parent, XmlPersistenceUnit xmlPersistenceUnit) {
-		return new EclipseLinkPersistenceUnit(parent, xmlPersistenceUnit);
-	}
-	
-	
-	// ********** EclipseLink-specific ORM Virtual Resource Model **********
-	
-	public XmlBasic buildEclipseLinkVirtualXmlBasic(OrmTypeMapping ormTypeMapping, JavaBasicMapping javaBasicMapping) {
-		return new EclipseLinkVirtualXmlBasic(ormTypeMapping, javaBasicMapping);
-	}
-	
-	public XmlId buildEclipseLinkVirtualXmlId(OrmTypeMapping ormTypeMapping, JavaIdMapping javaIdMapping) {
-		return new EclipseLinkVirtualXmlId(ormTypeMapping, javaIdMapping);
-	}
-	
-	public XmlEmbeddedId buildEclipseLinkVirtualXmlEmbeddedId(OrmTypeMapping ormTypeMapping, JavaEmbeddedIdMapping javaEmbeddedIdMapping) {
-		return new EclipseLinkVirtualXmlEmbeddedId(ormTypeMapping, javaEmbeddedIdMapping);
-	}
-	
-	public XmlEmbedded buildEclipseLinkVirtualXmlEmbedded(OrmTypeMapping ormTypeMapping, JavaEmbeddedMapping javaEmbeddedMapping) {
-		return new EclipseLinkVirtualXmlEmbedded(ormTypeMapping, javaEmbeddedMapping);
-	}
-	
-	public XmlManyToMany buildEclipseLinkVirtualXmlManyToMany(OrmTypeMapping ormTypeMapping, JavaManyToManyMapping javaManyToManyMapping) {
-		return new EclipseLinkVirtualXmlManyToMany(ormTypeMapping, javaManyToManyMapping);
-	}
-	
-	public XmlManyToOne buildEclipseLinkVirtualXmlManyToOne(OrmTypeMapping ormTypeMapping, JavaManyToOneMapping javaManyToOneMapping) {
-		return new EclipseLinkVirtualXmlManyToOne(ormTypeMapping, javaManyToOneMapping);
-	}
-	
-	public XmlOneToMany buildEclipseLinkVirtualXmlOneToMany(OrmTypeMapping ormTypeMapping, EclipseLinkJavaOneToManyMapping javaOneToManyMapping) {
-		return new EclipseLinkVirtualXmlOneToMany(ormTypeMapping, javaOneToManyMapping);
-	}
-	
-	public XmlOneToOne buildEclipseLinkVirtualXmlOneToOne(OrmTypeMapping ormTypeMapping, JavaOneToOneMapping javaOneToOneMapping) {
-		return new EclipseLinkVirtualXmlOneToOne(ormTypeMapping, javaOneToOneMapping);
-	}
-	
-	public XmlVersion buildEclipseLinkVirtualXmlVersion(OrmTypeMapping ormTypeMapping, JavaVersionMapping javaVersionMapping) {
-		return new EclipseLinkVirtualXmlVersion(ormTypeMapping, javaVersionMapping);
-	}
-	
-	public XmlBasicCollection buildVirtualXmlBasicCollection(OrmTypeMapping ormTypeMapping, JavaBasicCollectionMapping javaBasicCollectionMapping) {
-		return new VirtualXmlBasicCollection(ormTypeMapping, javaBasicCollectionMapping);
-	}
-	
-	public XmlBasicMap buildVirtualXmlBasicMap(OrmTypeMapping ormTypeMapping, JavaBasicMapMapping javaBasicMapMapping) {
-		return new VirtualXmlBasicMap(ormTypeMapping, javaBasicMapMapping);
-	}
-	
-	public XmlTransformation buildVirtualXmlTransformation(OrmTypeMapping ormTypeMapping, JavaTransformationMapping javaTransformationMapping) {
-		return new VirtualXmlTransformation(ormTypeMapping, javaTransformationMapping);
-	}
-	
-	public XmlVariableOneToOne buildVirtualXmlVariableOneToOne(OrmTypeMapping ormTypeMapping, JavaVariableOneToOneMapping javaVariableOneToOneMapping) {
-		return new VirtualXmlVariableOneToOne(ormTypeMapping, javaVariableOneToOneMapping);
-	}
-	
-	
-	// ********** EclipseLink-specific ORM Context Model **********
-	
-	public EntityMappings buildEclipseLinkEntityMappings(OrmXml parent, XmlEntityMappings xmlEntityMappings) {
-		return new EclipseLinkEntityMappingsImpl(parent, xmlEntityMappings);
-	}
-	
-	public PersistenceUnitMetadata buildEclipseLinkPersistenceUnitMetadata(EntityMappings parent, XmlEntityMappings xmlEntityMappings) {
-		return new EclipseLinkPersistenceUnitMetadata(parent, xmlEntityMappings);
-	}
-
-	public OrmPersistentType buildEclipseLinkOrmPersistentType(EclipseLinkEntityMappings parent , XmlTypeMapping resourceMapping) {
-		return new EclipseLinkOrmPersistentType(parent, resourceMapping);
-	}
-
-	public OrmEmbeddable buildEclipseLinkOrmEmbeddable(OrmPersistentType type, XmlEmbeddable resourceMapping) {
-		return new EclipseLinkOrmEmbeddableImpl(type, resourceMapping);
-	}
-
-	public OrmEntity buildEclipseLinkOrmEntity(OrmPersistentType type, XmlEntity resourceMapping) {
-		return new EclipseLinkOrmEntityImpl(type, resourceMapping);
-	}
-	
-	public OrmMappedSuperclass buildEclipseLinkOrmMappedSuperclass(OrmPersistentType type, XmlMappedSuperclass resourceMapping) {
-		return new EclipseLinkOrmMappedSuperclassImpl(type, resourceMapping);
-	}
-	
-	public OrmBasicMapping buildEclipseLinkOrmBasicMapping(OrmPersistentAttribute parent, XmlBasic resourceMapping) {
-		return new EclipseLinkOrmBasicMapping(parent, resourceMapping);
-	}
-	
-	public OrmIdMapping buildEclipseLinkOrmIdMapping(OrmPersistentAttribute parent, XmlId resourceMapping) {
-		return new EclipseLinkOrmIdMapping(parent, resourceMapping);
-	}
-	
-	public OrmEmbeddedIdMapping buildEclipseLinkOrmEmbeddedIdMapping(OrmPersistentAttribute parent, XmlEmbeddedId resourceMapping) {
-		return buildOrmEmbeddedIdMapping(parent, resourceMapping);
-	}
-	
-	public OrmEmbeddedMapping buildEclipseLinkOrmEmbeddedMapping(OrmPersistentAttribute parent, XmlEmbedded resourceMapping) {
-		return buildOrmEmbeddedMapping(parent, resourceMapping);
-	}
-
-	public OrmManyToManyMapping buildEclipseLinkOrmManyToManyMapping(OrmPersistentAttribute parent, XmlManyToMany resourceMapping) {
-		return new EclipseLinkOrmManyToManyMapping(parent, resourceMapping);
-	}
-	
-	public OrmManyToOneMapping buildEclipseLinkOrmManyToOneMapping(OrmPersistentAttribute parent, XmlManyToOne resourceMapping) {
-		return new EclipseLinkOrmManyToOneMapping(parent, resourceMapping);
-	}
-	
-	public OrmOneToManyMapping buildEclipseLinkOrmOneToManyMapping(OrmPersistentAttribute parent, XmlOneToMany resourceMapping) {
-		return new EclipseLinkOrmOneToManyMapping(parent, resourceMapping);
-	}
-	
-	public OrmOneToOneMapping buildEclipseLinkOrmOneToOneMapping(OrmPersistentAttribute parent, XmlOneToOne resourceMapping) {
-		return new EclipseLinkOrmOneToOneMapping(parent, resourceMapping);
-	}
-	
-	public OrmVersionMapping buildEclipseLinkOrmVersionMapping(OrmPersistentAttribute parent, XmlVersion resourceMapping) {
-		return new EclipseLinkOrmVersionMapping(parent, resourceMapping);
-	}
-		
-	public OrmBasicCollectionMapping buildOrmBasicCollectionMapping(OrmPersistentAttribute parent, XmlBasicCollection resourceMapping) {
-		return new OrmBasicCollectionMapping(parent, resourceMapping);
-	}
-	
-	public OrmBasicMapMapping buildOrmBasicMapMapping(OrmPersistentAttribute parent, XmlBasicMap resourceMapping) {
-		return new OrmBasicMapMapping(parent, resourceMapping);
-	}
-	
-	public OrmTransformationMapping buildOrmTransformationMapping(OrmPersistentAttribute parent, XmlTransformation resourceMapping) {
-		return new OrmTransformationMapping(parent, resourceMapping);
-	}
-	
-	public OrmVariableOneToOneMapping buildOrmVariableOneToOneMapping(OrmPersistentAttribute parent, XmlVariableOneToOne resourceMapping) {
-		return new OrmVariableOneToOneMapping(parent, resourceMapping);
-	}
-	
-	// ********** Java Context Model **********
-
-	@Override
-	public JavaPersistentAttribute buildJavaPersistentAttribute(PersistentType parent, JavaResourcePersistentAttribute jrpa) {
-		return new EclipseLinkJavaPersistentAttribute(parent, jrpa);
-	}
-	
-	@Override
-	public JavaBasicMapping buildJavaBasicMapping(JavaPersistentAttribute parent) {
-		return new EclipseLinkJavaBasicMappingImpl(parent);
-	}
-	
-	@Override
-	public JavaEmbeddable buildJavaEmbeddable(JavaPersistentType parent) {
-		return new EclipseLinkJavaEmbeddableImpl(parent);
-	}
-	
-	@Override
-	public EclipseLinkJavaEntity buildJavaEntity(JavaPersistentType parent) {
-		return new EclipseLinkJavaEntityImpl(parent);
-	}
-	
-	@Override
-	public JavaIdMapping buildJavaIdMapping(JavaPersistentAttribute parent) {
-		return new EclipseLinkJavaIdMappingImpl(parent);
-	}
-	
-	@Override
-	public EclipseLinkJavaMappedSuperclass buildJavaMappedSuperclass(JavaPersistentType parent) {
-		return new EclipseLinkJavaMappedSuperclassImpl(parent);
-	}
-	
-	@Override
-	public JavaVersionMapping buildJavaVersionMapping(JavaPersistentAttribute parent) {
-		return new EclipseLinkJavaVersionMappingImpl(parent);
-	}
-	
-	@Override
-	public JavaOneToManyMapping buildJavaOneToManyMapping(JavaPersistentAttribute parent) {
-		return new EclipseLinkJavaOneToManyMapping(parent);
-	}
-	
-	@Override
-	public JavaOneToOneMapping buildJavaOneToOneMapping(JavaPersistentAttribute parent) {
-		return new EclipseLinkJavaOneToOneMappingImpl(parent);
-	}
-	
-	@Override
-	public JavaManyToManyMapping buildJavaManyToManyMapping(JavaPersistentAttribute parent) {
-		return new EclipseLinkJavaManyToManyMappingImpl(parent);
-	}
-	
-	@Override
-	public JavaManyToOneMapping buildJavaManyToOneMapping(JavaPersistentAttribute parent) {
-		return new EclipseLinkJavaManyToOneMappingImpl(parent);
-	}
-
-	public JavaBasicCollectionMapping buildJavaBasicCollectionMapping(JavaPersistentAttribute parent) {
-		return new JavaBasicCollectionMapping(parent);
-	}
-	
-	public JavaBasicMapMapping buildJavaBasicMapMapping(JavaPersistentAttribute parent) {
-		return new JavaBasicMapMapping(parent);
-	}
-	
-	public JavaTransformationMapping buildJavaTransformationMapping(JavaPersistentAttribute parent) {
-		return new JavaTransformationMapping(parent);
-	}
-
-	public JavaVariableOneToOneMapping buildJavaVariableOneToOneMapping(JavaPersistentAttribute parent) {
-		return new JavaVariableOneToOneMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaPlatformFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaPlatformFactory.java
deleted file mode 100644
index fba199f323..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaPlatformFactory.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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.eclipselink.core.internal;
-
-import org.eclipse.jpt.core.JpaAnnotationProvider;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.JpaPlatform;
-import org.eclipse.jpt.core.JpaPlatformFactory;
-import org.eclipse.jpt.core.JpaValidation;
-import org.eclipse.jpt.core.internal.platform.GenericJpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.core.internal.platform.GenericJpaAnnotationProvider;
-import org.eclipse.jpt.core.internal.platform.GenericJpaPlatform;
-import org.eclipse.jpt.core.internal.platform.GenericJpaPlatformProvider;
-
-/**
- * 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,
-			buildJpaFactory(), 
-			buildJpaAnnotationProvider(), 
-			buildJpaValidation(),
-			EclipseLinkJpaPlatformProvider.instance(), 
-			//put eclipselink first because of the default java attribute mapping providers order,
-			//maybe there is a better way to handle that order dependency
-			GenericJpaPlatformProvider.instance());
-	}
-	
-	protected JpaFactory buildJpaFactory() {
-		return new EclipseLinkJpaFactory();
-	}
-	
-	protected JpaAnnotationProvider buildJpaAnnotationProvider() {
-		return new GenericJpaAnnotationProvider(
-			GenericJpaAnnotationDefinitionProvider.instance(),
-			EclipseLinkJpaAnnotationDefinitionProvider.instance());
-	}
-	
-	protected JpaValidation buildJpaValidation() {
-		return new JpaValidation() {
-			public Supported getTablePerConcreteClassInheritanceIsSupported() {
-				return Supported.NO;
-			}
-		};
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaPlatformProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaPlatformProvider.java
deleted file mode 100644
index b31df25c1b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaPlatformProvider.java
+++ /dev/null
@@ -1,136 +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.eclipselink.core.internal;
-
-import java.util.List;
-import org.eclipse.jpt.core.JpaPlatformProvider;
-import org.eclipse.jpt.core.JpaResourceModelProvider;
-import org.eclipse.jpt.core.context.MappingFileProvider;
-import org.eclipse.jpt.core.context.java.DefaultJavaAttributeMappingProvider;
-import org.eclipse.jpt.core.context.java.JavaAttributeMappingProvider;
-import org.eclipse.jpt.core.context.java.JavaTypeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmTypeMappingProvider;
-import org.eclipse.jpt.core.internal.platform.AbstractJpaPlatformProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.EclipseLinkMappingFileProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaOneToManyMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaOneToOneMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaBasicCollectionMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaBasicMapMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaTransformationMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaVariableOneToOneMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmBasicMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmEmbeddableProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmEmbeddedIdMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmEmbeddedMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmEntityProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmIdMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmManyToManyMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmManyToOneMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmMappedSuperclassProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmOneToManyMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmOneToOneMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmVersionMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmBasicCollectionMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmBasicMapMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmTransformationMappingProvider;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmVariableOneToOneMappingProvider;
-
-/**
- * EclipseLink platform
- */
-public class EclipseLinkJpaPlatformProvider
-	extends AbstractJpaPlatformProvider
-{
-	
-	public static final String ID = "org.eclipse.eclipselink.platform"; //$NON-NLS-1$
-
-	// singleton
-	private static final JpaPlatformProvider INSTANCE = new EclipseLinkJpaPlatformProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JpaPlatformProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkJpaPlatformProvider() {
-		super();
-	}
-
-	
-	// ********* JPA files *********	
-	
-	@Override
-	protected void addResourceModelProvidersTo(List<JpaResourceModelProvider> providers) {
-		providers.add(EclipseLinkOrmResourceModelProvider.instance());
-	}
-
-	
-	// ********* java *********	
-
-	@Override
-	protected void addJavaTypeMappingProvidersTo(@SuppressWarnings("unused") List<JavaTypeMappingProvider> providers) {
-		//none specific to EclipseLink
-	}
-
-	@Override
-	protected void addJavaAttributeMappingProvidersTo(List<JavaAttributeMappingProvider> providers) {
-		providers.add(JavaBasicCollectionMappingProvider.instance());
-		providers.add(JavaBasicMapMappingProvider.instance());
-		providers.add(JavaTransformationMappingProvider.instance());
-		providers.add(JavaVariableOneToOneMappingProvider.instance());
-	}
-
-	@Override
-	protected void addDefaultJavaAttributeMappingProvidersTo(List<DefaultJavaAttributeMappingProvider> providers) {
-		// these need to be checked first, so we can check for Basic last in case the reference object is Serializable
-		providers.add(EclipseLinkJavaOneToOneMappingProvider.instance());
-		providers.add(EclipseLinkJavaOneToManyMappingProvider.instance());
-		providers.add(JavaVariableOneToOneMappingProvider.instance());
-	}
-	
-	
-	// ********* ORM *********
-	
-	@Override
-	protected void addOrmTypeMappingProvidersTo(List<OrmTypeMappingProvider> providers) {
-		providers.add(EclipseLinkOrmEmbeddableProvider.instance());
-		providers.add(EclipseLinkOrmEntityProvider.instance());
-		providers.add(EclipseLinkOrmMappedSuperclassProvider.instance());
-	}
-	
-	@Override
-	protected void addMappingFileProvidersTo(List<MappingFileProvider> providers) {
-		providers.add(EclipseLinkMappingFileProvider.instance());
-	}
-
-	@Override
-	protected void addOrmAttributeMappingProvidersTo(List<OrmAttributeMappingProvider> providers) {
-		providers.add(OrmBasicCollectionMappingProvider.instance());
-		providers.add(OrmBasicMapMappingProvider.instance());
-		providers.add(OrmTransformationMappingProvider.instance());
-		providers.add(OrmVariableOneToOneMappingProvider.instance());
-		providers.add(EclipseLinkOrmBasicMappingProvider.instance());
-		providers.add(EclipseLinkOrmIdMappingProvider.instance());
-		providers.add(EclipseLinkOrmEmbeddedIdMappingProvider.instance());
-		providers.add(EclipseLinkOrmEmbeddedMappingProvider.instance());
-		providers.add(EclipseLinkOrmManyToManyMappingProvider.instance());
-		providers.add(EclipseLinkOrmManyToOneMappingProvider.instance());
-		providers.add(EclipseLinkOrmOneToManyMappingProvider.instance());
-		providers.add(EclipseLinkOrmOneToOneMappingProvider.instance());
-		providers.add(EclipseLinkOrmVersionMappingProvider.instance());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaProjectImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaProjectImpl.java
deleted file mode 100644
index 2cafc747db..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaProjectImpl.java
+++ /dev/null
@@ -1,40 +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.eclipselink.core.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.internal.AbstractJpaProject;
-import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkJpaProject;
-
-/**
- * 
- */
-public class EclipseLinkJpaProjectImpl
-	extends AbstractJpaProject
-	implements EclipseLinkJpaProject
-{
-
-
-	// ********** constructor/initialization **********
-
-	public EclipseLinkJpaProjectImpl(JpaProject.Config config) throws CoreException {
-		super(config);
-	}
-	
-	public JpaXmlResource getDefaultEclipseLinkOrmXmlResource() {
-		return (JpaXmlResource) this.getResourceModel(
-				JptEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_FILE_PATH,
-				JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE
-			);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaValidationMessages.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaValidationMessages.java
deleted file mode 100644
index 352eaa4aae..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaValidationMessages.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.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 CUSTOMIZER_CLASS_IMPLEMENTS_DESCRIPTOR_CUSTOMIZER = "CUSTOMIZER_CLASS_IMPLEMENTS_DESCRIPTOR_CUSTOMIZER";
-		
-	public static final String MULTIPLE_OBJECT_VALUES_FOR_DATA_VALUE = "MULTIPLE_OBJECT_VALUES_FOR_DATA_VALUE";
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkOrmResourceModelProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkOrmResourceModelProvider.java
deleted file mode 100644
index 826afaa8d2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkOrmResourceModelProvider.java
+++ /dev/null
@@ -1,50 +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.eclipselink.core.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.JpaResourceModelProvider;
-import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt.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;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkOrmResourceModelProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/JptEclipseLinkCorePlugin.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/JptEclipseLinkCorePlugin.java
deleted file mode 100644
index 82ad3e508a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/JptEclipseLinkCorePlugin.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.eclipselink.core.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-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.core.JptCorePlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class JptEclipseLinkCorePlugin extends Plugin
-{
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.jpt.eclipselink.core"; //$NON-NLS-1$
-	
-	/**
-	 * Value of the content-type for eclipselink-orm.xml version 1.0 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$
-	
-	/**
-	 * Value of the content-type for eclipselink-orm.xml version 1.1 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 ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE = Platform.getContentTypeManager().getContentType("org.eclipse.jpt.eclipselink1_1.core.content.orm"); //$NON-NLS-1$
-
-	public static final String DEFAULT_ECLIPSELINK_ORM_XML_FILE_PATH = "META-INF/eclipselink-orm.xml"; //$NON-NLS-1$
-	
-	
-	// ********** singleton **********
-	private static JptEclipseLinkCorePlugin INSTANCE;
-	
-	/**
-	 * Return the singleton JPT EclipseLink plug-in.
-	 */
-	public static JptEclipseLinkCorePlugin instance() {
-		return INSTANCE;
-	}	
-	
-	/**
-	 * Return the default mapping file deployment URI for the specified project.
-	 * ("WEB-INF/classes/META-INF/eclipselink-orm.xml" for web projects and
-	 *  "META-INF/eclipselink-orm.xml" in other cases)
-	 */
-	public static String getDefaultEclipseLinkOrmXmlDeploymentURI(IProject project) {
-		return JptCorePlugin.getDeploymentURI(project, DEFAULT_ECLIPSELINK_ORM_XML_FILE_PATH);
-	}
-	
-	/**
-	 * Log the specified status.
-	 */
-	public static void log(IStatus status) {
-		INSTANCE.getLog().log(status);
-    }
-	
-	/**
-	 * Log the specified message.
-	 */
-	public static void log(String msg) {
-        log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, null));
-    }
-	
-	/**
-	 * Log the specified exception or error.
-	 */
-	public static void log(Throwable throwable) {
-		log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, throwable.getLocalizedMessage(), throwable));
-	}
-
-	
-	// ********** plug-in implementation **********	
-	
-	public JptEclipseLinkCorePlugin() {}
-		
-	@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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/EclipseLink1_1MappingFileProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/EclipseLink1_1MappingFileProvider.java
deleted file mode 100644
index 50d341d6d8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/EclipseLink1_1MappingFileProvider.java
+++ /dev/null
@@ -1,48 +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.eclipselink.core.internal.context;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.context.MappingFile;
-import org.eclipse.jpt.core.context.MappingFileProvider;
-import org.eclipse.jpt.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-
-public class EclipseLink1_1MappingFileProvider
-	implements MappingFileProvider
-{
-	// singleton
-	private static final MappingFileProvider INSTANCE = new EclipseLink1_1MappingFileProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static MappingFileProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1MappingFileProvider() {
-		super();
-	}
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE;
-	}
-
-	public MappingFile buildMappingFile(MappingFileRef parent, JpaXmlResource resource, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1MappingFile(parent, resource);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/EclipseLinkMappingFileProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/EclipseLinkMappingFileProvider.java
deleted file mode 100644
index a278471e45..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/EclipseLinkMappingFileProvider.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.eclipselink.core.internal.context;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.context.MappingFile;
-import org.eclipse.jpt.core.context.MappingFileProvider;
-import org.eclipse.jpt.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-
-public class EclipseLinkMappingFileProvider
-	implements MappingFileProvider
-{
-	// singleton
-	private static final MappingFileProvider INSTANCE = new EclipseLinkMappingFileProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static MappingFileProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkMappingFileProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-
-	public MappingFile buildMappingFile(MappingFileRef parent, JpaXmlResource resource, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkMappingFile(parent, resource);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/AbstractEclipseLinkJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/AbstractEclipseLinkJavaPersistentAttribute.java
deleted file mode 100644
index 6070465d9c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/AbstractEclipseLinkJavaPersistentAttribute.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.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.core.context.PersistentType;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaPersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-
-/**
- * 
- */
-public abstract class AbstractEclipseLinkJavaPersistentAttribute
-	extends AbstractJavaPersistentAttribute
-{
-
-	protected AbstractEclipseLinkJavaPersistentAttribute(PersistentType parent, JavaResourcePersistentAttribute jrpa) {
-		super(parent, jrpa);
-	}
-
-	/**
-	 * Return whether the specified type is a subclass of java.util.Date or java.util.Calendar.
-	 */
-	public boolean typeIsDateOrCalendar() {
-		return this.resourcePersistentAttribute.typeIsSubTypeOf(DATE_TYPE_NAME)
-				|| this.resourcePersistentAttribute.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.resourcePersistentAttribute.typeIsVariablePrimitive()
-				|| this.resourcePersistentAttribute.typeIsSubTypeOf(SERIALIZABLE_TYPE_NAME);
-	}
-
-	public boolean typeIsValidForVariableOneToOne() {
-		return this.resourcePersistentAttribute.typeIsInterface()
-				&& this.interfaceIsValidForVariableOneToOne(this.resourcePersistentAttribute.getTypeName());
-	}
-
-	protected boolean interfaceIsValidForVariableOneToOne(String interfaceName) {
-		return ! this.interfaceIsInvalidForVariableOneToOne(interfaceName);
-	}
-
-	protected boolean interfaceIsInvalidForVariableOneToOne(String interfaceName) {
-		return CollectionTools.contains(INVALID_VARIABLE_ONE_TO_ONE_INTERFACE_NAMES, interfaceName);
-	}
-
-	// TODO we could probably add more interfaces to this list...
-	private static final String[] INVALID_VARIABLE_ONE_TO_ONE_INTERFACE_NAMES =
-		CollectionTools.add(CONTAINER_TYPE_NAMES, "org.eclipse.persistence.indirection.ValueHolderInterface"); //$NON-NLS-1$
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLink1_1JavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLink1_1JavaPersistentAttribute.java
deleted file mode 100644
index 77a29056ba..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLink1_1JavaPersistentAttribute.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 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.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.core.context.AccessType;
-import org.eclipse.jpt.core.context.PersistentType;
-import org.eclipse.jpt.core.resource.java.AccessAnnotation;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-
-/**
- * EclipseLink 1.1 persistent attribute
- */
-public class EclipseLink1_1JavaPersistentAttribute
-	extends AbstractEclipseLinkJavaPersistentAttribute
-{
-	protected AccessType specifiedAccess;
-
-
-	public EclipseLink1_1JavaPersistentAttribute(PersistentType parent, JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		super(parent, resourcePersistentAttribute);
-		this.specifiedAccess = this.buildSpecifiedAccess();
-	}
-
-
-	// ********** AccessHolder implementation **********
-
-	public AccessType getSpecifiedAccess() {
-		return this.specifiedAccess;
-	}
-
-	/**
-	 * Don't support changing to specified access on a java persistent attribute, this
-	 * involves a larger process of moving the annotations to the corresponding field/property
-	 * which may or may not exist or might need to be created.
-	 */
-	public void setSpecifiedAccess(AccessType specifiedAccess) {
-		throw new UnsupportedOperationException();
-	}
-
-	protected void setSpecifiedAccess_(AccessType specifiedAccess) {
-		AccessType old = this.specifiedAccess;
-		this.specifiedAccess = specifiedAccess;
-		this.firePropertyChanged(SPECIFIED_ACCESS_PROPERTY, old, specifiedAccess);
-	}
-
-	protected AccessType buildSpecifiedAccess() {
-		AccessAnnotation accessAnnotation = (AccessAnnotation) this.resourcePersistentAttribute.getSupportingAnnotation(AccessAnnotation.ANNOTATION_NAME);
-		return accessAnnotation == null ? null : AccessType.fromJavaResourceModel(accessAnnotation.getValue());
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setSpecifiedAccess_(this.buildSpecifiedAccess());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLink1_1JavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLink1_1JavaPersistentType.java
deleted file mode 100644
index 8430396ec5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLink1_1JavaPersistentType.java
+++ /dev/null
@@ -1,77 +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.eclipselink.core.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.context.AccessType;
-import org.eclipse.jpt.core.context.PersistentType;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaPersistentType;
-import org.eclipse.jpt.core.resource.java.AccessAnnotation;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-
-public class EclipseLink1_1JavaPersistentType
-	extends AbstractJavaPersistentType
-{
-	protected AccessType specifiedAccess;
-	
-	public EclipseLink1_1JavaPersistentType(PersistentType.Owner parent, JavaResourcePersistentType jrpt) {
-		super(parent, jrpt);
-	}
-	
-	protected AccessAnnotation getAccessAnnotation() {
-		return (AccessAnnotation) this.resourcePersistentType.getNonNullSupportingAnnotation(getAccessAnnotationName());
-	}
-
-	protected String getAccessAnnotationName() {
-		return AccessAnnotation.ANNOTATION_NAME;
-	}
-	
-	public AccessType getSpecifiedAccess() {
-		return this.specifiedAccess;
-	}
-	
-	public void setSpecifiedAccess(AccessType specifiedAccess) {
-		AccessType old = this.specifiedAccess;
-		this.specifiedAccess = specifiedAccess;
-		this.getAccessAnnotation().setValue(AccessType.toJavaResourceModel(specifiedAccess));
-		this.firePropertyChanged(SPECIFIED_ACCESS_PROPERTY, old, specifiedAccess);
-	}
-	
-	protected void setSpecifiedAccess_(AccessType specifiedAccess) {
-		AccessType old = this.specifiedAccess;
-		this.specifiedAccess = specifiedAccess;
-		this.firePropertyChanged(SPECIFIED_ACCESS_PROPERTY, old, specifiedAccess);
-	}
-	
-	@Override
-	protected Iterator<JavaResourcePersistentAttribute> persistentAttributes() {
-		return (this.specifiedAccess == null)
-			? super.persistentAttributes()
-			: this.resourcePersistentType.persistableAttributes(AccessType.toJavaResourceModel(this.specifiedAccess));
-	}
-	
-	@Override
-	protected void initializeAccess() {
-		super.initializeAccess();
-		this.specifiedAccess = this.getResourceAccess();
-	}
-	
-	@Override
-	public void updateAccess() {
-		super.updateAccess();
-		this.setSpecifiedAccess_(this.getResourceAccess());
-	}
-
-	protected AccessType getResourceAccess() {
-		return AccessType.fromJavaResourceModel(this.getAccessAnnotation().getValue());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingImpl.java
deleted file mode 100644
index 9510ecf0a9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingImpl.java
+++ /dev/null
@@ -1,86 +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.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaConverter;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaBasicMapping;
-import org.eclipse.jpt.eclipselink.core.context.Convert;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkBasicMapping;
-import org.eclipse.jpt.eclipselink.core.context.Mutable;
-import org.eclipse.jpt.eclipselink.core.resource.java.ConvertAnnotation;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkJavaBasicMappingImpl
-	extends AbstractJavaBasicMapping 
-	implements EclipseLinkBasicMapping
-{
-	
-	protected final EclipseLinkJavaMutable mutable;
-	
-	public EclipseLinkJavaBasicMappingImpl(JavaPersistentAttribute parent) {
-		super(parent);
-		this.mutable = new EclipseLinkJavaMutable(this);
-	}
-
-	@Override
-	protected JavaConverter buildSpecifiedConverter(String converterType) {
-		JavaConverter javaConverter = super.buildSpecifiedConverter(converterType);
-		if (javaConverter != null) {
-			return javaConverter;
-		}
-		if (converterType == Convert.ECLIPSE_LINK_CONVERTER) {
-			return new EclipseLinkJavaConvert(this, this.resourcePersistentAttribute);
-		}
-		return null;
-	}
-	
-	@Override
-	protected String getResourceConverterType() {
-		//check @Convert first, this is the order that EclipseLink searches
-		if (this.resourcePersistentAttribute.getSupportingAnnotation(ConvertAnnotation.ANNOTATION_NAME) != null) {
-			return Convert.ECLIPSE_LINK_CONVERTER;
-		}
-		return super.getResourceConverterType();
-	}
-	
-	//************ EclipselinkJavaBasicMapping implementation ****************
-	
-	public Mutable getMutable() {
-		return this.mutable;
-	}
-
-	
-	//************ initialization/update ****************
-
-	@Override
-	protected void initialize() {
-		super.initialize();
-		this.mutable.initialize(this.resourcePersistentAttribute);
-	}
-	
-	@Override
-	protected void update() {
-		super.update();
-		this.mutable.update(this.resourcePersistentAttribute);
-	}
-	
-	
-	//************ 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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaCaching.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaCaching.java
deleted file mode 100644
index c3427922c2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaCaching.java
+++ /dev/null
@@ -1,558 +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.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaTypeMapping;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.CacheCoordinationType;
-import org.eclipse.jpt.eclipselink.core.context.CacheType;
-import org.eclipse.jpt.eclipselink.core.context.Caching;
-import org.eclipse.jpt.eclipselink.core.context.ExistenceType;
-import org.eclipse.jpt.eclipselink.core.context.ExpiryTimeOfDay;
-import org.eclipse.jpt.eclipselink.core.context.java.JavaCaching;
-import org.eclipse.jpt.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.eclipselink.core.resource.java.CacheAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.ExistenceCheckingAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.TimeOfDayAnnotation;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkJavaCaching extends AbstractJavaJpaContextNode implements JavaCaching
-{
-	
-	protected CacheType specifiedType;
-	protected Integer specifiedSize;
-	protected Boolean specifiedShared;
-	protected Boolean specifiedAlwaysRefresh;
-	protected Boolean specifiedRefreshOnlyIfNewer;
-	protected Boolean specifiedDisableHits;
-	
-	protected boolean existenceChecking;
-	protected ExistenceType specifiedExistenceType;
-	protected ExistenceType defaultExistenceType;
-
-	protected CacheCoordinationType specifiedCoordinationType;
-	
-	protected Integer expiry;
-	protected EclipseLinkJavaExpiryTimeOfDay expiryTimeOfDay;
-	
-	
-	protected JavaResourcePersistentType resourcePersistentType;
-	
-	public EclipseLinkJavaCaching(JavaTypeMapping parent) {
-		super(parent);
-	}
-	
-	@Override
-	public JavaTypeMapping getParent() {
-		return (JavaTypeMapping) super.getParent();
-	}
-	
-
-	//query for the cache annotation every time on setters.
-	//call one setter and the CacheAnnotation could change. 
-	//You could call more than one setter before this object has received any notification
-	//from the java resource model
-	protected CacheAnnotation getCacheAnnotation() {
-		return (CacheAnnotation) this.resourcePersistentType.getNonNullSupportingAnnotation(getCacheAnnotationName());
-	}
-	
-	protected ExistenceCheckingAnnotation getExistenceCheckingAnnotation() {
-		return (ExistenceCheckingAnnotation) this.resourcePersistentType.getSupportingAnnotation(getExistenceCheckingAnnotationName());
-	}
-
-	protected String getCacheAnnotationName() {
-		return CacheAnnotation.ANNOTATION_NAME;
-	}
-	
-	protected String getExistenceCheckingAnnotationName() {
-		return ExistenceCheckingAnnotation.ANNOTATION_NAME;
-	}
-	
-	public CacheType getType() {
-		return (this.getSpecifiedType() == null) ? this.getDefaultType() : this.getSpecifiedType();
-	}
-
-	public CacheType getDefaultType() {
-		return DEFAULT_TYPE;
-	}
-		
-	public CacheType getSpecifiedType() {
-		return this.specifiedType;
-	}
-	
-	public void setSpecifiedType(CacheType newSpecifiedType) {
-		CacheType oldSpecifiedType = this.specifiedType;
-		this.specifiedType = newSpecifiedType;
-		this.getCacheAnnotation().setType(CacheType.toJavaResourceModel(newSpecifiedType));
-		firePropertyChanged(SPECIFIED_TYPE_PROPERTY, oldSpecifiedType, newSpecifiedType);
-	}
-	
-	/**
-	 * internal setter used only for updating from the resource model.
-	 * There were problems with InvalidThreadAccess exceptions in the UI
-	 * when you set a value from the UI and the annotation doesn't exist yet.
-	 * Adding the annotation causes an update to occur and then the exception.
-	 */
-	protected void setSpecifiedType_(CacheType newSpecifiedType) {
-		CacheType oldSpecifiedType = this.specifiedType;
-		this.specifiedType = newSpecifiedType;
-		firePropertyChanged(SPECIFIED_TYPE_PROPERTY, oldSpecifiedType, newSpecifiedType);
-	}
-
-	public int getSize() {
-		return (this.getSpecifiedSize() == null) ? getDefaultSize() : this.getSpecifiedSize().intValue();
-	}
-
-	public int getDefaultSize() {
-		return Caching.DEFAULT_SIZE;
-	}
-	
-	public Integer getSpecifiedSize() {
-		return this.specifiedSize;
-	}
-
-	public void setSpecifiedSize(Integer newSpecifiedSize) {
-		Integer oldSpecifiedSize = this.specifiedSize;
-		this.specifiedSize = newSpecifiedSize;
-		getCacheAnnotation().setSize(newSpecifiedSize);
-		firePropertyChanged(SPECIFIED_SIZE_PROPERTY, oldSpecifiedSize, newSpecifiedSize);
-	}
-	
-	protected void setSpecifiedSize_(Integer newSpecifiedSize) {
-		Integer oldSpecifiedSize = this.specifiedSize;
-		this.specifiedSize = newSpecifiedSize;
-		firePropertyChanged(SPECIFIED_SIZE_PROPERTY, oldSpecifiedSize, newSpecifiedSize);
-	}
-
-
-	public boolean isShared() {
-		return (this.specifiedShared == null) ? this.isDefaultShared() : this.specifiedShared.booleanValue();
-	}
-	
-	public boolean isDefaultShared() {
-		return Caching.DEFAULT_SHARED;
-	}
-	
-	public Boolean getSpecifiedShared() {
-		return this.specifiedShared;
-	}
-	
-	public void setSpecifiedShared(Boolean newSpecifiedShared) {
-		Boolean oldShared = this.specifiedShared;
-		this.specifiedShared = newSpecifiedShared;
-		this.getCacheAnnotation().setShared(newSpecifiedShared);
-		firePropertyChanged(Caching.SPECIFIED_SHARED_PROPERTY, oldShared, newSpecifiedShared);
-		
-		if (newSpecifiedShared == Boolean.FALSE) {
-			setSpecifiedType(null);
-			setSpecifiedSize(null);
-			setSpecifiedAlwaysRefresh(null);
-			setSpecifiedRefreshOnlyIfNewer(null);
-			setSpecifiedDisableHits(null);
-			setSpecifiedCoordinationType(null);
-			setExpiry(null);
-			if (this.expiryTimeOfDay != null) {
-				removeExpiryTimeOfDay();
-			}
-		}
-	}
-
-	protected void setSpecifiedShared_(Boolean newSpecifiedShared) {
-		Boolean oldSpecifiedShared = this.specifiedShared;
-		this.specifiedShared = newSpecifiedShared;
-		firePropertyChanged(Caching.SPECIFIED_SHARED_PROPERTY, oldSpecifiedShared, newSpecifiedShared);
-	}
-
-	public boolean isAlwaysRefresh() {
-		return (this.specifiedAlwaysRefresh == null) ? this.isDefaultAlwaysRefresh() : this.specifiedAlwaysRefresh.booleanValue();
-	}
-	
-	public boolean isDefaultAlwaysRefresh() {
-		return Caching.DEFAULT_ALWAYS_REFRESH;
-	}
-	
-	public Boolean getSpecifiedAlwaysRefresh() {
-		return this.specifiedAlwaysRefresh;
-	}
-	
-	public void setSpecifiedAlwaysRefresh(Boolean newSpecifiedAlwaysRefresh) {
-		Boolean oldAlwaysRefresh = this.specifiedAlwaysRefresh;
-		this.specifiedAlwaysRefresh = newSpecifiedAlwaysRefresh;
-		this.getCacheAnnotation().setAlwaysRefresh(newSpecifiedAlwaysRefresh);
-		firePropertyChanged(Caching.SPECIFIED_ALWAYS_REFRESH_PROPERTY, oldAlwaysRefresh, newSpecifiedAlwaysRefresh);
-	}
-
-	protected void setSpecifiedAlwaysRefresh_(Boolean newSpecifiedAlwaysRefresh) {
-		Boolean oldAlwaysRefresh = this.specifiedAlwaysRefresh;
-		this.specifiedAlwaysRefresh = newSpecifiedAlwaysRefresh;
-		firePropertyChanged(Caching.SPECIFIED_ALWAYS_REFRESH_PROPERTY, oldAlwaysRefresh, newSpecifiedAlwaysRefresh);
-	}
-
-	public boolean isRefreshOnlyIfNewer() {
-		return (this.specifiedRefreshOnlyIfNewer == null) ? this.isDefaultRefreshOnlyIfNewer() : this.specifiedRefreshOnlyIfNewer.booleanValue();
-	}
-	
-	public boolean isDefaultRefreshOnlyIfNewer() {
-		return Caching.DEFAULT_REFRESH_ONLY_IF_NEWER;
-	}
-	
-	public Boolean getSpecifiedRefreshOnlyIfNewer() {
-		return this.specifiedRefreshOnlyIfNewer;
-	}
-	
-	public void setSpecifiedRefreshOnlyIfNewer(Boolean newSpecifiedRefreshOnlyIfNewer) {
-		Boolean oldRefreshOnlyIfNewer = this.specifiedRefreshOnlyIfNewer;
-		this.specifiedRefreshOnlyIfNewer = newSpecifiedRefreshOnlyIfNewer;
-		this.getCacheAnnotation().setRefreshOnlyIfNewer(newSpecifiedRefreshOnlyIfNewer);
-		firePropertyChanged(Caching.SPECIFIED_REFRESH_ONLY_IF_NEWER_PROPERTY, oldRefreshOnlyIfNewer, newSpecifiedRefreshOnlyIfNewer);
-	}
-
-	protected void setSpecifiedRefreshOnlyIfNewer_(Boolean newSpecifiedRefreshOnlyIfNewer) {
-		Boolean oldRefreshOnlyIfNewer = this.specifiedRefreshOnlyIfNewer;
-		this.specifiedRefreshOnlyIfNewer = newSpecifiedRefreshOnlyIfNewer;
-		firePropertyChanged(Caching.SPECIFIED_REFRESH_ONLY_IF_NEWER_PROPERTY, oldRefreshOnlyIfNewer, newSpecifiedRefreshOnlyIfNewer);
-	}
-
-	public boolean isDisableHits() {
-		return (this.specifiedDisableHits == null) ? this.isDefaultDisableHits() : this.specifiedDisableHits.booleanValue();
-	}
-	
-	public boolean isDefaultDisableHits() {
-		return Caching.DEFAULT_DISABLE_HITS;
-	}
-	
-	public Boolean getSpecifiedDisableHits() {
-		return this.specifiedDisableHits;
-	}
-	
-	public void setSpecifiedDisableHits(Boolean newSpecifiedDisableHits) {
-		Boolean oldDisableHits = this.specifiedDisableHits;
-		this.specifiedDisableHits = newSpecifiedDisableHits;
-		this.getCacheAnnotation().setDisableHits(newSpecifiedDisableHits);
-		firePropertyChanged(Caching.SPECIFIED_DISABLE_HITS_PROPERTY, oldDisableHits, newSpecifiedDisableHits);
-	}
-
-	protected void setSpecifiedDisableHits_(Boolean newSpecifiedDisableHits) {
-		Boolean oldDisableHits = this.specifiedDisableHits;
-		this.specifiedDisableHits = newSpecifiedDisableHits;
-		firePropertyChanged(Caching.SPECIFIED_DISABLE_HITS_PROPERTY, oldDisableHits, newSpecifiedDisableHits);
-	}
-	
-	public CacheCoordinationType getCoordinationType() {
-		return (this.getSpecifiedCoordinationType() == null) ? this.getDefaultCoordinationType() : this.getSpecifiedCoordinationType();
-	}
-
-	public CacheCoordinationType getDefaultCoordinationType() {
-		return DEFAULT_COORDINATION_TYPE;
-	}
-		
-	public CacheCoordinationType getSpecifiedCoordinationType() {
-		return this.specifiedCoordinationType;
-	}
-	
-	public void setSpecifiedCoordinationType(CacheCoordinationType newSpecifiedCoordinationType) {
-		CacheCoordinationType oldSpecifiedCoordinationType = this.specifiedCoordinationType;
-		this.specifiedCoordinationType = newSpecifiedCoordinationType;
-		this.getCacheAnnotation().setCoordinationType(CacheCoordinationType.toJavaResourceModel(newSpecifiedCoordinationType));
-		firePropertyChanged(SPECIFIED_COORDINATION_TYPE_PROPERTY, oldSpecifiedCoordinationType, newSpecifiedCoordinationType);
-	}
-	
-	/**
-	 * internal setter used only for updating from the resource model.
-	 * There were problems with InvalidThreadAccess exceptions in the UI
-	 * when you set a value from the UI and the annotation doesn't exist yet.
-	 * Adding the annotation causes an update to occur and then the exception.
-	 */
-	protected void setSpecifiedCoordinationType_(CacheCoordinationType newSpecifiedCoordinationType) {
-		CacheCoordinationType oldSpecifiedCoordinationType = this.specifiedCoordinationType;
-		this.specifiedCoordinationType = newSpecifiedCoordinationType;
-		firePropertyChanged(SPECIFIED_COORDINATION_TYPE_PROPERTY, oldSpecifiedCoordinationType, newSpecifiedCoordinationType);
-	}
-	
-	public boolean hasExistenceChecking() {
-		return this.existenceChecking;
-	}
-	
-	public void setExistenceChecking(boolean newExistenceChecking) {
-		boolean oldExistenceChecking = this.existenceChecking;
-		this.existenceChecking = newExistenceChecking;
-		if (newExistenceChecking) {
-			this.resourcePersistentType.addSupportingAnnotation(getExistenceCheckingAnnotationName());
-		}
-		else {
-			this.resourcePersistentType.removeSupportingAnnotation(getExistenceCheckingAnnotationName());
-		}
-		firePropertyChanged(EXISTENCE_CHECKING_PROPERTY, oldExistenceChecking, newExistenceChecking);
-		setDefaultExistenceType(caclulateDefaultExistenceType());
-	}
-	
-	protected void setExistenceChecking_(boolean newExistenceChecking) {
-		boolean oldExistenceChecking = this.existenceChecking;
-		this.existenceChecking = newExistenceChecking;
-		firePropertyChanged(EXISTENCE_CHECKING_PROPERTY, oldExistenceChecking, newExistenceChecking);
-	}
-	
-	protected ExistenceType caclulateDefaultExistenceType() {
-		if (hasExistenceChecking()) {
-			return ExistenceType.CHECK_CACHE;
-		}
-		return DEFAULT_EXISTENCE_TYPE;
-	}
-	
-	public ExistenceType getExistenceType() {
-		return (this.getSpecifiedExistenceType() == null) ? this.getDefaultExistenceType() : this.getSpecifiedExistenceType();
-	}
-
-	public ExistenceType getDefaultExistenceType() {
-		return this.defaultExistenceType;
-	}
-	
-	protected void setDefaultExistenceType(ExistenceType newDefaultExistenceType) {
-		ExistenceType oldDefaultExistenceType = this.defaultExistenceType;
-		this.defaultExistenceType = newDefaultExistenceType;
-		firePropertyChanged(DEFAULT_EXISTENCE_TYPE_PROPERTY, oldDefaultExistenceType, newDefaultExistenceType);
-	}
-	
-	public ExistenceType getSpecifiedExistenceType() {
-		return this.specifiedExistenceType;
-	}
-	
-	public void setSpecifiedExistenceType(ExistenceType newSpecifiedExistenceType) {
-		if (!hasExistenceChecking()) {
-			if (newSpecifiedExistenceType != null) {
-				setExistenceChecking(true);
-			}
-			else {
-				return;
-			}
-		}
-		ExistenceType oldSpecifiedExistenceType = this.specifiedExistenceType;
-		this.specifiedExistenceType = newSpecifiedExistenceType;
-		this.getExistenceCheckingAnnotation().setValue(ExistenceType.toJavaResourceModel(newSpecifiedExistenceType));
-		firePropertyChanged(SPECIFIED_EXISTENCE_TYPE_PROPERTY, oldSpecifiedExistenceType, newSpecifiedExistenceType);
-	}
-	
-	/**
-	 * internal setter used only for updating from the resource model.
-	 * There were problems with InvalidThreadAccess exceptions in the UI
-	 * when you set a value from the UI and the annotation doesn't exist yet.
-	 * Adding the annotation causes an update to occur and then the exception.
-	 */
-	protected void setSpecifiedExistenceType_(ExistenceType newSpecifiedExistenceType) {
-		ExistenceType oldSpecifiedExistenceType = this.specifiedExistenceType;
-		this.specifiedExistenceType = newSpecifiedExistenceType;
-		firePropertyChanged(SPECIFIED_EXISTENCE_TYPE_PROPERTY, oldSpecifiedExistenceType, newSpecifiedExistenceType);
-	}
-
-	public Integer getExpiry() {
-		return this.expiry;
-	}
-	
-	public void setExpiry(Integer newExpiry) {
-		Integer oldExpiry = this.expiry;
-		this.expiry = newExpiry;
-		getCacheAnnotation().setExpiry(newExpiry);
-		firePropertyChanged(EXPIRY_PROPERTY, oldExpiry, newExpiry);
-		if (newExpiry != null && this.expiryTimeOfDay != null) {
-			removeExpiryTimeOfDay();
-		}
-	}
-	
-	protected void setExpiry_(Integer newExpiry) {
-		Integer oldExpiry = this.expiry;
-		this.expiry = newExpiry;
-		firePropertyChanged(EXPIRY_PROPERTY, oldExpiry, newExpiry);
-	}
-	
-	public ExpiryTimeOfDay getExpiryTimeOfDay() {
-		return this.expiryTimeOfDay;
-	}
-	
-	public ExpiryTimeOfDay addExpiryTimeOfDay() {
-		if (this.expiryTimeOfDay != null) {
-			throw new IllegalStateException("expiryTimeOfDay already exists, use getExpiryTimeOfDay()"); //$NON-NLS-1$
-		}
-		if (this.resourcePersistentType.getSupportingAnnotation(getCacheAnnotationName()) == null) {
-			this.resourcePersistentType.addSupportingAnnotation(getCacheAnnotationName());
-		}
-		EclipseLinkJavaExpiryTimeOfDay newExpiryTimeOfDay = new EclipseLinkJavaExpiryTimeOfDay(this);
-		this.expiryTimeOfDay = newExpiryTimeOfDay;
-		TimeOfDayAnnotation timeOfDayAnnotation = getCacheAnnotation().addExpiryTimeOfDay();
-		newExpiryTimeOfDay.initialize(timeOfDayAnnotation);
-		firePropertyChanged(EXPIRY_TIME_OF_DAY_PROPERTY, null, newExpiryTimeOfDay);
-		setExpiry(null);
-		return newExpiryTimeOfDay;
-	}
-	
-	public void removeExpiryTimeOfDay() {
-		if (this.expiryTimeOfDay == null) {
-			throw new IllegalStateException("timeOfDayExpiry does not exist"); //$NON-NLS-1$
-		}
-		ExpiryTimeOfDay oldExpiryTimeOfDay = this.expiryTimeOfDay;
-		this.expiryTimeOfDay = null;
-		getCacheAnnotation().removeExpiryTimeOfDay();
-		firePropertyChanged(EXPIRY_TIME_OF_DAY_PROPERTY, oldExpiryTimeOfDay, null);
-	}
-	
-	protected void setExpiryTimeOfDay(EclipseLinkJavaExpiryTimeOfDay newExpiryTimeOfDay) {
-		EclipseLinkJavaExpiryTimeOfDay oldExpiryTimeOfDay = this.expiryTimeOfDay;
-		this.expiryTimeOfDay = newExpiryTimeOfDay;
-		firePropertyChanged(EXPIRY_TIME_OF_DAY_PROPERTY, oldExpiryTimeOfDay, newExpiryTimeOfDay);
-	}
-	
-	public void initialize(JavaResourcePersistentType resourcePersistentType) {
-		this.resourcePersistentType = resourcePersistentType;
-		initialize(getCacheAnnotation());
-		initialize(getExistenceCheckingAnnotation());
-	}
-
-	protected void initialize(CacheAnnotation cache) {
-		this.specifiedType = this.specifiedType(cache);
-		this.specifiedSize = this.specifiedSize(cache);
-		this.specifiedShared = this.specifiedShared(cache);
-		this.specifiedAlwaysRefresh = this.specifiedAlwaysRefresh(cache);
-		this.specifiedRefreshOnlyIfNewer = this.specifiedRefreshOnlyIfNewer(cache);
-		this.specifiedDisableHits = this.specifiedDisableHits(cache);
-		this.specifiedCoordinationType = this.specifiedCoordinationType(cache);
-		this.initializeExpiry(cache);
-	}
-	
-	protected void initialize(ExistenceCheckingAnnotation existenceChecking) {
-		this.existenceChecking = existenceChecking != null;
-		this.specifiedExistenceType = specifiedExistenceType(existenceChecking);
-		this.defaultExistenceType = this.caclulateDefaultExistenceType();
-	}
-
-	protected void initializeExpiry(CacheAnnotation cache) {
-		if (cache.getExpiryTimeOfDay() == null) {
-			this.expiry = cache.getExpiry();
-		}
-		else {
-			if (cache.getExpiry() == null) { //handle with validation if both expiry and expiryTimeOfDay are set
-				this.expiryTimeOfDay = new EclipseLinkJavaExpiryTimeOfDay(this);
-				this.expiryTimeOfDay.initialize(cache.getExpiryTimeOfDay());
-			}
-		}
-	}
-	
-	public void update(JavaResourcePersistentType resourcePersistentType) {
-		this.resourcePersistentType = resourcePersistentType;
-		update(getCacheAnnotation());
-		update(getExistenceCheckingAnnotation());
-		updateExpiry(getCacheAnnotation());
-	}
-	
-	protected void update(CacheAnnotation cache) {
-		setSpecifiedType_(this.specifiedType(cache));
-		setSpecifiedSize_(this.specifiedSize(cache));
-		setSpecifiedShared_(this.specifiedShared(cache));
-		setSpecifiedAlwaysRefresh_(this.specifiedAlwaysRefresh(cache));
-		setSpecifiedRefreshOnlyIfNewer_(this.specifiedRefreshOnlyIfNewer(cache));
-		setSpecifiedDisableHits_(this.specifiedDisableHits(cache));
-		setSpecifiedCoordinationType_(this.specifiedCoordinationType(cache));
-	}
-
-	protected void update(ExistenceCheckingAnnotation existenceChecking) {
-		setExistenceChecking_(existenceChecking != null);
-		setSpecifiedExistenceType_(specifiedExistenceType(existenceChecking));
-		setDefaultExistenceType(caclulateDefaultExistenceType());
-	}
-	
-	protected void updateExpiry(CacheAnnotation cache) {
-		if (cache.getExpiryTimeOfDay() == null) {
-			setExpiryTimeOfDay(null);
-			setExpiry_(cache.getExpiry());
-		}
-		else {
-			if (this.expiryTimeOfDay != null) {
-				this.expiryTimeOfDay.update(cache.getExpiryTimeOfDay());
-			}
-			else if (cache.getExpiry() == null){
-				setExpiryTimeOfDay(new EclipseLinkJavaExpiryTimeOfDay(this));
-				this.expiryTimeOfDay.initialize(cache.getExpiryTimeOfDay());
-			}
-			else { //handle with validation if both expiry and expiryTimeOfDay are set
-				setExpiryTimeOfDay(null);
-			}
-		}
-	}
-
-	protected CacheType specifiedType(CacheAnnotation cache) {
-		return CacheType.fromJavaResourceModel(cache.getType());
-	}
-
-	protected Integer specifiedSize(CacheAnnotation cache) {
-		return cache.getSize();
-	}
-	
-	protected Boolean specifiedShared(CacheAnnotation cache) {
-		return cache.getShared();
-	}	
-	
-	protected Boolean specifiedAlwaysRefresh(CacheAnnotation cache) {
-		return cache.getAlwaysRefresh();
-	}	
-	
-	protected Boolean specifiedRefreshOnlyIfNewer(CacheAnnotation cache) {
-		return cache.getRefreshOnlyIfNewer();
-	}	
-	
-	protected Boolean specifiedDisableHits(CacheAnnotation cache) {
-		return cache.getDisableHits();
-	}
-	
-	protected CacheCoordinationType specifiedCoordinationType(CacheAnnotation cache) {
-		return CacheCoordinationType.fromJavaResourceModel(cache.getCoordinationType());
-	}
-	
-	protected Integer expiry(CacheAnnotation cache) {
-		return cache.getExpiry();
-	}
-	
-	protected ExistenceType specifiedExistenceType(ExistenceCheckingAnnotation existenceChecking) {
-		if (existenceChecking == null) {
-			return null;
-		}
-		return ExistenceType.fromJavaResourceModel(existenceChecking.getValue());
-	}
-
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = getCacheAnnotation().getTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getParent().getValidationTextRange(astRoot);
-	}
-
-	@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) {
-		CacheAnnotation cache = getCacheAnnotation();
-		if (cache.getExpiry() != null && cache.getExpiryTimeOfDay() != null) {
-			messages.add(
-				DefaultEclipseLinkJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					EclipseLinkJpaValidationMessages.CACHE_EXPIRY_AND_EXPIRY_TIME_OF_DAY_BOTH_SPECIFIED,
-					new String[] {this.getParent().getPersistentType().getName()},
-					this, 
-					getValidationTextRange(astRoot)
-				)
-			);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaChangeTracking.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaChangeTracking.java
deleted file mode 100644
index 429c3281fa..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaChangeTracking.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaTypeMapping;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.ChangeTracking;
-import org.eclipse.jpt.eclipselink.core.context.ChangeTrackingType;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.java.ChangeTrackingAnnotation;
-
-public class EclipseLinkJavaChangeTracking extends AbstractJavaJpaContextNode implements ChangeTracking
-{
-	protected JavaResourcePersistentType resourcePersistentType;
-	
-	protected ChangeTrackingType specifiedType;
-	
-	
-	public EclipseLinkJavaChangeTracking(JavaTypeMapping parent) {
-		super(parent);
-	}
-	
-	@Override
-	public JavaTypeMapping getParent() {
-		return (JavaTypeMapping) super.getParent();
-	}
-	
-	@Override
-	protected EclipseLinkJpaFactory getJpaFactory() {
-		return (EclipseLinkJpaFactory) super.getJpaFactory();
-	}
-	
-	protected String getChangeTrackingAnnotationName() {
-		return ChangeTrackingAnnotation.ANNOTATION_NAME;
-	}
-	
-	protected ChangeTrackingAnnotation getChangeTrackingAnnotation() {
-		return (ChangeTrackingAnnotation) this.resourcePersistentType.getSupportingAnnotation(getChangeTrackingAnnotationName());
-	}
-	
-	protected void addChangeTrackingAnnotation() {
-		this.resourcePersistentType.addSupportingAnnotation(getChangeTrackingAnnotationName());
-	}
-	
-	protected void removeChangeTrackingAnnotation() {
-		this.resourcePersistentType.removeSupportingAnnotation(getChangeTrackingAnnotationName());
-	}
-	
-	public ChangeTrackingType getType() {
-		return (this.getSpecifiedType() != null) ? this.getSpecifiedType() : this.getDefaultType();
-	}
-	
-	public ChangeTrackingType getDefaultType() {
-		return DEFAULT_TYPE;
-	}
-	
-	public ChangeTrackingType getSpecifiedType() {
-		return this.specifiedType;
-	}
-	
-	public void setSpecifiedType(ChangeTrackingType newSpecifiedType) {
-		if (this.specifiedType == newSpecifiedType) {
-			return;
-		}
-		
-		ChangeTrackingType oldSpecifiedType = this.specifiedType;
-		this.specifiedType = newSpecifiedType;
-		
-		if (newSpecifiedType != null) {
-			if (getChangeTrackingAnnotation() == null) {
-				addChangeTrackingAnnotation();
-			}
-			getChangeTrackingAnnotation().setValue(ChangeTrackingType.toJavaResourceModel(newSpecifiedType));
-		}
-		else {
-			if (getChangeTrackingAnnotation() != null) {
-				removeChangeTrackingAnnotation();
-			}
-		}
-		firePropertyChanged(SPECIFIED_TYPE_PROPERTY, oldSpecifiedType, newSpecifiedType);
-	}
-	
-	/**
-	 * internal setter used only for updating from the resource model.
-	 * There were problems with InvalidThreadAccess exceptions in the UI
-	 * when you set a value from the UI and the annotation doesn't exist yet.
-	 * Adding the annotation causes an update to occur and then the exception.
-	 */
-	protected void setSpecifiedType_(ChangeTrackingType newSpecifiedType) {
-		ChangeTrackingType oldSpecifiedType = this.specifiedType;
-		this.specifiedType = newSpecifiedType;
-		firePropertyChanged(SPECIFIED_TYPE_PROPERTY, oldSpecifiedType, newSpecifiedType);
-	}
-	
-	public void initialize(JavaResourcePersistentType resourcePersistentType) {
-		this.resourcePersistentType = resourcePersistentType;
-		ChangeTrackingAnnotation changeTrackingAnnotation = this.getChangeTrackingAnnotation();
-		this.specifiedType = changeTrackingType(changeTrackingAnnotation);
-	}
-	
-	public void update(JavaResourcePersistentType resourcePersistentType) {
-		this.resourcePersistentType = resourcePersistentType;
-		ChangeTrackingAnnotation changeTrackingAnnotation = this.getChangeTrackingAnnotation();
-		this.setSpecifiedType_(changeTrackingType(changeTrackingAnnotation));
-	}
-	
-	protected ChangeTrackingType changeTrackingType(ChangeTrackingAnnotation changeTracking) {
-		if (changeTracking == null) {
-			return null;
-		}
-		else if (changeTracking.getValue() == null) {
-			return ChangeTracking.DEFAULT_TYPE;
-		}
-		else {
-			return ChangeTrackingType.fromJavaResourceModel(changeTracking.getValue());
-		}
-	}
-	
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		ChangeTrackingAnnotation changeTrackingAnnotation = getChangeTrackingAnnotation();
-		TextRange textRange = changeTrackingAnnotation == null ? null : changeTrackingAnnotation.getTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getParent().getValidationTextRange(astRoot);
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaConversionValue.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaConversionValue.java
deleted file mode 100644
index c44c37064c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaConversionValue.java
+++ /dev/null
@@ -1,132 +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.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.ConversionValue;
-import org.eclipse.jpt.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.eclipselink.core.resource.java.ConversionValueAnnotation;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkJavaConversionValue extends AbstractJavaJpaContextNode implements ConversionValue
-{	
-	private ConversionValueAnnotation resourceConversionValue;
-	
-	private String dataValue;
-	
-	private String objectValue;
-	
-	public EclipseLinkJavaConversionValue(EclipseLinkJavaObjectTypeConverter parent) {
-		super(parent);
-	}
-	
-	@Override
-	public EclipseLinkJavaObjectTypeConverter getParent() {
-		return (EclipseLinkJavaObjectTypeConverter) super.getParent();
-	}
-
-	protected String getAnnotationName() {
-		return ConversionValueAnnotation.ANNOTATION_NAME;
-	}		
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return this.resourceConversionValue.getTextRange(astRoot);
-	}
-	
-	public String getDataValue() {
-		return this.dataValue;
-	}
-
-	public void setDataValue(String newDataValue) {
-		String oldDataValue = this.dataValue;
-		this.dataValue = newDataValue;
-		this.resourceConversionValue.setDataValue(newDataValue);
-		firePropertyChanged(DATA_VALUE_PROPERTY, oldDataValue, newDataValue);
-	}
-	
-	protected void setDataValue_(String newDataValue) {
-		String oldDataValue = this.dataValue;
-		this.dataValue = newDataValue;
-		firePropertyChanged(DATA_VALUE_PROPERTY, oldDataValue, newDataValue);
-	}
-	
-	public String getObjectValue() {
-		return this.objectValue;
-	}
-
-	public void setObjectValue(String newObjectValue) {
-		String oldObjectValue = this.objectValue;
-		this.objectValue = newObjectValue;
-		this.resourceConversionValue.setObjectValue(newObjectValue);
-		firePropertyChanged(OBJECT_VALUE_PROPERTY, oldObjectValue, newObjectValue);
-	}
-	
-	protected void setObjectValue_(String newObjectValue) {
-		String oldObjectValue = this.objectValue;
-		this.objectValue = newObjectValue;
-		firePropertyChanged(OBJECT_VALUE_PROPERTY, oldObjectValue, newObjectValue);
-	}
-
-	public void initialize(ConversionValueAnnotation resourceConversionValue) {
-		this.resourceConversionValue = resourceConversionValue;
-		this.dataValue = this.dataValue();
-		this.objectValue = this.objectValue();
-	}
-	
-	public void update(ConversionValueAnnotation resourceConversionValue) {
-		this.resourceConversionValue = resourceConversionValue;
-		this.setDataValue_(this.dataValue());
-		this.setObjectValue_(this.objectValue());
-	}
-
-	protected String dataValue() {
-		return this.resourceConversionValue.getDataValue();
-	}
-
-	protected String objectValue() {
-		return this.resourceConversionValue.getObjectValue();
-	}
-
-	public TextRange getDataValueTextRange(CompilationUnit astRoot) {
-		return this.resourceConversionValue.getDataValueTextRange(astRoot);
-	}
-
-	public TextRange getObjectValueTextRange(CompilationUnit astRoot) {
-		return this.resourceConversionValue.getObjectValueTextRange(astRoot);
-	}
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		validateDataValuesUnique(messages, astRoot);
-	}
-	
-	protected void validateDataValuesUnique(List<IMessage> messages, CompilationUnit astRoot) {
-		List<String> dataValues = CollectionTools.list(getParent().dataValues());
-		dataValues.remove(this.dataValue);
-		if (dataValues.contains(this.dataValue)) {
-			messages.add(
-				DefaultEclipseLinkJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					EclipseLinkJpaValidationMessages.MULTIPLE_OBJECT_VALUES_FOR_DATA_VALUE,
-					new String[] {this.dataValue}, 
-					this,
-					this.getDataValueTextRange(astRoot)
-				)
-			);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaConvert.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaConvert.java
deleted file mode 100644
index 10da514c9e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaConvert.java
+++ /dev/null
@@ -1,225 +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.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaConverter;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.Convert;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.eclipselink.core.resource.java.ConvertAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.ConverterAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.ObjectTypeConverterAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.StructConverterAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.TypeConverterAnnotation;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkJavaConvert extends AbstractJavaJpaContextNode implements Convert, JavaConverter
-{
-	private String specifiedConverterName;
-	
-	private JavaResourcePersistentAttribute resourcePersistentAttribute;
-	
-	private EclipseLinkJavaConverter converter;
-	
-	public EclipseLinkJavaConvert(JavaAttributeMapping parent, JavaResourcePersistentAttribute jrpa) {
-		super(parent);
-		this.initialize(jrpa);
-	}
-
-	@Override
-	public JavaAttributeMapping getParent() {
-		return (JavaAttributeMapping) super.getParent();
-	}
-
-	public String getType() {
-		return Convert.ECLIPSE_LINK_CONVERTER;
-	}
-
-	protected String getAnnotationName() {
-		return ConvertAnnotation.ANNOTATION_NAME;
-	}
-		
-	public void addToResourceModel() {
-		this.resourcePersistentAttribute.addSupportingAnnotation(getAnnotationName());
-	}
-	
-	public void removeFromResourceModel() {
-		this.resourcePersistentAttribute.removeSupportingAnnotation(getAnnotationName());
-		if (getConverter() != null) {
-			this.resourcePersistentAttribute.removeSupportingAnnotation(getConverter().getAnnotationName());
-		}
-	}
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return getResourceConvert().getTextRange(astRoot);
-	}
-
-	protected ConvertAnnotation getResourceConvert() {
-		return (ConvertAnnotation) this.resourcePersistentAttribute.getSupportingAnnotation(getAnnotationName());
-	}
-	
-	public String getConverterName() {
-		return getSpecifiedConverterName() == null ? getDefaultConverterName() : getSpecifiedConverterName();
-	}
-
-	public String getDefaultConverterName() {
-		return DEFAULT_CONVERTER_NAME;
-	}
-
-	public String getSpecifiedConverterName() {
-		return this.specifiedConverterName;
-	}
-
-	public void setSpecifiedConverterName(String newSpecifiedConverterName) {
-		String oldSpecifiedConverterName = this.specifiedConverterName;
-		this.specifiedConverterName = newSpecifiedConverterName;
-		getResourceConvert().setValue(newSpecifiedConverterName);
-		firePropertyChanged(SPECIFIED_CONVERTER_NAME_PROPERTY, oldSpecifiedConverterName, newSpecifiedConverterName);
-	}
-	
-	protected void setSpecifiedConverterName_(String newSpecifiedConverterName) {
-		String oldSpecifiedConverterName = this.specifiedConverterName;
-		this.specifiedConverterName = newSpecifiedConverterName;
-		firePropertyChanged(SPECIFIED_CONVERTER_NAME_PROPERTY, oldSpecifiedConverterName, newSpecifiedConverterName);
-	}
-
-	public EclipseLinkJavaConverter getConverter() {
-		return this.converter;
-	}
-	
-	protected String getConverterType() {
-		if (this.converter == null) {
-			return EclipseLinkConverter.NO_CONVERTER;
-		}
-		return this.converter.getType();
-	}
-
-	public void setConverter(String converterType) {
-		if (getConverterType() == converterType) {
-			return;
-		}
-		EclipseLinkJavaConverter oldConverter = this.converter;
-		EclipseLinkJavaConverter newConverter = buildConverter(converterType);
-		this.converter = null;
-		if (oldConverter != null) {
-			this.resourcePersistentAttribute.removeSupportingAnnotation(oldConverter.getAnnotationName());
-		}
-		this.converter = newConverter;
-		if (newConverter != null) {
-			this.resourcePersistentAttribute.addSupportingAnnotation(newConverter.getAnnotationName());
-		}
-		firePropertyChanged(CONVERTER_PROPERTY, oldConverter, newConverter);
-	}
-	
-	protected void setConverter(EclipseLinkJavaConverter newConverter) {
-		EclipseLinkJavaConverter oldConverter = this.converter;
-		this.converter = newConverter;
-		firePropertyChanged(CONVERTER_PROPERTY, oldConverter, newConverter);
-	}
-	
-	protected void initialize(JavaResourcePersistentAttribute jrpa) {
-		this.resourcePersistentAttribute = jrpa;
-		this.specifiedConverterName = this.getResourceConverterName();
-		this.converter = this.buildConverter(this.getResourceConverterType());
-	}
-	
-	public void update(JavaResourcePersistentAttribute jrpa) {
-		this.resourcePersistentAttribute = jrpa;
-		this.setSpecifiedConverterName_(this.getResourceConverterName());
-		if (getResourceConverterType() == getConverterType()) {
-			getConverter().update(this.resourcePersistentAttribute);
-		}
-		else {
-			EclipseLinkJavaConverter javaConverter = buildConverter(getResourceConverterType());
-			setConverter(javaConverter);
-		}
-	}
-	
-	protected String getResourceConverterName() {
-		ConvertAnnotation resourceConvert = getResourceConvert();
-		return resourceConvert == null ? null : resourceConvert.getValue();
-	}
-
-	
-	protected EclipseLinkJavaConverter buildConverter(String converterType) {
-		if (converterType == EclipseLinkConverter.NO_CONVERTER) {
-			return null;
-		}
-		if (converterType == EclipseLinkConverter.CUSTOM_CONVERTER) {
-			return buildCustomConverter();
-		}
-		else if (converterType == EclipseLinkConverter.TYPE_CONVERTER) {
-			return buildTypeConverter();
-		}
-		else if (converterType == EclipseLinkConverter.OBJECT_TYPE_CONVERTER) {
-			return buildObjectTypeConverter();
-		}
-		else if (converterType == EclipseLinkConverter.STRUCT_CONVERTER) {
-			return buildStructConverter();
-		}
-		return null;
-	}
-	
-	protected EclipseLinkJavaCustomConverter buildCustomConverter() {
-		EclipseLinkJavaCustomConverter contextConverter = new EclipseLinkJavaCustomConverter(this);
-		contextConverter.initialize(this.resourcePersistentAttribute);
-		return contextConverter;
-	}
-
-	protected EclipseLinkJavaTypeConverter buildTypeConverter() {
-		EclipseLinkJavaTypeConverter contextConverter = new EclipseLinkJavaTypeConverter(this);
-		contextConverter.initialize(this.resourcePersistentAttribute);
-		return contextConverter;
-	}
-
-	protected EclipseLinkJavaObjectTypeConverter buildObjectTypeConverter() {
-		EclipseLinkJavaObjectTypeConverter contextConverter = new EclipseLinkJavaObjectTypeConverter(this);
-		contextConverter.initialize(this.resourcePersistentAttribute);
-		return contextConverter;
-	}
-
-	protected EclipseLinkJavaStructConverter buildStructConverter() {
-		EclipseLinkJavaStructConverter contextConverter = new EclipseLinkJavaStructConverter(this);
-		contextConverter.initialize(this.resourcePersistentAttribute);
-		return contextConverter;
-	}
-
-	protected String getResourceConverterType() {
-		if (this.resourcePersistentAttribute.getSupportingAnnotation(ConverterAnnotation.ANNOTATION_NAME) != null) {
-			return EclipseLinkConverter.CUSTOM_CONVERTER;
-		}
-		else if (this.resourcePersistentAttribute.getSupportingAnnotation(TypeConverterAnnotation.ANNOTATION_NAME) != null) {
-			return EclipseLinkConverter.TYPE_CONVERTER;
-		}
-		else if (this.resourcePersistentAttribute.getSupportingAnnotation(ObjectTypeConverterAnnotation.ANNOTATION_NAME) != null) {
-			return EclipseLinkConverter.OBJECT_TYPE_CONVERTER;
-		}
-		else if (this.resourcePersistentAttribute.getSupportingAnnotation(StructConverterAnnotation.ANNOTATION_NAME) != null) {
-			return EclipseLinkConverter.STRUCT_CONVERTER;
-		}
-		
-		return null;
-	}
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		if (getConverter() != null) {
-			getConverter().validate(messages, reporter, astRoot);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaConverter.java
deleted file mode 100644
index c8375490aa..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaConverter.java
+++ /dev/null
@@ -1,104 +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.eclipselink.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.resource.java.NamedConverterAnnotation;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-public abstract class EclipseLinkJavaConverter extends AbstractJavaJpaContextNode
-	implements EclipseLinkConverter
-{
-	private JavaResourcePersistentMember resourcePersistentMember;
-	
-	private String name;
-	
-	
-	protected EclipseLinkJavaConverter(JavaJpaContextNode parent) {
-		super(parent);
-	}
-	
-	
-	protected NamedConverterAnnotation getAnnotation() {
-		return (NamedConverterAnnotation) this.resourcePersistentMember.getSupportingAnnotation(getAnnotationName());
-	}
-	
-	protected abstract String getAnnotationName();
-	
-	@Override
-	public EclipseLinkPersistenceUnit getPersistenceUnit() {
-		return (EclipseLinkPersistenceUnit) super.getPersistenceUnit();
-	}
-	
-	
-	// **************** name ***************************************************
-	
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		getAnnotation().setName(newName);
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
-	}
-
-	protected void setName_(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
-	}
-	
-	
-	// **************** resource interaction ***********************************
-	
-	protected void initialize(JavaResourcePersistentMember jrpm) {
-		this.resourcePersistentMember = jrpm;
-		this.name = this.name(getAnnotation());
-	}
-	
-	protected void update(JavaResourcePersistentMember jrpm) {
-		this.resourcePersistentMember = jrpm;
-		this.setName_(this.name(getAnnotation()));
-		getPersistenceUnit().addConverter(this);
-	}
-	
-	protected String name(NamedConverterAnnotation resourceConverter) {
-		return resourceConverter == null ? null : resourceConverter.getName();
-	}
-	
-	
-	// **************** validation *********************************************
-	
-	public boolean overrides(EclipseLinkConverter converter) {
-		// java is at the base of the tree
-		return false;
-	}
-	
-	public boolean duplicates(EclipseLinkConverter converter) {
-		return (this != converter)
-				&& ! StringTools.stringIsEmpty(this.name)
-				&& this.name.equals(converter.getName())
-				&& ! this.overrides(converter)
-				&& ! converter.overrides(this);
-	}
-	
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return getAnnotation().getTextRange(astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaConverterHolder.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaConverterHolder.java
deleted file mode 100644
index b5333c85c7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaConverterHolder.java
+++ /dev/null
@@ -1,369 +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.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaTypeMapping;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.CustomConverter;
-import org.eclipse.jpt.eclipselink.core.context.ObjectTypeConverter;
-import org.eclipse.jpt.eclipselink.core.context.StructConverter;
-import org.eclipse.jpt.eclipselink.core.context.TypeConverter;
-import org.eclipse.jpt.eclipselink.core.context.java.JavaConverterHolder;
-import org.eclipse.jpt.eclipselink.core.resource.java.ConverterAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.ObjectTypeConverterAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.StructConverterAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.TypeConverterAnnotation;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkJavaConverterHolder extends AbstractJavaJpaContextNode implements JavaConverterHolder
-{
-	protected JavaResourcePersistentType resourcePersistentType;
-	
-	protected EclipseLinkJavaCustomConverter customConverter;
-	protected EclipseLinkJavaObjectTypeConverter objectTypeConverter;
-	protected EclipseLinkJavaStructConverter structConverter;
-	protected EclipseLinkJavaTypeConverter typeConverter;
-	
-	public EclipseLinkJavaConverterHolder(JavaTypeMapping parent) {
-		super(parent);
-	}
-	
-	//************** converter *************
-	public CustomConverter getCustomConverter() {
-		return this.customConverter;
-	}
-	
-	public CustomConverter addCustomConverter() {
-		if (this.customConverter != null) {
-			throw new IllegalStateException("custom converter already exists"); //$NON-NLS-1$
-		}
-		this.customConverter = buildCustomConverter();
-		this.resourcePersistentType.addSupportingAnnotation(this.customConverter.getAnnotationName());
-		firePropertyChanged(CUSTOM_CONVERTER_PROPERTY, null, this.customConverter);
-		return this.customConverter;
-	}
-	
-	protected void addCustomConverter_() {
-		this.customConverter = buildCustomConverter();	
-		firePropertyChanged(CUSTOM_CONVERTER_PROPERTY, null, this.customConverter);
-	}
-	
-	public void removeCustomConverter() {
-		if (this.customConverter == null) {
-			throw new IllegalStateException("converter is null"); //$NON-NLS-1$			
-		}
-		EclipseLinkJavaCustomConverter oldConverter = this.customConverter;
-		this.customConverter = null;
-		this.resourcePersistentType.removeSupportingAnnotation(oldConverter.getAnnotationName());
-		firePropertyChanged(CUSTOM_CONVERTER_PROPERTY, oldConverter, null);
-	}
-	
-	protected void removeCustomConverter_() {
-		this.customConverter = null;
-		firePropertyChanged(CUSTOM_CONVERTER_PROPERTY, this.customConverter, null);
-	}
-	
-	protected String getConverterAnnotationName() {
-		return ConverterAnnotation.ANNOTATION_NAME;
-	}
-	
-	protected ConverterAnnotation getResourceConverter() {
-		return (ConverterAnnotation) this.resourcePersistentType.getSupportingAnnotation(getConverterAnnotationName());
-	}
-	
-	
-	//************** object type converter *************
-	public ObjectTypeConverter getObjectTypeConverter() {
-		return this.objectTypeConverter;
-	}
-	
-	public ObjectTypeConverter addObjectTypeConverter() {
-		if (this.objectTypeConverter != null) {
-			throw new IllegalStateException("object type converter already exists"); //$NON-NLS-1$
-		}
-		this.objectTypeConverter = buildObjectTypeConverter();
-		this.resourcePersistentType.addSupportingAnnotation(this.objectTypeConverter.getAnnotationName());
-		firePropertyChanged(OBJECT_TYPE_CONVERTER_PROPERTY, null, this.objectTypeConverter);
-		return this.objectTypeConverter;
-	}
-	
-	protected void addObjectTypeConverter_() {
-		this.objectTypeConverter = buildObjectTypeConverter();			
-		firePropertyChanged(OBJECT_TYPE_CONVERTER_PROPERTY, null, this.objectTypeConverter);
-	}
-	
-	public void removeObjectTypeConverter() {
-		if (this.objectTypeConverter == null) {
-			throw new IllegalStateException("object type converter is null"); //$NON-NLS-1$			
-		}
-		EclipseLinkJavaObjectTypeConverter oldConverter = this.objectTypeConverter;
-		this.objectTypeConverter = null;
-		this.resourcePersistentType.removeSupportingAnnotation(oldConverter.getAnnotationName());
-		firePropertyChanged(OBJECT_TYPE_CONVERTER_PROPERTY, oldConverter, null);
-	}
-
-	protected void removeObjectTypeConverter_() {
-		ObjectTypeConverter oldConverter = this.objectTypeConverter;
-		this.objectTypeConverter = null;
-		firePropertyChanged(OBJECT_TYPE_CONVERTER_PROPERTY, oldConverter, null);
-	}
-	
-	protected String getObjectTypeConverterAnnotationName() {
-		return ObjectTypeConverterAnnotation.ANNOTATION_NAME;
-	}
-	
-	protected ObjectTypeConverterAnnotation getResourceObjectTypeConverter() {
-		return (ObjectTypeConverterAnnotation) this.resourcePersistentType.getSupportingAnnotation(getObjectTypeConverterAnnotationName());
-	}
-	
-	
-	//************** type converter *************
-	public TypeConverter getTypeConverter() {
-		return this.typeConverter;
-	}
-	
-	public TypeConverter addTypeConverter() {
-		if (this.typeConverter != null) {
-			throw new IllegalStateException("type converter already exists"); //$NON-NLS-1$
-		}
-		this.typeConverter = buildTypeConverter();
-		this.resourcePersistentType.addSupportingAnnotation(this.typeConverter.getAnnotationName());
-		firePropertyChanged(TYPE_CONVERTER_PROPERTY, null, this.typeConverter);
-		return this.typeConverter;
-	}
-	
-	protected void addTypeConverter_() {
-		this.typeConverter = buildTypeConverter();		
-		firePropertyChanged(TYPE_CONVERTER_PROPERTY, null, this.typeConverter);
-	}
-	
-	public void removeTypeConverter() {
-		if (this.typeConverter == null) {
-			throw new IllegalStateException("type converter is null"); //$NON-NLS-1$			
-		}
-		EclipseLinkJavaTypeConverter oldConverter = this.typeConverter;
-		this.typeConverter = null;
-		this.resourcePersistentType.removeSupportingAnnotation(oldConverter.getAnnotationName());
-		firePropertyChanged(TYPE_CONVERTER_PROPERTY, oldConverter, null);
-	}
-	
-	protected void removeTypeConverter_() {
-		TypeConverter oldConverter = this.typeConverter;
-		this.typeConverter = null;
-		firePropertyChanged(TYPE_CONVERTER_PROPERTY, oldConverter, null);
-	}
-	
-	protected String getTypeConverterAnnotationName() {
-		return TypeConverterAnnotation.ANNOTATION_NAME;
-	}
-	
-	protected TypeConverterAnnotation getResourceTypeConverter() {
-		return (TypeConverterAnnotation) this.resourcePersistentType.getSupportingAnnotation(getTypeConverterAnnotationName());
-	}
-	
-	
-	//************** struct converter *************
-	public StructConverter getStructConverter() {
-		return this.structConverter;
-	}
-	
-	public StructConverter addStructConverter() {
-		if (this.structConverter != null) {
-			throw new IllegalStateException("struct converter already exists"); //$NON-NLS-1$
-		}
-		this.structConverter = buildStructConverter();
-		this.resourcePersistentType.addSupportingAnnotation(this.structConverter.getAnnotationName());
-		firePropertyChanged(STRUCT_CONVERTER_PROPERTY, null, this.structConverter);
-		return this.structConverter;
-	}
-	
-	protected void addStructConverter_() {
-		this.structConverter = buildStructConverter();		
-		firePropertyChanged(STRUCT_CONVERTER_PROPERTY, null, this.structConverter);
-	}
-	
-	public void removeStructConverter() {
-		if (this.structConverter == null) {
-			throw new IllegalStateException("struct converter is null"); //$NON-NLS-1$			
-		}
-		EclipseLinkJavaStructConverter oldConverter = this.structConverter;
-		this.structConverter = null;
-		this.resourcePersistentType.removeSupportingAnnotation(oldConverter.getAnnotationName());
-		firePropertyChanged(STRUCT_CONVERTER_PROPERTY, oldConverter, null);
-	}
-	
-	protected void removeStructConverter_() {
-		StructConverter oldConverter = this.structConverter;
-		this.structConverter = null;
-		firePropertyChanged(STRUCT_CONVERTER_PROPERTY, oldConverter, null);
-	}
-	
-	protected String getStructConverterAnnotationName() {
-		return StructConverterAnnotation.ANNOTATION_NAME;
-	}
-	
-	protected StructConverterAnnotation getResourceStructConverter() {
-		return (StructConverterAnnotation) this.resourcePersistentType.getSupportingAnnotation(getStructConverterAnnotationName());
-	}
-	
-	public void update(JavaResourcePersistentType jrpt) {
-		this.resourcePersistentType = jrpt;
-		this.updateCustomConverter();
-		this.updateObjectTypeConverter();
-		this.updateTypeConverter();
-		this.updateStructConverter();
-	}
-	
-	protected void updateCustomConverter() {
-		if (getResourceConverter() != null) {
-			if (this.customConverter != null) {
-				this.customConverter.update(this.resourcePersistentType);
-			}
-			else {
-				addCustomConverter_();
-			}
-		}
-		else {
-			if (this.customConverter != null) {
-				removeCustomConverter_();
-			}
-		}	
-	}
-	
-	protected void updateObjectTypeConverter() {
-		if (getResourceObjectTypeConverter() != null) {
-			if (this.objectTypeConverter != null) {
-				this.objectTypeConverter.update(this.resourcePersistentType);
-			}
-			else {
-				addObjectTypeConverter_();
-			}
-		}
-		else {
-			if (this.objectTypeConverter != null) {
-				removeObjectTypeConverter_();
-			}
-		}	
-	}
-	
-	protected void updateTypeConverter() {
-		if (getResourceTypeConverter() != null) {
-			if (this.typeConverter != null) {
-				this.typeConverter.update(this.resourcePersistentType);
-			}
-			else {
-				addTypeConverter_();
-			}
-		}
-		else {
-			if (this.typeConverter != null) {
-				removeTypeConverter();
-			}
-		}	
-	}
-	
-	protected void updateStructConverter() {
-		if (getResourceStructConverter() != null) {
-			if (this.structConverter != null) {
-				this.structConverter.update(this.resourcePersistentType);
-			}
-			else {
-				addStructConverter_();
-			}
-		}
-		else {
-			if (this.structConverter != null) {
-				removeStructConverter_();
-			}
-		}	
-	}
-	
-	public void initialize(JavaResourcePersistentType jrpt) {
-		this.resourcePersistentType = jrpt;
-		this.initializeCustomConverter();
-		this.initializeObjectTypeConverter();
-		this.initializeTypeConverter();
-		this.initializeStructConverter();
-	}
-	
-	protected void initializeCustomConverter() {
-		if (getResourceConverter() != null) {
-			this.customConverter = buildCustomConverter();
-		}		
-	}
-	
-	protected void initializeObjectTypeConverter() {
-		if (getResourceObjectTypeConverter() != null) {
-			this.objectTypeConverter = buildObjectTypeConverter();
-		}		
-	}
-	
-	protected void initializeTypeConverter() {
-		if (getResourceTypeConverter() != null) {
-			this.typeConverter = buildTypeConverter();
-		}		
-	}
-	
-	protected void initializeStructConverter() {
-		if (getResourceStructConverter() != null) {
-			this.structConverter = buildStructConverter();
-		}		
-	}
-	protected EclipseLinkJavaCustomConverter buildCustomConverter() {
-		EclipseLinkJavaCustomConverter contextConverter = new EclipseLinkJavaCustomConverter(this);
-		contextConverter.initialize(this.resourcePersistentType);
-		return contextConverter;
-	}
-
-	protected EclipseLinkJavaTypeConverter buildTypeConverter() {
-		EclipseLinkJavaTypeConverter contextConverter = new EclipseLinkJavaTypeConverter(this);
-		contextConverter.initialize(this.resourcePersistentType);
-		return contextConverter;
-	}
-
-	protected EclipseLinkJavaObjectTypeConverter buildObjectTypeConverter() {
-		EclipseLinkJavaObjectTypeConverter contextConverter = new EclipseLinkJavaObjectTypeConverter(this);
-		contextConverter.initialize(this.resourcePersistentType);
-		return contextConverter;
-	}
-
-	protected EclipseLinkJavaStructConverter buildStructConverter() {
-		EclipseLinkJavaStructConverter contextConverter = new EclipseLinkJavaStructConverter(this);
-		contextConverter.initialize(this.resourcePersistentType);
-		return contextConverter;
-	}
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return this.resourcePersistentType.getTextRange(astRoot);
-	}
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		if (this.customConverter != null) {
-			this.customConverter.validate(messages, reporter, astRoot);
-		}
-		if (this.objectTypeConverter != null) {
-			this.objectTypeConverter.validate(messages, reporter, astRoot);
-		}
-		if (this.typeConverter != null) {
-			this.typeConverter.validate(messages, reporter, astRoot);
-		}
-		if (this.structConverter != null) {
-			this.structConverter.validate(messages, reporter, astRoot);
-		}
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaCustomConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaCustomConverter.java
deleted file mode 100644
index d27969409a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaCustomConverter.java
+++ /dev/null
@@ -1,114 +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.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.CustomConverter;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.eclipselink.core.resource.java.ConverterAnnotation;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkJavaCustomConverter extends EclipseLinkJavaConverter 
-	implements CustomConverter
-{
-	private String converterClass;
-	
-	public EclipseLinkJavaCustomConverter(JavaJpaContextNode parent) {
-		super(parent);
-	}
-	
-	
-	public String getType() {
-		return EclipseLinkConverter.CUSTOM_CONVERTER;
-	}
-	
-	@Override
-	public String getAnnotationName() {
-		return ConverterAnnotation.ANNOTATION_NAME;
-	}
-	
-	@Override
-	protected ConverterAnnotation getAnnotation() {
-		return (ConverterAnnotation) super.getAnnotation();
-	}
-	
-	
-	// **************** converter class ****************************************
-	
-	public String getConverterClass() {
-		return this.converterClass;
-	}
-
-	public void setConverterClass(String newConverterClass) {
-		String oldConverterClass = this.converterClass;
-		this.converterClass = newConverterClass;
-		getAnnotation().setConverterClass(newConverterClass);
-		firePropertyChanged(CONVERTER_CLASS_PROPERTY, oldConverterClass, newConverterClass);
-	}
-	
-	protected void setConverterClass_(String newConverterClass) {
-		String oldConverterClass = this.converterClass;
-		this.converterClass = newConverterClass;
-		firePropertyChanged(CONVERTER_CLASS_PROPERTY, oldConverterClass, newConverterClass);
-	}
-
-	
-	// **************** resource interaction ***********************************
-	
-	@Override
-	protected void initialize(JavaResourcePersistentMember jrpm) {
-		super.initialize(jrpm);
-		this.converterClass = this.converterClass(getAnnotation());
-	}
-	
-	@Override
-	public void update(JavaResourcePersistentMember jrpm) {
-		super.update(jrpm);
-		this.setConverterClass_(this.converterClass(getAnnotation()));
-	}
-	
-	protected String converterClass(ConverterAnnotation resourceConverter) {
-		return resourceConverter == null ? null : resourceConverter.getConverterClass();
-	}
-
-	public TextRange getConverterClassTextRange(CompilationUnit astRoot) {
-		return getAnnotation().getConverterClassTextRange(astRoot);
-	}
-	
-	
-	//************ validation ***************
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		validateConverterClass(messages, astRoot);
-	}
-	
-	protected void validateConverterClass(List<IMessage> messages, CompilationUnit astRoot) {
-		if (! getAnnotation().converterClassImplementsInterface(ECLIPSELINK_CONVERTER_CLASS_NAME, astRoot)) {
-			messages.add(
-				DefaultEclipseLinkJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					EclipseLinkJpaValidationMessages.CONVERTER_CLASS_IMPLEMENTS_CONVERTER,
-					new String[] {this.converterClass},
-					this, 
-					getConverterClassTextRange(astRoot)
-				)
-			);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaCustomizer.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaCustomizer.java
deleted file mode 100644
index 76d9483c27..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaCustomizer.java
+++ /dev/null
@@ -1,139 +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.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.Customizer;
-import org.eclipse.jpt.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.eclipselink.core.resource.java.CustomizerAnnotation;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkJavaCustomizer extends AbstractJavaJpaContextNode implements Customizer
-{	
-	private JavaResourcePersistentType resourcePersistentType;
-	
-	private String customizerClass;
-	
-	public EclipseLinkJavaCustomizer(JavaJpaContextNode parent) {
-		super(parent);
-	}
-	
-	@Override
-	protected EclipseLinkJpaFactory getJpaFactory() {
-		return (EclipseLinkJpaFactory) super.getJpaFactory();
-	}
-
-	protected String getAnnotationName() {
-		return CustomizerAnnotation.ANNOTATION_NAME;
-	}
-		
-	protected void addResourceCustomizer() {
-		this.resourcePersistentType.addSupportingAnnotation(getAnnotationName());
-	}
-	
-	protected void removeResourceCustomizer() {
-		this.resourcePersistentType.removeSupportingAnnotation(getAnnotationName());
-	}
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return getResourceCustomizer().getTextRange(astRoot);
-	}
-
-	protected CustomizerAnnotation getResourceCustomizer() {
-		return (CustomizerAnnotation) this.resourcePersistentType.getSupportingAnnotation(getAnnotationName());
-	}
-	
-	public String getCustomizerClass() {
-		return getSpecifiedCustomizerClass();
-	}
-	
-	public String getDefaultCustomizerClass() {
-		return null;
-	}
-	
-	public String getSpecifiedCustomizerClass() {
-		return this.customizerClass;
-	}
-
-	public void setSpecifiedCustomizerClass(String newCustomizerClass) {
-		if (attributeValueHasNotChanged(this.customizerClass, newCustomizerClass)) {
-			return;
-		}
-		String oldCustomizerClass = this.customizerClass;
-		this.customizerClass = newCustomizerClass;
-		if (this.customizerClass != null) {
-			addResourceCustomizer();
-		}
-		else {
-			removeResourceCustomizer();
-		}
-		if (newCustomizerClass != null) {
-			getResourceCustomizer().setValue(newCustomizerClass);
-		}
-		firePropertyChanged(SPECIFIED_CUSTOMIZER_CLASS_PROPERTY, oldCustomizerClass, newCustomizerClass);
-	}
-	
-	protected void setCustomizerClass_(String newCustomizerClass) {
-		String oldCustomizerClass = this.customizerClass;
-		this.customizerClass = newCustomizerClass;
-		firePropertyChanged(SPECIFIED_CUSTOMIZER_CLASS_PROPERTY, oldCustomizerClass, newCustomizerClass);
-	}
-	
-	public void initialize(JavaResourcePersistentType jrpt) {
-		this.resourcePersistentType = jrpt;
-		CustomizerAnnotation resourceCustomizer = getResourceCustomizer();
-		this.customizerClass = this.customizerClass(resourceCustomizer);
-	}
-	
-	public void update(JavaResourcePersistentType jrpt) {
-		this.resourcePersistentType = jrpt;
-		CustomizerAnnotation resourceCustomizer = getResourceCustomizer();
-		this.setCustomizerClass_(this.customizerClass(resourceCustomizer));
-	}
-	
-	protected String customizerClass(CustomizerAnnotation resourceCustomizer) {
-		return resourceCustomizer == null ? null : resourceCustomizer.getValue();
-	}
-
-	public TextRange getCustomizerClassTextRange(CompilationUnit astRoot) {
-		return getResourceCustomizer().getValueTextRange(astRoot);
-	}
-	
-	//************ validation ***************
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		validateConverterClass(messages, astRoot);
-	}
-	
-	protected void validateConverterClass(List<IMessage> messages, CompilationUnit astRoot) {
-		CustomizerAnnotation resourceCustomizer = getResourceCustomizer();
-		if (resourceCustomizer != null && !resourceCustomizer.customizerClassImplementsInterface(ECLIPSELINK_DESCRIPTOR_CUSTOMIZER_CLASS_NAME, astRoot)) {
-			messages.add(
-				DefaultEclipseLinkJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					EclipseLinkJpaValidationMessages.CUSTOMIZER_CLASS_IMPLEMENTS_DESCRIPTOR_CUSTOMIZER,
-					new String[] {this.customizerClass},
-					this, 
-					getCustomizerClassTextRange(astRoot)
-				)
-			);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddableImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddableImpl.java
deleted file mode 100644
index 64340ed728..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddableImpl.java
+++ /dev/null
@@ -1,78 +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.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaEmbeddable;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.eclipselink.core.context.ChangeTracking;
-import org.eclipse.jpt.eclipselink.core.context.Customizer;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaEmbeddable;
-import org.eclipse.jpt.eclipselink.core.context.java.JavaConverterHolder;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkJavaEmbeddableImpl extends AbstractJavaEmbeddable implements EclipseLinkJavaEmbeddable
-{
-	
-	protected final JavaConverterHolder converterHolder;
-	
-	protected final EclipseLinkJavaCustomizer customizer;
-	
-	protected final EclipseLinkJavaChangeTracking changeTracking;
-	
-	public EclipseLinkJavaEmbeddableImpl(JavaPersistentType parent) {
-		super(parent);
-		this.converterHolder = new EclipseLinkJavaConverterHolder(this);
-		this.customizer = new EclipseLinkJavaCustomizer(this);
-		this.changeTracking = new EclipseLinkJavaChangeTracking(this);
-	}
-	
-	public JavaConverterHolder getConverterHolder() {
-		return this.converterHolder;
-	}
-	
-	public Customizer getCustomizer() {
-		return this.customizer;
-	}
-	
-	public ChangeTracking getChangeTracking() {
-		return this.changeTracking;
-	}	
-	
-	@Override
-	public void initialize(JavaResourcePersistentType jrpt) {
-		super.initialize(jrpt);
-		this.converterHolder.initialize(jrpt);
-		this.customizer.initialize(jrpt);
-		this.changeTracking.initialize(jrpt);
-	}
-	
-	@Override
-	public void update(JavaResourcePersistentType jrpt) {
-		super.update(jrpt);
-		this.converterHolder.update(jrpt);
-		this.customizer.update(jrpt);
-		this.changeTracking.update(jrpt);
-	}
-	
-	
-	//********** Validation ********************************************
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.converterHolder.validate(messages, reporter, astRoot);
-		this.customizer.validate(messages, reporter, astRoot);
-		this.changeTracking.validate(messages, reporter, astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaEntityImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaEntityImpl.java
deleted file mode 100644
index 91d09f97ec..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaEntityImpl.java
+++ /dev/null
@@ -1,99 +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.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaEntity;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.eclipselink.core.context.ChangeTracking;
-import org.eclipse.jpt.eclipselink.core.context.Customizer;
-import org.eclipse.jpt.eclipselink.core.context.ReadOnly;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaEntity;
-import org.eclipse.jpt.eclipselink.core.context.java.JavaCaching;
-import org.eclipse.jpt.eclipselink.core.context.java.JavaConverterHolder;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkJavaEntityImpl extends AbstractJavaEntity implements EclipseLinkJavaEntity
-{
-	protected final JavaCaching eclipseLinkCaching;
-	
-	protected final JavaConverterHolder converterHolder;
-	
-	protected final EclipseLinkJavaReadOnly readOnly;
-	
-	protected final EclipseLinkJavaCustomizer customizer;
-	
-	protected final EclipseLinkJavaChangeTracking changeTracking;
-
-	public EclipseLinkJavaEntityImpl(JavaPersistentType parent) {
-		super(parent);
-		this.eclipseLinkCaching = new EclipseLinkJavaCaching(this);
-		this.converterHolder = new EclipseLinkJavaConverterHolder(this);
-		this.readOnly = new EclipseLinkJavaReadOnly(this);
-		this.changeTracking = new EclipseLinkJavaChangeTracking(this);
-		this.customizer = new EclipseLinkJavaCustomizer(this);
-	}
-	
-	public JavaCaching getCaching() {
-		return this.eclipseLinkCaching;
-	}
-	
-	public JavaConverterHolder getConverterHolder() {
-		return this.converterHolder;
-	}
-	
-	public ReadOnly getReadOnly() {
-		return this.readOnly;
-	}
-	
-	public Customizer getCustomizer() {
-		return this.customizer;
-	}
-	
-	public ChangeTracking getChangeTracking() {
-		return this.changeTracking;
-	}
-	
-	@Override
-	public void initialize(JavaResourcePersistentType jrpt) {
-		super.initialize(jrpt);
-		this.eclipseLinkCaching.initialize(jrpt);
-		this.converterHolder.initialize(jrpt);
-		this.readOnly.initialize(jrpt);
-		this.customizer.initialize(jrpt);
-		this.changeTracking.initialize(jrpt);
-	}
-	
-	@Override
-	public void update(JavaResourcePersistentType jrpt) {
-		super.update(jrpt);
-		this.eclipseLinkCaching.update(jrpt);
-		this.converterHolder.update(jrpt);
-		this.readOnly.update(jrpt);
-		this.customizer.update(jrpt);
-		this.changeTracking.update(jrpt);
-	}
-	
-	
-	//********** Validation ********************************************
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.eclipseLinkCaching.validate(messages, reporter, astRoot);
-		this.converterHolder.validate(messages, reporter, astRoot);
-		this.readOnly.validate(messages, reporter, astRoot);
-		this.customizer.validate(messages, reporter, astRoot);
-		this.changeTracking.validate(messages, reporter, astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaExpiryTimeOfDay.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaExpiryTimeOfDay.java
deleted file mode 100644
index b893c2c6cd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaExpiryTimeOfDay.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.Caching;
-import org.eclipse.jpt.eclipselink.core.context.ExpiryTimeOfDay;
-import org.eclipse.jpt.eclipselink.core.resource.java.TimeOfDayAnnotation;
-
-public class EclipseLinkJavaExpiryTimeOfDay extends AbstractJavaJpaContextNode
-	implements ExpiryTimeOfDay
-{
-	
-	protected Integer hour;
-	protected Integer minute;
-	protected Integer second;
-	protected Integer millisecond;
-	
-	protected TimeOfDayAnnotation timeOfDay;
-	
-	public EclipseLinkJavaExpiryTimeOfDay(Caching parent) {
-		super(parent);
-	}
-	
-	public Integer getHour() {
-		return this.hour;
-	}
-
-	public void setHour(Integer newHour) {
-		Integer oldHour = this.hour;
-		this.hour = newHour;
-		this.timeOfDay.setHour(newHour);
-		firePropertyChanged(HOUR_PROPERTY, oldHour, newHour);
-	}
-
-	protected void setHour_(Integer newHour) {
-		Integer oldHour = this.hour;
-		this.hour = newHour;
-		firePropertyChanged(HOUR_PROPERTY, oldHour, newHour);
-	}
-
-	public Integer getMinute() {
-		return this.minute;
-	}
-
-	public void setMinute(Integer newMinute) {
-		Integer oldMinute = this.minute;
-		this.minute = newMinute;
-		this.timeOfDay.setMinute(newMinute);
-		firePropertyChanged(MINUTE_PROPERTY, oldMinute, newMinute);
-	}
-
-	protected void setMinute_(Integer newMinute) {
-		Integer oldMinute = this.minute;
-		this.minute = newMinute;
-		firePropertyChanged(MINUTE_PROPERTY, oldMinute, newMinute);
-	}
-
-	public Integer getSecond() {
-		return this.second;
-	}
-
-	public void setSecond(Integer newSecond) {
-		Integer oldSecond = this.second;
-		this.second = newSecond;
-		this.timeOfDay.setSecond(newSecond);
-		firePropertyChanged(SECOND_PROPERTY, oldSecond, newSecond);
-	}
-	
-	protected void setSecond_(Integer newSecond) {
-		Integer oldSecond = this.second;
-		this.second = newSecond;
-		firePropertyChanged(SECOND_PROPERTY, oldSecond, newSecond);
-	}
-
-	public Integer getMillisecond() {
-		return this.millisecond;
-	}
-
-	public void setMillisecond(Integer newMillisecond) {
-		Integer oldMillisecond = this.millisecond;
-		this.millisecond = newMillisecond;
-		this.timeOfDay.setMillisecond(newMillisecond);
-		firePropertyChanged(MILLISECOND_PROPERTY, oldMillisecond, newMillisecond);
-	}
-	
-	protected void setMillisecond_(Integer newMillisecond) {
-		Integer oldMillisecond = this.millisecond;
-		this.millisecond = newMillisecond;
-		firePropertyChanged(MILLISECOND_PROPERTY, oldMillisecond, newMillisecond);
-	}
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return this.timeOfDay.getTextRange(astRoot);
-	}
-	
-	public void initialize(TimeOfDayAnnotation timeOfDay) {
-		this.timeOfDay = timeOfDay;
-		this.hour = getHour(timeOfDay);
-		this.minute = getMinute(timeOfDay);
-		this.second = getSecond(timeOfDay);
-		this.millisecond = getMillisecond(timeOfDay);
-	}
-	
-	public void update(TimeOfDayAnnotation timeOfDay) {
-		this.timeOfDay = timeOfDay;
-		this.setHour_(getHour(timeOfDay));
-		this.setMinute_(getMinute(timeOfDay));
-		this.setSecond_(getSecond(timeOfDay));
-		this.setMillisecond_(getMillisecond(timeOfDay));
-	}
-	
-	protected Integer getHour(TimeOfDayAnnotation timeOfDay) {
-		return timeOfDay.getHour();
-	}
-	
-	protected Integer getMinute(TimeOfDayAnnotation timeOfDay) {
-		return timeOfDay.getMinute();
-	}
-	
-	protected Integer getSecond(TimeOfDayAnnotation timeOfDay) {
-		return timeOfDay.getSecond();
-	}
-	
-	protected Integer getMillisecond(TimeOfDayAnnotation timeOfDay) {
-		return timeOfDay.getMillisecond();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaIdMappingImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaIdMappingImpl.java
deleted file mode 100644
index e40428580e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaIdMappingImpl.java
+++ /dev/null
@@ -1,86 +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.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaConverter;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaIdMapping;
-import org.eclipse.jpt.eclipselink.core.context.Convert;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkIdMapping;
-import org.eclipse.jpt.eclipselink.core.context.Mutable;
-import org.eclipse.jpt.eclipselink.core.resource.java.ConvertAnnotation;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkJavaIdMappingImpl 
-	extends GenericJavaIdMapping
-	implements EclipseLinkIdMapping
-{
-	protected final EclipseLinkJavaMutable mutable;
-	
-	public EclipseLinkJavaIdMappingImpl(JavaPersistentAttribute parent) {
-		super(parent);
-		this.mutable = new EclipseLinkJavaMutable(this);
-	}
-
-	@Override
-	protected JavaConverter buildSpecifiedConverter(String converterType) {
-		JavaConverter javaConverter = super.buildSpecifiedConverter(converterType);
-		if (javaConverter != null) {
-			return javaConverter;
-		}
-		if (converterType == Convert.ECLIPSE_LINK_CONVERTER) {
-			return new EclipseLinkJavaConvert(this, this.resourcePersistentAttribute);
-		}
-		return null;
-	}
-	
-	@Override
-	protected String getResourceConverterType() {
-		//check @Convert first, this is the order that EclipseLink searches
-		if (this.resourcePersistentAttribute.getSupportingAnnotation(ConvertAnnotation.ANNOTATION_NAME) != null) {
-			return Convert.ECLIPSE_LINK_CONVERTER;
-		}
-		return super.getResourceConverterType();
-	}
-	
-	
-	//************ EclipselinkJavaIdMapping implementation ****************
-	
-	public Mutable getMutable() {
-		return this.mutable;
-	}
-	
-	
-	//************ initialization/update ****************
-
-	@Override
-	protected void initialize() {
-		super.initialize();
-		this.mutable.initialize(this.resourcePersistentAttribute);
-	}
-	
-	@Override
-	protected void update() {
-		super.update();
-		this.mutable.update(this.resourcePersistentAttribute);
-	}
-	
-	
-	//************ 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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaJoinFetch.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaJoinFetch.java
deleted file mode 100644
index f2147843d9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaJoinFetch.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetch;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetchType;
-import org.eclipse.jpt.eclipselink.core.resource.java.JoinFetchAnnotation;
-
-public class EclipseLinkJavaJoinFetch 
-	extends AbstractJavaJpaContextNode 
-	implements JoinFetch
-{
-	protected JoinFetchType joinFetchValue;	
-	
-	protected JavaResourcePersistentAttribute resourcePersistentAttribute;
-	
-	
-	public EclipseLinkJavaJoinFetch(JavaAttributeMapping parent) {
-		super(parent);
-	}
-	
-	
-	protected String getJoinFetchAnnotationName() {
-		return JoinFetchAnnotation.ANNOTATION_NAME;
-	}
-	
-	protected JoinFetchAnnotation getResourceJoinFetch() {
-		return (JoinFetchAnnotation) this.resourcePersistentAttribute.getSupportingAnnotation(getJoinFetchAnnotationName());
-	}
-	
-	protected void addResourceJoinFetch() {
-		this.resourcePersistentAttribute.addSupportingAnnotation(getJoinFetchAnnotationName());
-	}
-	
-	protected void removeResourceJoinFetch() {
-		this.resourcePersistentAttribute.removeSupportingAnnotation(getJoinFetchAnnotationName());
-	}
-	
-	public JoinFetchType getValue() {
-		return this.joinFetchValue;
-	}
-	
-	protected JoinFetchType getDefaultValue() {
-		return JoinFetch.DEFAULT_VALUE;
-	}
-	
-	public void setValue(JoinFetchType newJoinFetchValue) {
-		if (this.joinFetchValue == newJoinFetchValue) {
-			return;
-		}
-				
-		JoinFetchType oldJoinFetchValue = this.joinFetchValue;
-		this.joinFetchValue = newJoinFetchValue;
-		
-		if (newJoinFetchValue != null) {
-			if (getResourceJoinFetch() == null) {
-				addResourceJoinFetch();
-			}
-			getResourceJoinFetch().setValue(JoinFetchType.toJavaResourceModel(newJoinFetchValue));		
-		}
-		else {
-			if (getResourceJoinFetch() != null) {
-				removeResourceJoinFetch();
-			}
-		}
-		firePropertyChanged(JoinFetch.VALUE_PROPERTY, oldJoinFetchValue, newJoinFetchValue);
-	}
-	
-	/**
-	 * internal setter used only for updating from the resource model.
-	 * There were problems with InvalidThreadAccess exceptions in the UI
-	 * when you set a value from the UI and the annotation doesn't exist yet.
-	 * Adding the annotation causes an update to occur and then the exception.
-	 */
-	protected void setValue_(JoinFetchType newJoinFetchValue) {
-		JoinFetchType oldJoinFetchValue = this.joinFetchValue;
-		this.joinFetchValue = newJoinFetchValue;
-		firePropertyChanged(JoinFetch.VALUE_PROPERTY, oldJoinFetchValue, newJoinFetchValue);
-	}
-	
-	public void initialize(JavaResourcePersistentAttribute jrpa) {
-		this.resourcePersistentAttribute = jrpa;
-		JoinFetchAnnotation resourceJoinFetch = this.getResourceJoinFetch();
-		this.joinFetchValue = this.joinFetch(resourceJoinFetch);
-	}
-	
-	public void update(JavaResourcePersistentAttribute jrpa) {
-		this.resourcePersistentAttribute = jrpa;
-		JoinFetchAnnotation resourceJoinFetch = this.getResourceJoinFetch();
-		setValue_(joinFetch(resourceJoinFetch));
-	}
-	
-	private JoinFetchType joinFetch(JoinFetchAnnotation resourceJoinFetch) {
-		if (resourceJoinFetch == null) {
-			return null;
-		}
-		if (resourceJoinFetch.getValue() == null) { 
-			// @JoinFetch is equivalent to @JoinFetch(JoinFetch.INNER)
-			return getDefaultValue();
-		}
-		return JoinFetchType.fromJavaResourceModel(resourceJoinFetch.getValue());
-	}
-	
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		JoinFetchAnnotation resourceJoinFetch = this.getResourceJoinFetch();
-		return resourceJoinFetch == null ? null : resourceJoinFetch.getTextRange(astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaManyToManyMappingImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaManyToManyMappingImpl.java
deleted file mode 100644
index 219fb90515..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaManyToManyMappingImpl.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.java;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaManyToManyMapping;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkRelationshipMapping;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetch;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.internal.iterators.CompositeIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkJavaManyToManyMappingImpl
-	extends GenericJavaManyToManyMapping
-	implements EclipseLinkRelationshipMapping
-{
-	protected final EclipseLinkJavaJoinFetch joinFetch;
-	
-	
-	public EclipseLinkJavaManyToManyMappingImpl(JavaPersistentAttribute parent) {
-		super(parent);
-		this.joinFetch = new EclipseLinkJavaJoinFetch(this);
-	}
-	
-	
-	@Override
-	public Iterator<String> supportingAnnotationNames() {
-		return new CompositeIterator<String>(
-			super.supportingAnnotationNames(),
-			new ArrayIterator<String>(
-				EclipseLinkJPA.JOIN_FETCH));
-	}	
-	
-	public JoinFetch getJoinFetch() {
-		return this.joinFetch;
-	}
-	
-	@Override
-	protected void initialize() {
-		super.initialize();
-		this.joinFetch.initialize(this.resourcePersistentAttribute);
-	}
-	
-	@Override
-	protected void update() {
-		super.update();
-		this.joinFetch.update(this.resourcePersistentAttribute);
-	}
-	
-	@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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaManyToOneMappingImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaManyToOneMappingImpl.java
deleted file mode 100644
index 915f039759..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaManyToOneMappingImpl.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.java;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaManyToOneMapping;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkRelationshipMapping;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetch;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.internal.iterators.CompositeIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkJavaManyToOneMappingImpl
-	extends GenericJavaManyToOneMapping
-	implements EclipseLinkRelationshipMapping
-{
-	protected final EclipseLinkJavaJoinFetch joinFetch;
-	
-	
-	public EclipseLinkJavaManyToOneMappingImpl(JavaPersistentAttribute parent) {
-		super(parent);
-		this.joinFetch = new EclipseLinkJavaJoinFetch(this);
-	}
-	
-	
-	@Override
-	public Iterator<String> supportingAnnotationNames() {
-		return new CompositeIterator<String>(
-			super.supportingAnnotationNames(),
-			new ArrayIterator<String>(
-				EclipseLinkJPA.JOIN_FETCH));
-	}
-	
-	public JoinFetch getJoinFetch() {
-		return this.joinFetch;
-	}
-	
-	@Override
-	protected void initialize() {
-		super.initialize();
-		this.joinFetch.initialize(this.resourcePersistentAttribute);
-	}
-	
-	@Override
-	protected void update() {
-		super.update();
-		this.joinFetch.update(this.resourcePersistentAttribute);
-	}
-	
-	@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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaMappedSuperclassImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaMappedSuperclassImpl.java
deleted file mode 100644
index 5ae82eeb95..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaMappedSuperclassImpl.java
+++ /dev/null
@@ -1,99 +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.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaMappedSuperclass;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.eclipselink.core.context.ChangeTracking;
-import org.eclipse.jpt.eclipselink.core.context.Customizer;
-import org.eclipse.jpt.eclipselink.core.context.ReadOnly;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaMappedSuperclass;
-import org.eclipse.jpt.eclipselink.core.context.java.JavaCaching;
-import org.eclipse.jpt.eclipselink.core.context.java.JavaConverterHolder;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkJavaMappedSuperclassImpl extends AbstractJavaMappedSuperclass implements EclipseLinkJavaMappedSuperclass
-{
-	protected JavaCaching eclipseLinkCaching;
-	
-	protected final JavaConverterHolder converterHolder;
-	
-	protected final EclipseLinkJavaReadOnly readOnly;
-
-	protected final EclipseLinkJavaCustomizer customizer;
-
-	protected final EclipseLinkJavaChangeTracking changeTracking;
-
-	public EclipseLinkJavaMappedSuperclassImpl(JavaPersistentType parent) {
-		super(parent);
-		this.eclipseLinkCaching = new EclipseLinkJavaCaching(this);
-		this.converterHolder = new EclipseLinkJavaConverterHolder(this);
-		this.readOnly = new EclipseLinkJavaReadOnly(this);
-		this.customizer = new EclipseLinkJavaCustomizer(this);
-		this.changeTracking = new EclipseLinkJavaChangeTracking(this);
-	}
-	
-	public JavaCaching getCaching() {
-		return this.eclipseLinkCaching;
-	}
-	
-	public JavaConverterHolder getConverterHolder() {
-		return this.converterHolder;
-	}
-	
-	public ReadOnly getReadOnly() {
-		return this.readOnly;
-	}
-	
-	public Customizer getCustomizer() {
-		return this.customizer;
-	}
-	
-	public ChangeTracking getChangeTracking() {
-		return this.changeTracking;
-	}
-	
-	@Override
-	public void initialize(JavaResourcePersistentType jrpt) {
-		super.initialize(jrpt);
-		this.eclipseLinkCaching.initialize(jrpt);
-		this.converterHolder.initialize(jrpt);
-		this.readOnly.initialize(jrpt);
-		this.customizer.initialize(jrpt);
-		this.changeTracking.initialize(jrpt);
-	}
-	
-	@Override
-	public void update(JavaResourcePersistentType jrpt) {
-		super.update(jrpt);
-		this.eclipseLinkCaching.update(jrpt);
-		this.converterHolder.update(jrpt);
-		this.readOnly.update(jrpt);
-		this.customizer.update(jrpt);
-		this.changeTracking.update(jrpt);
-	}
-	
-	
-	//********** Validation ********************************************
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.eclipseLinkCaching.validate(messages, reporter, astRoot);
-		this.converterHolder.validate(messages, reporter, astRoot);
-		this.readOnly.validate(messages, reporter, astRoot);
-		this.customizer.validate(messages, reporter, astRoot);
-		this.changeTracking.validate(messages, reporter, astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaMutable.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaMutable.java
deleted file mode 100644
index 1e8f2d1614..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaMutable.java
+++ /dev/null
@@ -1,145 +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.eclipselink.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.Mutable;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.resource.java.MutableAnnotation;
-
-public class EclipseLinkJavaMutable extends AbstractJavaJpaContextNode implements Mutable
-{
-	protected boolean defaultMutable;
-	protected Boolean specifiedMutable;
-	
-	protected JavaResourcePersistentAttribute resourcePersistentAttribute;
-	
-	public EclipseLinkJavaMutable(JavaAttributeMapping parent) {
-		super(parent);
-	}
-
-	protected JavaAttributeMapping getAttributeMapping() {
-		return (JavaAttributeMapping) this.getParent();
-	}
-	
-	@Override
-	public EclipseLinkPersistenceUnit getPersistenceUnit() {
-		return (EclipseLinkPersistenceUnit) super.getPersistenceUnit();
-	}
-	
-	protected String getMutableAnnotationName() {
-		return MutableAnnotation.ANNOTATION_NAME;
-	}
-	
-	protected MutableAnnotation getResourceMutable() {
-		return (MutableAnnotation) this.resourcePersistentAttribute.getSupportingAnnotation(getMutableAnnotationName());
-	}
-	
-	protected void addResourceMutable() {
-		this.resourcePersistentAttribute.addSupportingAnnotation(getMutableAnnotationName());
-	}
-	
-	protected void removeResourceMutable() {
-		this.resourcePersistentAttribute.removeSupportingAnnotation(getMutableAnnotationName());
-	}
-
-	protected boolean calculateDefaultMutable() {
-		AbstractEclipseLinkJavaPersistentAttribute javaAttribute = (AbstractEclipseLinkJavaPersistentAttribute) this.getAttributeMapping().getPersistentAttribute();
-		if (javaAttribute.typeIsDateOrCalendar()) {
-			Boolean persistenceUnitDefaultMutable = this.getPersistenceUnit().getOptions().getTemporalMutable();
-			return persistenceUnitDefaultMutable == null ? false : persistenceUnitDefaultMutable.booleanValue();
-		}
-		return javaAttribute.typeIsSerializable();
-	}
-
-	public boolean isMutable() {
-		return this.specifiedMutable != null ? this.specifiedMutable.booleanValue() : this.defaultMutable; 
-	}
-	
-	public boolean isDefaultMutable() {
-		return this.defaultMutable;
-	}
-	
-	protected void setDefaultMutable(boolean newDefaultMutable) {
-		boolean oldDefaultMutable = this.defaultMutable;
-		this.defaultMutable = newDefaultMutable;
-		firePropertyChanged(DEFAULT_MUTABLE_PROPERTY, oldDefaultMutable, newDefaultMutable);
-	}
-	
-	public Boolean getSpecifiedMutable() {
-		return this.specifiedMutable;
-	}
-	
-	public void setSpecifiedMutable(Boolean newSpecifiedMutable) {
-		if (this.specifiedMutable == newSpecifiedMutable) {
-			return;
-		}
-		Boolean oldSpecifiedMutable = this.specifiedMutable;
-		this.specifiedMutable = newSpecifiedMutable;
-
-		if (newSpecifiedMutable != null) {
-			if (getResourceMutable() == null) {
-				addResourceMutable();
-			}
-			if (newSpecifiedMutable.booleanValue()) {
-				if (getResourceMutable().getValue() == Boolean.FALSE) {
-					getResourceMutable().setValue(null);
-				}
-			}
-			else {
-				getResourceMutable().setValue(Boolean.FALSE);
-			}
-		}
-		else {
-			removeResourceMutable();
-		}
-		firePropertyChanged(Mutable.SPECIFIED_MUTABLE_PROPERTY, oldSpecifiedMutable, newSpecifiedMutable);
-	}
-	
-	protected void setSpecifiedMutable_(Boolean newSpecifiedMutable) {
-		Boolean oldSpecifiedMutable = this.specifiedMutable;
-		this.specifiedMutable = newSpecifiedMutable;
-		firePropertyChanged(SPECIFIED_MUTABLE_PROPERTY, oldSpecifiedMutable, newSpecifiedMutable);
-	}
-	
-	public void initialize(JavaResourcePersistentAttribute jrpa) {
-		this.resourcePersistentAttribute = jrpa;
-		MutableAnnotation resourceMutable = this.getResourceMutable();
-		this.specifiedMutable = this.specifiedMutable(resourceMutable);
-		this.defaultMutable = this.calculateDefaultMutable();
-	}
-	
-	public void update(JavaResourcePersistentAttribute jrpa) {
-		this.resourcePersistentAttribute = jrpa;
-		MutableAnnotation resourceMutable = this.getResourceMutable();
-		this.setSpecifiedMutable_(this.specifiedMutable(resourceMutable));
-		this.setDefaultMutable(this.calculateDefaultMutable());
-	}
-	
-	private Boolean specifiedMutable(MutableAnnotation resourceMutable) {
-		if (resourceMutable == null) {
-			return null;
-		}
-		if (resourceMutable.getValue() == null) { //@Mutable is equivalent to @Mutable(true)
-			return Boolean.TRUE;
-		}
-		return resourceMutable.getValue();
-	}
-	
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		MutableAnnotation resourceMutable = this.getResourceMutable();
-		return resourceMutable == null ? null : resourceMutable.getTextRange(astRoot);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaObjectTypeConverter.java
deleted file mode 100644
index d653920865..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaObjectTypeConverter.java
+++ /dev/null
@@ -1,263 +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.eclipselink.core.internal.context.java;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.eclipselink.core.context.ConversionValue;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.eclipselink.core.context.ObjectTypeConverter;
-import org.eclipse.jpt.eclipselink.core.resource.java.ConversionValueAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.ObjectTypeConverterAnnotation;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationListIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkJavaObjectTypeConverter extends EclipseLinkJavaConverter
-	implements ObjectTypeConverter
-{	
-	private String dataType;
-	
-	private String objectType;
-	
-	private String defaultObjectValue;
-	
-	private final List<EclipseLinkJavaConversionValue> conversionValues;
-	
-	
-	public EclipseLinkJavaObjectTypeConverter(JavaJpaContextNode parent) {
-		super(parent);
-		this.conversionValues = new ArrayList<EclipseLinkJavaConversionValue>();
-	}
-	
-	
-	public String getType() {
-		return EclipseLinkConverter.OBJECT_TYPE_CONVERTER;
-	}
-
-	@Override
-	public String getAnnotationName() {
-		return ObjectTypeConverterAnnotation.ANNOTATION_NAME;
-	}
-	
-	@Override
-	protected ObjectTypeConverterAnnotation getAnnotation() {
-		return (ObjectTypeConverterAnnotation) super.getAnnotation();
-	}
-	
-	
-	// **************** data type **********************************************
-	
-	public String getDataType() {
-		return this.dataType;
-	}
-	
-	public void setDataType(String newDataType) {
-		String oldDataType = this.dataType;
-		this.dataType = newDataType;
-		getAnnotation().setDataType(newDataType);
-		firePropertyChanged(DATA_TYPE_PROPERTY, oldDataType, newDataType);
-	}
-	
-	protected void setDataType_(String newDataType) {
-		String oldDataType = this.dataType;
-		this.dataType = newDataType;
-		firePropertyChanged(DATA_TYPE_PROPERTY, oldDataType, newDataType);
-	}
-	
-	
-	// **************** object type ********************************************
-	
-	public String getObjectType() {
-		return this.objectType;
-	}
-	
-	public void setObjectType(String newObjectType) {
-		String oldObjectType = this.objectType;
-		this.objectType = newObjectType;
-		getAnnotation().setObjectType(newObjectType);
-		firePropertyChanged(OBJECT_TYPE_PROPERTY, oldObjectType, newObjectType);
-	}
-	
-	protected void setObjectType_(String newObjectType) {
-		String oldObjectType = this.objectType;
-		this.objectType = newObjectType;
-		firePropertyChanged(OBJECT_TYPE_PROPERTY, oldObjectType, newObjectType);
-	}
-	
-	
-	// **************** conversion values **************************************
-	
-	public ListIterator<EclipseLinkJavaConversionValue> conversionValues() {
-		return new CloneListIterator<EclipseLinkJavaConversionValue>(this.conversionValues);
-	}
-	
-	public int conversionValuesSize() {
-		return this.conversionValues.size();
-	}
-	
-	public EclipseLinkJavaConversionValue addConversionValue(int index) {
-		EclipseLinkJavaConversionValue conversionValue = new EclipseLinkJavaConversionValue(this);
-		this.conversionValues.add(index, conversionValue);
-		ConversionValueAnnotation resourceConversionValue = getAnnotation().addConversionValue(index);
-		conversionValue.initialize(resourceConversionValue);
-		fireItemAdded(CONVERSION_VALUES_LIST, index, conversionValue);
-		return conversionValue;
-	}
-	
-	public EclipseLinkJavaConversionValue addConversionValue() {
-		return this.addConversionValue(this.conversionValues.size());
-	}
-	
-	protected void addConversionValue(int index, EclipseLinkJavaConversionValue conversionValue) {
-		addItemToList(index, conversionValue, this.conversionValues, CONVERSION_VALUES_LIST);
-	}
-	
-	protected void addConversionValue(EclipseLinkJavaConversionValue conversionValue) {
-		this.addConversionValue(this.conversionValues.size(), conversionValue);
-	}
-	
-	public void removeConversionValue(ConversionValue conversionValue) {
-		this.removeConversionValue(this.conversionValues.indexOf(conversionValue));
-	}
-	
-	public void removeConversionValue(int index) {
-		EclipseLinkJavaConversionValue removedConversionValue = this.conversionValues.remove(index);
-		getAnnotation().removeConversionValue(index);
-		fireItemRemoved(CONVERSION_VALUES_LIST, index, removedConversionValue);
-	}
-	
-	protected void removeConversionValue_(EclipseLinkJavaConversionValue conversionValue) {
-		removeItemFromList(conversionValue, this.conversionValues, CONVERSION_VALUES_LIST);
-	}
-	
-	public void moveConversionValue(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.conversionValues, targetIndex, sourceIndex);
-		getAnnotation().moveConversionValue(targetIndex, sourceIndex);
-		fireItemMoved(CONVERSION_VALUES_LIST, targetIndex, sourceIndex);		
-	}
-	
-	public ListIterator<String> dataValues() {
-		return new TransformationListIterator<EclipseLinkJavaConversionValue, String>(conversionValues()) {
-			@Override
-			protected String transform(EclipseLinkJavaConversionValue next) {
-				return next.getDataValue();
-			}
-		};
-	}
-	
-	
-	// **************** default object value ***********************************
-	
-	public String getDefaultObjectValue() {
-		return this.defaultObjectValue;
-	}
-	
-	public void setDefaultObjectValue(String newDefaultObjectValue) {
-		String oldDefaultObjectValue = this.defaultObjectValue;
-		this.defaultObjectValue = newDefaultObjectValue;
-		getAnnotation().setDefaultObjectValue(newDefaultObjectValue);
-		firePropertyChanged(DEFAULT_OBJECT_VALUE_PROPERTY, oldDefaultObjectValue, newDefaultObjectValue);
-	}
-	
-	protected void setDefaultObjectValue_(String newDefaultObjectValue) {
-		String oldDefaultObjectValue = this.defaultObjectValue;
-		this.defaultObjectValue = newDefaultObjectValue;
-		firePropertyChanged(DEFAULT_OBJECT_VALUE_PROPERTY, oldDefaultObjectValue, newDefaultObjectValue);
-	}
-	
-	
-	// **************** resource interaction ***********************************
-	
-	@Override
-	protected void initialize(JavaResourcePersistentMember jrpm) {
-		super.initialize(jrpm);
-		ObjectTypeConverterAnnotation resourceConverter = getAnnotation();
-		this.dataType = this.dataType(resourceConverter);
-		this.objectType = this.objectType(resourceConverter);
-		this.defaultObjectValue = this.defaultObjectValue(resourceConverter);
-		this.initializeConversionValues(resourceConverter);
-	}
-	
-	protected void initializeConversionValues(ObjectTypeConverterAnnotation resourceConverter) {
-		if (resourceConverter == null) {
-			return;
-		}
-		ListIterator<ConversionValueAnnotation> resourceConversionValues = resourceConverter.conversionValues();
-		
-		while(resourceConversionValues.hasNext()) {
-			this.conversionValues.add(buildConversionValue(resourceConversionValues.next()));
-		}
-	}
-
-	protected EclipseLinkJavaConversionValue buildConversionValue(ConversionValueAnnotation resourceConversionValue) {
-		EclipseLinkJavaConversionValue conversionValue = new EclipseLinkJavaConversionValue(this);
-		conversionValue.initialize(resourceConversionValue);
-		return conversionValue;
-	}
-	
-	@Override
-	public void update(JavaResourcePersistentMember jrpm) {
-		super.update(jrpm);
-		ObjectTypeConverterAnnotation resourceConverter = getAnnotation();
-		this.setDataType_(this.dataType(resourceConverter));
-		this.setObjectType_(this.objectType(resourceConverter));
-		this.setDefaultObjectValue_(this.defaultObjectValue(resourceConverter));
-		this.updateConversionValues(resourceConverter);
-	}
-	
-	protected void updateConversionValues(ObjectTypeConverterAnnotation resourceConverter) {
-		ListIterator<EclipseLinkJavaConversionValue> contextConversionValues = conversionValues();
-		ListIterator<ConversionValueAnnotation> resourceConversionValues = resourceConverter.conversionValues();
-		while (contextConversionValues.hasNext()) {
-			EclipseLinkJavaConversionValue conversionValues = contextConversionValues.next();
-			if (resourceConversionValues.hasNext()) {
-				conversionValues.update(resourceConversionValues.next());
-			}
-			else {
-				removeConversionValue_(conversionValues);
-			}
-		}
-		
-		while (resourceConversionValues.hasNext()) {
-			addConversionValue(buildConversionValue(resourceConversionValues.next()));
-		}
-	}
-	
-	protected String dataType(ObjectTypeConverterAnnotation resourceConverter) {
-		return resourceConverter == null ? null : resourceConverter.getDataType();
-	}
-	
-	protected String objectType(ObjectTypeConverterAnnotation resourceConverter) {
-		return resourceConverter == null ? null : resourceConverter.getObjectType();
-	}
-	
-	protected String defaultObjectValue(ObjectTypeConverterAnnotation resourceConverter) {
-		return resourceConverter == null ? null : resourceConverter.getDefaultObjectValue();
-	}
-	
-	
-	// **************** validation *********************************************
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		for (Iterator<EclipseLinkJavaConversionValue> stream = conversionValues(); stream.hasNext();) {
-			stream.next().validate(messages, reporter, astRoot);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMapping.java
deleted file mode 100644
index 1f4743bc0e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMapping.java
+++ /dev/null
@@ -1,119 +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.eclipselink.core.internal.context.java;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaRelationshipReference;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaOneToManyMapping;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkOneToManyMapping;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetch;
-import org.eclipse.jpt.eclipselink.core.context.PrivateOwned;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-import org.eclipse.jpt.eclipselink.core.resource.java.PrivateOwnedAnnotation;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.internal.iterators.CompositeIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkJavaOneToManyMapping
-	extends GenericJavaOneToManyMapping
-	implements EclipseLinkOneToManyMapping
-{
-	protected final EclipseLinkJavaJoinFetch joinFetch;
-	
-	protected final EclipseLinkJavaPrivateOwned privateOwned;
-	
-	
-	public EclipseLinkJavaOneToManyMapping(JavaPersistentAttribute parent) {
-		super(parent);
-		this.joinFetch = new EclipseLinkJavaJoinFetch(this);
-		this.privateOwned = new EclipseLinkJavaPrivateOwned(this);
-	}
-	
-	
-	@Override
-	protected JavaRelationshipReference buildRelationshipReference() {
-		return new EclipseLinkJavaOneToManyRelationshipReference(this);
-	}
-	
-	@Override
-	public Iterator<String> supportingAnnotationNames() {
-		return new CompositeIterator<String>(
-			super.supportingAnnotationNames(),
-			new ArrayIterator<String>(
-				EclipseLinkJPA.JOIN_FETCH,
-				EclipseLinkJPA.PRIVATE_OWNED));
-	}
-	
-	@Override
-	public EclipseLinkJavaOneToManyRelationshipReference getRelationshipReference() {
-		return (EclipseLinkJavaOneToManyRelationshipReference) super.getRelationshipReference();
-	}
-	
-	
-	// **************** private owned ******************************************
-	
-	public PrivateOwned getPrivateOwned() {
-		return this.privateOwned;
-	}
-	
-	protected String getPrivateOwnedAnnotationName() {
-		return PrivateOwnedAnnotation.ANNOTATION_NAME;
-	}
-	
-	protected PrivateOwnedAnnotation getResourcePrivateOwned() {
-		return (PrivateOwnedAnnotation) this.resourcePersistentAttribute.getSupportingAnnotation(getPrivateOwnedAnnotationName());
-	}
-	
-	protected void addResourcePrivateOwned() {
-		this.resourcePersistentAttribute.addSupportingAnnotation(getPrivateOwnedAnnotationName());
-	}
-	
-	protected void removeResourcePrivateOwned() {
-		this.resourcePersistentAttribute.removeSupportingAnnotation(getPrivateOwnedAnnotationName());
-	}
-	
-	
-	// **************** join fetch *********************************************
-	
-	public JoinFetch getJoinFetch() {
-		return this.joinFetch;
-	}
-	
-	
-	// **************** resource -> context ************************************
-	
-	@Override
-	protected void initialize() {
-		super.initialize();
-		this.joinFetch.initialize(this.resourcePersistentAttribute);
-		this.privateOwned.initialize(this.resourcePersistentAttribute);
-	}
-	
-	@Override
-	protected void update() {
-		super.update();
-		this.joinFetch.update(this.resourcePersistentAttribute);
-		this.privateOwned.update(this.resourcePersistentAttribute);
-	}
-	
-	
-	// **************** 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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMappingProvider.java
deleted file mode 100644
index 00be8b27a8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMappingProvider.java
+++ /dev/null
@@ -1,56 +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.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.context.java.DefaultJavaAttributeMappingProvider;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.java.JavaOneToManyMappingProvider;
-
-public class EclipseLinkJavaOneToManyMappingProvider
-	implements DefaultJavaAttributeMappingProvider
-{
-
-	// singleton
-	private static final EclipseLinkJavaOneToManyMappingProvider INSTANCE = new EclipseLinkJavaOneToManyMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static DefaultJavaAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkJavaOneToManyMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return JavaOneToManyMappingProvider.instance().getKey();
-	}
-	
-	public String getAnnotationName() {
-		return JavaOneToManyMappingProvider.instance().getAnnotationName();
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaFactory factory) {
-		return JavaOneToManyMappingProvider.instance().buildMapping(parent, factory);
-	}
-	
-	public boolean defaultApplies(JavaPersistentAttribute persistentAttribute) {
-		String targetEntity = persistentAttribute.getMultiReferenceEntityTypeName();
-		return (targetEntity != null) 
-				&& (persistentAttribute.getPersistenceUnit().getEntity(targetEntity) != null);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyRelationshipReference.java
deleted file mode 100644
index 6e21acf153..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyRelationshipReference.java
+++ /dev/null
@@ -1,150 +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.eclipselink.core.internal.context.java;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.AttributeMapping;
-import org.eclipse.jpt.core.context.JoiningStrategy;
-import org.eclipse.jpt.core.context.java.JavaJoinColumnEnabledRelationshipReference;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaOneToManyRelationshipReference;
-import org.eclipse.jpt.core.internal.context.java.JavaJoinColumnJoiningStrategy;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkOneToManyRelationshipReference;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkJavaOneToManyRelationshipReference
-	extends GenericJavaOneToManyRelationshipReference
-	implements EclipseLinkOneToManyRelationshipReference,
-		JavaJoinColumnEnabledRelationshipReference
-{
-	protected final JavaJoinColumnJoiningStrategy joinColumnJoiningStrategy;
-	
-	
-	public EclipseLinkJavaOneToManyRelationshipReference(
-			EclipseLinkJavaOneToManyMapping parent) {
-		super(parent);
-		this.joinColumnJoiningStrategy = new JavaJoinColumnJoiningStrategy(this);
-	}
-	
-	
-	@Override
-	public EclipseLinkJavaOneToManyMapping getRelationshipMapping() {
-		return (EclipseLinkJavaOneToManyMapping) getParent();
-	}
-	
-	
-	@Override
-	protected JoiningStrategy calculatePredominantJoiningStrategy() {
-		if (this.mappedByJoiningStrategy.getMappedByAttribute() != null) {
-			return this.mappedByJoiningStrategy;
-		}
-		else if (this.joinColumnJoiningStrategy.hasSpecifiedJoinColumns()) {
-			return this.joinColumnJoiningStrategy;
-		}
-		else {
-			return this.joinTableJoiningStrategy;
-		}
-	}
-	
-	@Override
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot);
-		if (result == null) {
-			result = this.joinColumnJoiningStrategy.javaCompletionProposals(pos, filter, astRoot);
-		}
-		return result;
-	}
-	
-	
-	// **************** mapped by **********************************************
-	
-	@Override
-	public void setMappedByJoiningStrategy() {
-		this.joinColumnJoiningStrategy.removeStrategy();
-		super.setMappedByJoiningStrategy();
-	}
-	
-	@Override
-	public boolean mayBeMappedBy(AttributeMapping mappedByMapping) {
-		return super.mayBeMappedBy(mappedByMapping) ||
-			mappedByMapping.getKey() == MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	
-	// **************** join table *********************************************
-	
-	@Override
-	public void setJoinTableJoiningStrategy() {
-		this.joinColumnJoiningStrategy.removeStrategy();
-		super.setJoinTableJoiningStrategy();
-	}
-	
-	@Override
-	public boolean mayHaveDefaultJoinTable() {
-		return super.mayHaveDefaultJoinTable()
-			&& ! this.joinColumnJoiningStrategy.hasSpecifiedJoinColumns();
-	}
-	
-	
-	// **************** join columns *******************************************
-	
-	public JavaJoinColumnJoiningStrategy getJoinColumnJoiningStrategy() {
-		return this.joinColumnJoiningStrategy;
-	}
-	
-	public boolean usesJoinColumnJoiningStrategy() {
-		return getPredominantJoiningStrategy() == this.joinColumnJoiningStrategy;
-	}
-	
-	public void setJoinColumnJoiningStrategy() {
-		this.mappedByJoiningStrategy.removeStrategy();
-		this.joinTableJoiningStrategy.removeStrategy();
-		this.joinColumnJoiningStrategy.addStrategy();
-	}
-	
-	public void unsetJoinColumnJoiningStrategy() {
-		this.joinColumnJoiningStrategy.removeStrategy();
-	}
-	
-	public boolean mayHaveDefaultJoinColumn() {
-		return this.mappedByJoiningStrategy.getMappedByAttribute() == null 
-			&& this.joinTableJoiningStrategy.getJoinTable() == null;
-	}
-	
-	
-	
-	// **************** resource => context ************************************
-	
-	@Override
-	protected void initializeJoiningStrategies() {
-		this.joinColumnJoiningStrategy.initialize();
-		super.initializeJoiningStrategies();
-	}
-	
-	@Override
-	protected void updateJoiningStrategies() {
-		this.joinColumnJoiningStrategy.update();
-		super.updateJoiningStrategies();
-	}
-	
-	
-	// **************** Validation *********************************************
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.joinColumnJoiningStrategy.validate(messages, reporter, astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingImpl.java
deleted file mode 100644
index 7a1becd1de..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingImpl.java
+++ /dev/null
@@ -1,78 +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.eclipselink.core.internal.context.java;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaOneToOneMapping;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkOneToOneMapping;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetch;
-import org.eclipse.jpt.eclipselink.core.context.PrivateOwned;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.internal.iterators.CompositeIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkJavaOneToOneMappingImpl
-	extends GenericJavaOneToOneMapping
-	implements EclipseLinkOneToOneMapping
-{
-	protected final EclipseLinkJavaJoinFetch joinFetch;
-	
-	protected final EclipseLinkJavaPrivateOwned privateOwned;
-	
-	
-	public EclipseLinkJavaOneToOneMappingImpl(JavaPersistentAttribute parent) {
-		super(parent);
-		this.joinFetch = new EclipseLinkJavaJoinFetch(this);
-		this.privateOwned = new EclipseLinkJavaPrivateOwned(this);
-	}
-	
-	
-	@Override
-	public Iterator<String> supportingAnnotationNames() {
-		return new CompositeIterator<String>(
-			super.supportingAnnotationNames(),
-			new ArrayIterator<String>(
-				EclipseLinkJPA.JOIN_FETCH));
-	}
-	
-	public JoinFetch getJoinFetch() {
-		return this.joinFetch;
-	}
-
-	public PrivateOwned getPrivateOwned() {
-		return this.privateOwned;
-	}
-	
-	@Override
-	protected void initialize() {
-		super.initialize();
-		this.joinFetch.initialize(this.resourcePersistentAttribute);
-		this.privateOwned.initialize(this.resourcePersistentAttribute);
-	}
-	
-	@Override
-	protected void update() {
-		super.update();
-		this.joinFetch.update(this.resourcePersistentAttribute);
-		this.privateOwned.update(this.resourcePersistentAttribute);
-	}
-	
-	@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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingProvider.java
deleted file mode 100644
index aa902057db..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingProvider.java
+++ /dev/null
@@ -1,56 +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.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.context.java.DefaultJavaAttributeMappingProvider;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.java.JavaOneToOneMappingProvider;
-
-public class EclipseLinkJavaOneToOneMappingProvider
-	implements DefaultJavaAttributeMappingProvider
-{
-
-	// singleton
-	private static final EclipseLinkJavaOneToOneMappingProvider INSTANCE = new EclipseLinkJavaOneToOneMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static DefaultJavaAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkJavaOneToOneMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return JavaOneToOneMappingProvider.instance().getKey();
-	}
-	
-	public String getAnnotationName() {
-		return JavaOneToOneMappingProvider.instance().getAnnotationName();
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaFactory factory) {
-		return JavaOneToOneMappingProvider.instance().buildMapping(parent, factory);
-	}
-	
-	public boolean defaultApplies(JavaPersistentAttribute persistentAttribute) {
-		String targetEntity = persistentAttribute.getSingleReferenceEntityTypeName();
-		return (targetEntity != null)
-				&& (persistentAttribute.getPersistenceUnit().getEntity(targetEntity) != null);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaPersistentAttribute.java
deleted file mode 100644
index 5346355285..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaPersistentAttribute.java
+++ /dev/null
@@ -1,38 +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.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.core.context.AccessType;
-import org.eclipse.jpt.core.context.PersistentType;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-
-/**
- * EclipseLink Java persistent attribute
- */
-public class EclipseLinkJavaPersistentAttribute
-	extends AbstractEclipseLinkJavaPersistentAttribute
-{
-	public EclipseLinkJavaPersistentAttribute(PersistentType parent, JavaResourcePersistentAttribute jrpa) {
-		super(parent, jrpa);
-	}
-
-
-	// ********** AccessHolder implementation **********
-
-	public AccessType getSpecifiedAccess() {
-		return null;
-	}
-
-	public void setSpecifiedAccess(AccessType specifiedAccess) {
-		throw new UnsupportedOperationException();
-	}
-
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaPrivateOwned.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaPrivateOwned.java
deleted file mode 100644
index 98cf3ec2bb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaPrivateOwned.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.PrivateOwned;
-import org.eclipse.jpt.eclipselink.core.resource.java.PrivateOwnedAnnotation;
-
-public class EclipseLinkJavaPrivateOwned extends AbstractJavaJpaContextNode implements PrivateOwned
-{
-	protected boolean privateOwned;
-	
-	protected JavaResourcePersistentAttribute resourcePersistentAttribute;
-	
-	public EclipseLinkJavaPrivateOwned(JavaAttributeMapping parent) {
-		super(parent);
-	}
-	
-	protected String getPrivateOwnedAnnotationName() {
-		return PrivateOwnedAnnotation.ANNOTATION_NAME;
-	}
-	
-	protected PrivateOwnedAnnotation getResourcePrivateOwned() {
-		return (PrivateOwnedAnnotation) this.resourcePersistentAttribute.getSupportingAnnotation(getPrivateOwnedAnnotationName());
-	}
-	
-	protected void addResourcePrivateOwned() {
-		this.resourcePersistentAttribute.addSupportingAnnotation(getPrivateOwnedAnnotationName());
-	}
-	
-	protected void removeResourcePrivateOwned() {
-		this.resourcePersistentAttribute.removeSupportingAnnotation(getPrivateOwnedAnnotationName());
-	}
-
-	public boolean isPrivateOwned() {
-		return this.privateOwned;
-	}
-	
-	public void setPrivateOwned(boolean newPrivateOwned) {
-		if (this.privateOwned == newPrivateOwned) {
-			return;
-		}
-		boolean oldPrivateOwned = this.privateOwned;
-		this.privateOwned = newPrivateOwned;
-
-		if (newPrivateOwned) {
-			addResourcePrivateOwned();
-		}
-		else {
-			//have to check if annotation exists in case the change is from false to null or vice versa
-			if (getResourcePrivateOwned() != null) {
-				removeResourcePrivateOwned();
-			}
-		}
-		firePropertyChanged(PRIVATE_OWNED_PROPERTY, oldPrivateOwned, newPrivateOwned);
-	}
-	
-	protected void setPrivateOwned_(boolean newPrivateOwned) {
-		boolean oldPrivateOwned = this.privateOwned;
-		this.privateOwned = newPrivateOwned;
-		firePropertyChanged(PRIVATE_OWNED_PROPERTY, oldPrivateOwned, newPrivateOwned);
-	}
-	
-	public void initialize(JavaResourcePersistentAttribute jrpa) {
-		this.resourcePersistentAttribute = jrpa;
-		this.privateOwned = privateOwned();
-	}
-	
-	public void update(JavaResourcePersistentAttribute jrpa) {
-		this.resourcePersistentAttribute = jrpa;
-		this.setPrivateOwned_(privateOwned());
-	}
-	
-	private boolean privateOwned() {
-		return getResourcePrivateOwned() != null;
-	}
-	
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		PrivateOwnedAnnotation resourcePrivateOwned = this.getResourcePrivateOwned();
-		return resourcePrivateOwned == null ? null : resourcePrivateOwned.getTextRange(astRoot);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaReadOnly.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaReadOnly.java
deleted file mode 100644
index f7caeddb82..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaReadOnly.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaTypeMapping;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.ReadOnly;
-import org.eclipse.jpt.eclipselink.core.resource.java.ReadOnlyAnnotation;
-
-public class EclipseLinkJavaReadOnly extends AbstractJavaJpaContextNode implements ReadOnly
-{
-	protected Boolean specifiedReadOnly;
-	
-	protected JavaResourcePersistentType resourcePersistentType;
-	
-	
-	public EclipseLinkJavaReadOnly(JavaTypeMapping parent) {
-		super(parent);
-	}
-	
-	
-	protected String getReadOnlyAnnotationName() {
-		return ReadOnlyAnnotation.ANNOTATION_NAME;
-	}
-	
-	protected ReadOnlyAnnotation getResourceReadOnly() {
-		return (ReadOnlyAnnotation) this.resourcePersistentType.getSupportingAnnotation(getReadOnlyAnnotationName());
-	}
-	
-	protected void addResourceReadOnly() {
-		this.resourcePersistentType.addSupportingAnnotation(getReadOnlyAnnotationName());
-	}
-	
-	protected void removeResourceReadOnly() {
-		this.resourcePersistentType.removeSupportingAnnotation(getReadOnlyAnnotationName());
-	}
-
-	public boolean isReadOnly() {
-		return (this.getSpecifiedReadOnly() != null) ? this.getSpecifiedReadOnly().booleanValue() : this.isDefaultReadOnly();
-	}
-	
-	public boolean isDefaultReadOnly() {
-		return ReadOnly.DEFAULT_READ_ONLY;
-	}
-	
-	public Boolean getSpecifiedReadOnly() {
-		return this.specifiedReadOnly;
-	}
-	
-	public void setSpecifiedReadOnly(Boolean newReadOnly) {
-		if (this.specifiedReadOnly == newReadOnly) {
-			return;
-		}
-		Boolean oldReadOnly = this.specifiedReadOnly;
-		this.specifiedReadOnly = newReadOnly;
-
-		if (newReadOnly != null && newReadOnly.booleanValue()) {
-			addResourceReadOnly();
-		}
-		else {
-			//have to check if annotation exists in case the change is from false to null or vice versa
-			if (getResourceReadOnly() != null) {
-				removeResourceReadOnly();
-			}
-		}
-		firePropertyChanged(SPECIFIED_READ_ONLY_PROPERTY, oldReadOnly, newReadOnly);
-	}
-	
-	protected void setSpecifiedReadOnly_(Boolean newReadOnly) {
-		Boolean oldReadOnly = this.specifiedReadOnly;
-		this.specifiedReadOnly = newReadOnly;
-		firePropertyChanged(SPECIFIED_READ_ONLY_PROPERTY, oldReadOnly, newReadOnly);
-	}
-	
-	public void initialize(JavaResourcePersistentType jrpt) {
-		this.resourcePersistentType = jrpt;
-		this.specifiedReadOnly = readOnly();
-	}
-	
-	public void update(JavaResourcePersistentType jrpt) {
-		this.resourcePersistentType = jrpt;
-		this.setSpecifiedReadOnly_(readOnly());
-	}
-	
-	private Boolean readOnly() {
-		return getResourceReadOnly() == null ? null : Boolean.TRUE;
-	}
-	
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		ReadOnlyAnnotation resourceReadOnly = this.getResourceReadOnly();
-		return resourceReadOnly == null ? null : resourceReadOnly.getTextRange(astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaStructConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaStructConverter.java
deleted file mode 100644
index 61de8f1150..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaStructConverter.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.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.eclipselink.core.context.StructConverter;
-import org.eclipse.jpt.eclipselink.core.resource.java.StructConverterAnnotation;
-
-public class EclipseLinkJavaStructConverter extends EclipseLinkJavaConverter
-	implements StructConverter
-{	
-	private String converterClass;
-	
-	
-	public EclipseLinkJavaStructConverter(JavaJpaContextNode parent) {
-		super(parent);
-	}
-	
-	
-	public String getType() {
-		return EclipseLinkConverter.STRUCT_CONVERTER;
-	}
-	
-	@Override
-	public String getAnnotationName() {
-		return StructConverterAnnotation.ANNOTATION_NAME;
-	}
-	
-	@Override
-	protected StructConverterAnnotation getAnnotation() {
-		return (StructConverterAnnotation) super.getAnnotation();
-	}
-	
-	
-	// **************** converter class ****************************************
-	
-	public String getConverterClass() {
-		return this.converterClass;
-	}
-	
-	public void setConverterClass(String newConverterClass) {
-		String oldConverterClass = this.converterClass;
-		this.converterClass = newConverterClass;
-		getAnnotation().setConverter(newConverterClass);
-		firePropertyChanged(CONVERTER_CLASS_PROPERTY, oldConverterClass, newConverterClass);
-	}
-	
-	protected void setConverterClass_(String newConverterClass) {
-		String oldConverterClass = this.converterClass;
-		this.converterClass = newConverterClass;
-		firePropertyChanged(CONVERTER_CLASS_PROPERTY, oldConverterClass, newConverterClass);
-	}
-	
-	
-	// **************** resource interaction ***********************************
-	
-	@Override
-	protected void initialize(JavaResourcePersistentMember jrpm) {
-		super.initialize(jrpm);
-		this.converterClass = this.converterClass(getAnnotation());
-	}
-	
-	@Override
-	public void update(JavaResourcePersistentMember jrpm) {
-		super.update(jrpm);
-		this.setConverterClass_(this.converterClass(getAnnotation()));
-	}
-	
-	protected String converterClass(StructConverterAnnotation resourceConverter) {
-		return resourceConverter == null ? null : resourceConverter.getConverter();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaTypeConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaTypeConverter.java
deleted file mode 100644
index fecadc7c3e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaTypeConverter.java
+++ /dev/null
@@ -1,110 +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.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.eclipselink.core.context.TypeConverter;
-import org.eclipse.jpt.eclipselink.core.resource.java.TypeConverterAnnotation;
-
-public class EclipseLinkJavaTypeConverter extends EclipseLinkJavaConverter
-	implements TypeConverter
-{	
-	private String dataType;
-	
-	private String objectType;
-	
-	
-	public EclipseLinkJavaTypeConverter(JavaJpaContextNode parent) {
-		super(parent);
-	}
-	
-	public String getType() {
-		return EclipseLinkConverter.TYPE_CONVERTER;
-	}
-	
-	@Override
-	public String getAnnotationName() {
-		return TypeConverterAnnotation.ANNOTATION_NAME;
-	}
-	
-	@Override
-	protected TypeConverterAnnotation getAnnotation() {
-		return (TypeConverterAnnotation) super.getAnnotation();
-	}
-	
-	
-	// **************** data type **********************************************
-	
-	public String getDataType() {
-		return this.dataType;
-	}
-	
-	public void setDataType(String newDataType) {
-		String oldDataType = this.dataType;
-		this.dataType = newDataType;
-		getAnnotation().setDataType(newDataType);
-		firePropertyChanged(DATA_TYPE_PROPERTY, oldDataType, newDataType);
-	}
-	
-	protected void setDataType_(String newDataType) {
-		String oldDataType = this.dataType;
-		this.dataType = newDataType;
-		firePropertyChanged(DATA_TYPE_PROPERTY, oldDataType, newDataType);
-	}
-	
-	
-	// **************** object type ********************************************
-	
-	public String getObjectType() {
-		return this.objectType;
-	}
-	
-	public void setObjectType(String newObjectType) {
-		String oldObjectType = this.objectType;
-		this.objectType = newObjectType;
-		getAnnotation().setObjectType(newObjectType);
-		firePropertyChanged(OBJECT_TYPE_PROPERTY, oldObjectType, newObjectType);
-	}
-	
-	protected void setObjectType_(String newObjectType) {
-		String oldObjectType = this.objectType;
-		this.objectType = newObjectType;
-		firePropertyChanged(OBJECT_TYPE_PROPERTY, oldObjectType, newObjectType);
-	}
-	
-	
-	// **************** resource interaction ***********************************
-	
-	@Override
-	protected void initialize(JavaResourcePersistentMember jrpm) {
-		super.initialize(jrpm);
-		TypeConverterAnnotation resourceConverter = getAnnotation();
-		this.dataType = this.dataType(resourceConverter);
-		this.objectType = this.objectType(resourceConverter);
-	}
-	
-	@Override
-	public void update(JavaResourcePersistentMember jrpm) {
-		super.update(jrpm);
-		TypeConverterAnnotation resourceConverter = getAnnotation();
-		this.setDataType_(this.dataType(resourceConverter));
-		this.setObjectType_(this.objectType(resourceConverter));
-	}
-	
-	protected String dataType(TypeConverterAnnotation resourceConverter) {
-		return resourceConverter == null ? null : resourceConverter.getDataType();
-	}
-	
-	protected String objectType(TypeConverterAnnotation resourceConverter) {
-		return resourceConverter == null ? null : resourceConverter.getObjectType();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaVersionMappingImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaVersionMappingImpl.java
deleted file mode 100644
index aeab81af3d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaVersionMappingImpl.java
+++ /dev/null
@@ -1,88 +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.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaConverter;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaVersionMapping;
-import org.eclipse.jpt.eclipselink.core.context.Convert;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkVersionMapping;
-import org.eclipse.jpt.eclipselink.core.context.Mutable;
-import org.eclipse.jpt.eclipselink.core.resource.java.ConvertAnnotation;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkJavaVersionMappingImpl
-	extends GenericJavaVersionMapping
-	implements EclipseLinkVersionMapping
-{
-	protected final EclipseLinkJavaMutable mutable;
-	
-	public EclipseLinkJavaVersionMappingImpl(JavaPersistentAttribute parent) {
-		super(parent);
-		this.mutable = new EclipseLinkJavaMutable(this);
-	}
-
-	@Override
-	protected JavaConverter buildSpecifiedConverter(String converterType) {
-		JavaConverter javaConverter = super.buildSpecifiedConverter(converterType);
-		if (javaConverter != null) {
-			return javaConverter;
-		}
-		if (converterType == Convert.ECLIPSE_LINK_CONVERTER) {
-			return new EclipseLinkJavaConvert(this, this.resourcePersistentAttribute);
-		}
-		return null;
-	}
-	
-	@Override
-	protected String getResourceConverterType() {
-		//check @Convert first, this is the order that EclipseLink searches
-		if (this.resourcePersistentAttribute.getSupportingAnnotation(ConvertAnnotation.ANNOTATION_NAME) != null) {
-			return Convert.ECLIPSE_LINK_CONVERTER;
-		}
-		return super.getResourceConverterType();
-	}
-	
-	
-	
-	//************ EclipselinkVersionMapping implementation ****************
-	
-	public Mutable getMutable() {
-		return this.mutable;
-	}
-	
-	
-	//************ initialization/update ****************
-
-	@Override
-	protected void initialize() {
-		super.initialize();
-		this.mutable.initialize(this.resourcePersistentAttribute);
-	}
-	
-	@Override
-	protected void update() {
-		super.update();
-		this.mutable.update(this.resourcePersistentAttribute);
-	}
-	
-	
-	//************ 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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaBasicCollectionMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaBasicCollectionMapping.java
deleted file mode 100644
index b0a3324c0a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaBasicCollectionMapping.java
+++ /dev/null
@@ -1,40 +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.eclipselink.core.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.context.BasicCollectionMapping;
-import org.eclipse.jpt.eclipselink.core.resource.java.BasicCollectionAnnotation;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-
-public class JavaBasicCollectionMapping
-	extends AbstractJavaAttributeMapping<BasicCollectionAnnotation>
-	implements BasicCollectionMapping
-{
-	
-	public JavaBasicCollectionMapping(JavaPersistentAttribute parent) {
-		super(parent);
-	}
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.BASIC_COLLECTION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return BasicCollectionAnnotation.ANNOTATION_NAME;
-	}
-	
-	public Iterator<String> supportingAnnotationNames() {
-		return EmptyIterator.instance();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaBasicCollectionMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaBasicCollectionMappingProvider.java
deleted file mode 100644
index b2c084cc27..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaBasicCollectionMappingProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaAttributeMappingProvider;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.java.BasicCollectionAnnotation;
-
-public class JavaBasicCollectionMappingProvider
-	implements JavaAttributeMappingProvider
-{
-
-	// singleton
-	private static final JavaBasicCollectionMappingProvider INSTANCE = new JavaBasicCollectionMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private JavaBasicCollectionMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return EclipseLinkMappingKeys.BASIC_COLLECTION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return BasicCollectionAnnotation.ANNOTATION_NAME;
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildJavaBasicCollectionMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaBasicMapMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaBasicMapMapping.java
deleted file mode 100644
index 733a95b92a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaBasicMapMapping.java
+++ /dev/null
@@ -1,40 +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.eclipselink.core.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.context.BasicMapMapping;
-import org.eclipse.jpt.eclipselink.core.resource.java.BasicMapAnnotation;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-
-public class JavaBasicMapMapping
-	extends AbstractJavaAttributeMapping<BasicMapAnnotation>
-	implements BasicMapMapping
-{
-	
-	public JavaBasicMapMapping(JavaPersistentAttribute parent) {
-		super(parent);
-	}
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.BASIC_MAP_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return BasicMapAnnotation.ANNOTATION_NAME;
-	}
-	
-	public Iterator<String> supportingAnnotationNames() {
-		return EmptyIterator.instance();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaBasicMapMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaBasicMapMappingProvider.java
deleted file mode 100644
index 7c1eadad99..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaBasicMapMappingProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaAttributeMappingProvider;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.java.BasicMapAnnotation;
-
-public class JavaBasicMapMappingProvider
-	implements JavaAttributeMappingProvider
-{
-
-	// singleton
-	private static final JavaBasicMapMappingProvider INSTANCE = new JavaBasicMapMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private JavaBasicMapMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return EclipseLinkMappingKeys.BASIC_MAP_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return BasicMapAnnotation.ANNOTATION_NAME;
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildJavaBasicMapMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaTransformationMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaTransformationMapping.java
deleted file mode 100644
index 4e120cc2a8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaTransformationMapping.java
+++ /dev/null
@@ -1,40 +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.eclipselink.core.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.context.TransformationMapping;
-import org.eclipse.jpt.eclipselink.core.resource.java.TransformationAnnotation;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-
-public class JavaTransformationMapping 
-	extends AbstractJavaAttributeMapping<TransformationAnnotation> 
-	implements TransformationMapping
-{
-	
-	public JavaTransformationMapping(JavaPersistentAttribute parent) {
-		super(parent);
-	}
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.TRANSFORMATION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return TransformationAnnotation.ANNOTATION_NAME;
-	}
-	
-	public Iterator<String> supportingAnnotationNames() {
-		return EmptyIterator.instance();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaTransformationMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaTransformationMappingProvider.java
deleted file mode 100644
index ea3f9ee390..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaTransformationMappingProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaAttributeMappingProvider;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.java.TransformationAnnotation;
-
-public class JavaTransformationMappingProvider
-	implements JavaAttributeMappingProvider
-{
-
-	// singleton
-	private static final JavaTransformationMappingProvider INSTANCE = new JavaTransformationMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private JavaTransformationMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return EclipseLinkMappingKeys.TRANSFORMATION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return TransformationAnnotation.ANNOTATION_NAME;
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildJavaTransformationMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaVariableOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaVariableOneToOneMapping.java
deleted file mode 100644
index 99e3c2a384..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaVariableOneToOneMapping.java
+++ /dev/null
@@ -1,40 +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.eclipselink.core.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.context.VariableOneToOneMapping;
-import org.eclipse.jpt.eclipselink.core.resource.java.VariableOneToOneAnnotation;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-
-public class JavaVariableOneToOneMapping 
-	extends AbstractJavaAttributeMapping<VariableOneToOneAnnotation>
-	implements VariableOneToOneMapping
-{
-	
-	public JavaVariableOneToOneMapping(JavaPersistentAttribute parent) {
-		super(parent);
-	}
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.VARIABLE_ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return VariableOneToOneAnnotation.ANNOTATION_NAME;
-	}
-	
-	public Iterator<String> supportingAnnotationNames() {
-		return EmptyIterator.instance();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaVariableOneToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaVariableOneToOneMappingProvider.java
deleted file mode 100644
index cef1cf1552..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaVariableOneToOneMappingProvider.java
+++ /dev/null
@@ -1,57 +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.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.context.java.DefaultJavaAttributeMappingProvider;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.java.VariableOneToOneAnnotation;
-
-public class JavaVariableOneToOneMappingProvider
-	implements DefaultJavaAttributeMappingProvider
-{
-
-	// singleton
-	private static final JavaVariableOneToOneMappingProvider INSTANCE = new JavaVariableOneToOneMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static DefaultJavaAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private JavaVariableOneToOneMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return EclipseLinkMappingKeys.VARIABLE_ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return VariableOneToOneAnnotation.ANNOTATION_NAME;
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildJavaVariableOneToOneMapping(parent);
-	}
-	
-	public boolean defaultApplies(JavaPersistentAttribute persistentAttribute) {
-		return ((AbstractEclipseLinkJavaPersistentAttribute) persistentAttribute).typeIsValidForVariableOneToOne();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/ConverterHolder.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/ConverterHolder.java
deleted file mode 100644
index b814c8e125..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/ConverterHolder.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.JpaContextNode;
-import org.eclipse.jpt.eclipselink.core.context.CustomConverter;
-import org.eclipse.jpt.eclipselink.core.context.ObjectTypeConverter;
-import org.eclipse.jpt.eclipselink.core.context.StructConverter;
-import org.eclipse.jpt.eclipselink.core.context.TypeConverter;
-
-public interface ConverterHolder extends JpaContextNode
-{
-	//************ customConverters *********************
-	
-	/**
-	 * Return a list iterator of the custom converters.
-	 * This will not be null.
-	 */
-	<T extends CustomConverter> ListIterator<T> customConverters();
-
-	/**
-	 * Return the number of custom converters.
-	 */
-	int customConvertersSize();
-
-	/**
-	 * Add a custom converter to the converter holder, return the object representing it.
-	 */
-	CustomConverter 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(CustomConverter converter);
-
-	/**
-	 * Move the custom converter from the source index to the target index.
-	 */
-	void moveCustomConverter(int targetIndex, int sourceIndex);
-
-	String CUSTOM_CONVERTERS_LIST = "customConvertersList"; //$NON-NLS-1$
-
-	
-	//************ object type converters *********************
-
-	/**
-	 * Return a list iterator of the object type converters.
-	 * This will not be null.
-	 */
-	<T extends ObjectTypeConverter> ListIterator<T> objectTypeConverters();
-
-	/**
-	 * Return the number of object type converters.
-	 */
-	int objectTypeConvertersSize();
-
-	/**
-	 * Add a object type converter to the converter holder, return the object representing it.
-	 */
-	ObjectTypeConverter 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(ObjectTypeConverter 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 = "objectTypeConvertersList"; //$NON-NLS-1$
-	
-	
-	//************ struct converters *********************
-
-	/**
-	 * Return a list iterator of the struct converters.
-	 * This will not be null.
-	 */
-	<T extends StructConverter> ListIterator<T> structConverters();
-
-	/**
-	 * Return the number of struct converters.
-	 */
-	int structConvertersSize();
-
-	/**
-	 * Add a struct converter to the converter holder, return the object representing it.
-	 */
-	StructConverter 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(StructConverter converter);
-
-	/**
-	 * Move the struct converter from the source index to the target index.
-	 */
-	void moveStructConverter(int targetIndex, int sourceIndex);
-
-	String STRUCT_CONVERTERS_LIST = "structConvertersList"; //$NON-NLS-1$
-
-	
-	//************ type converters *********************
-
-	/**
-	 * Return a list iterator of the type converters.
-	 * This will not be null.
-	 */
-	<T extends TypeConverter> ListIterator<T> typeConverters();
-
-	/**
-	 * Return the number of type converters.
-	 */
-	int typeConvertersSize();
-
-	/**
-	 * Add a type converter to the converter holder, return the object representing it.
-	 */
-	TypeConverter 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(TypeConverter converter);
-
-	/**
-	 * Move the type converter from the source index to the target index.
-	 */
-	void moveTypeConverter(int targetIndex, int sourceIndex);
-
-	String TYPE_CONVERTERS_LIST = "typeConvertersList"; //$NON-NLS-1$
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1EntityMappingsImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1EntityMappingsImpl.java
deleted file mode 100644
index 9dc17bdf7d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1EntityMappingsImpl.java
+++ /dev/null
@@ -1,43 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntityMappings;
-
-public class EclipseLink1_1EntityMappingsImpl
-	extends EclipseLinkEntityMappingsImpl
-{
-	
-	public EclipseLink1_1EntityMappingsImpl(EclipseLink1_1OrmXml parent, XmlEntityMappings xmlEntityMapping) {
-		super(parent, xmlEntityMapping);
-	}
-	
-	@Override
-	protected OrmPersistentType buildPersistentType(XmlTypeMapping resourceMapping) {
-		return getJpaFactory().buildEclipseLink1_1OrmPersistentType(this, resourceMapping);
-	}
-	
-	// **************** JpaNode impl *******************************************
-	
-	@Override
-	protected EclipseLink1_1JpaFactory getJpaFactory() {
-		return (EclipseLink1_1JpaFactory) super.getJpaFactory();
-	}
-	
-	@Override
-	public EclipseLink1_1OrmXml getParent() {
-		return (EclipseLink1_1OrmXml) super.getParent();
-	}	
-	
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmBasicCollectionMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmBasicCollectionMappingProvider.java
deleted file mode 100644
index 001d61e391..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmBasicCollectionMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaBasicCollectionMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-
-public class EclipseLink1_1OrmBasicCollectionMappingProvider
-	implements OrmAttributeMappingProvider
-{
-
-	// singleton
-	private static final EclipseLink1_1OrmBasicCollectionMappingProvider INSTANCE = new EclipseLink1_1OrmBasicCollectionMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1OrmBasicCollectionMappingProvider() {
-		super();
-	}
-	
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE;
-	}
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.BASIC_COLLECTION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlBasicCollectionImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1OrmBasicCollectionMapping(parent, (XmlBasicCollection) resourceMapping);
-	}
-	
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1VirtualXmlBasicCollection(ormTypeMapping, (JavaBasicCollectionMapping) javaAttributeMapping);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmBasicMapMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmBasicMapMappingProvider.java
deleted file mode 100644
index fb01ed2d12..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmBasicMapMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaBasicMapMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-
-public class EclipseLink1_1OrmBasicMapMappingProvider
-	implements OrmAttributeMappingProvider
-{
-
-	// singleton
-	private static final EclipseLink1_1OrmBasicMapMappingProvider INSTANCE = new EclipseLink1_1OrmBasicMapMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1OrmBasicMapMappingProvider() {
-		super();
-	}
-	
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return EclipseLinkMappingKeys.BASIC_MAP_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlBasicMapImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1OrmBasicMapMapping(parent, (XmlBasicMap) resourceMapping);
-	}
-	
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1VirtualXmlBasicMap(ormTypeMapping, (JavaBasicMapMapping) javaAttributeMapping);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmBasicMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmBasicMappingProvider.java
deleted file mode 100644
index 1433516580..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmBasicMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaBasicMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-
-public class EclipseLink1_1OrmBasicMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLink1_1OrmBasicMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1OrmBasicMappingProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlBasicImpl();
-	}
-	
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1OrmBasicMapping(parent, (XmlBasic) resourceMapping);
-	}
-
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1VirtualXmlBasic(ormTypeMapping, (JavaBasicMapping) javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmEmbeddedIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmEmbeddedIdMappingProvider.java
deleted file mode 100644
index 5e53168a97..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmEmbeddedIdMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaEmbeddedIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedId;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-
-public class EclipseLink1_1OrmEmbeddedIdMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLink1_1OrmEmbeddedIdMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1OrmEmbeddedIdMappingProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlEmbeddedIdImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1OrmEmbeddedIdMapping(parent, (XmlEmbeddedId) resourceMapping);
-	}
-
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1VirtualXmlEmbeddedId(ormTypeMapping, (JavaEmbeddedIdMapping) javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmEmbeddedMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmEmbeddedMappingProvider.java
deleted file mode 100644
index 1e221c2d68..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmEmbeddedMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaEmbeddedMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-
-public class EclipseLink1_1OrmEmbeddedMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLink1_1OrmEmbeddedMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1OrmEmbeddedMappingProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlEmbeddedImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1OrmEmbeddedMapping(parent, (XmlEmbedded) resourceMapping);
-	}
-
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1VirtualXmlEmbedded(ormTypeMapping, (JavaEmbeddedMapping) javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmIdMappingProvider.java
deleted file mode 100644
index 1c2dc21081..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmIdMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlId;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-
-public class EclipseLink1_1OrmIdMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLink1_1OrmIdMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1OrmIdMappingProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlIdImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1OrmIdMapping(parent, (XmlId) resourceMapping);
-	}
-
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1VirtualXmlId(ormTypeMapping, (JavaIdMapping) javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmManyToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmManyToManyMappingProvider.java
deleted file mode 100644
index 536c414570..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmManyToManyMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaManyToManyMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-
-public class EclipseLink1_1OrmManyToManyMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLink1_1OrmManyToManyMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1OrmManyToManyMappingProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlManyToManyImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1OrmManyToManyMapping(parent, (XmlManyToMany) resourceMapping);
-	}
-
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1VirtualXmlManyToMany(ormTypeMapping, (JavaManyToManyMapping) javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmManyToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmManyToOneMappingProvider.java
deleted file mode 100644
index 5733f44823..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmManyToOneMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaManyToOneMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-
-public class EclipseLink1_1OrmManyToOneMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLink1_1OrmManyToOneMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1OrmManyToOneMappingProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlManyToOneImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1OrmManyToOneMapping(parent, (XmlManyToOne) resourceMapping);
-	}
-
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1VirtualXmlManyToOne(ormTypeMapping, (JavaManyToOneMapping) javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmNullAttributeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmNullAttributeMappingProvider.java
deleted file mode 100644
index 9cc498673c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmNullAttributeMappingProvider.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-
-public class EclipseLink1_1OrmNullAttributeMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLink1_1OrmNullAttributeMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1OrmNullAttributeMappingProvider() {
-		super();
-	}
-	
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		throw new UnsupportedOperationException();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1OrmNullAttributeMapping(parent, (XmlNullAttributeMapping) resourceMapping);
-	}
-	
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1VirtualXmlNullAttributeMapping(ormTypeMapping, javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmOneToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmOneToManyMappingProvider.java
deleted file mode 100644
index 382d99aa64..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmOneToManyMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaOneToManyMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-
-public class EclipseLink1_1OrmOneToManyMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLink1_1OrmOneToManyMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1OrmOneToManyMappingProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlOneToManyImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1OrmOneToManyMapping(parent, (XmlOneToMany) resourceMapping);
-	}
-
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1VirtualXmlOneToMany(ormTypeMapping, (EclipseLinkJavaOneToManyMapping) javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmOneToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmOneToOneMappingProvider.java
deleted file mode 100644
index c7562487b4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmOneToOneMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaOneToOneMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-
-public class EclipseLink1_1OrmOneToOneMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLink1_1OrmOneToOneMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1OrmOneToOneMappingProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlOneToOneImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1OrmOneToOneMapping(parent, (XmlOneToOne) resourceMapping);
-	}
-
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1VirtualXmlOneToOne(ormTypeMapping, (JavaOneToOneMapping) javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmPersistentAttribute.java
deleted file mode 100644
index f787c11526..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmPersistentAttribute.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.AccessType;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.internal.context.orm.AbstractOrmPersistentAttribute;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping;
-
-
-public class EclipseLink1_1OrmPersistentAttribute 
-	extends AbstractOrmPersistentAttribute 
-{
-	
-	protected AccessType specifiedAccess;
-	
-	public EclipseLink1_1OrmPersistentAttribute(OrmPersistentType parent, Owner owner, XmlAttributeMapping resourceMapping) {
-		super(parent, owner, resourceMapping);
-		this.specifiedAccess = getResourceAccess();
-	}
-
-	@Override
-	public XmlAttributeMapping getResourceAttributeMapping() {
-		return (XmlAttributeMapping) super.getResourceAttributeMapping();
-	}
-	
-	public AccessType getSpecifiedAccess() {
-		return this.specifiedAccess;
-	}
-	
-	public void setSpecifiedAccess(AccessType newSpecifiedAccess) {
-		AccessType oldAccess = this.specifiedAccess;
-		this.specifiedAccess = newSpecifiedAccess;
-		this.getResourceAttributeMapping().setAccess(AccessType.toOrmResourceModel(newSpecifiedAccess));
-		firePropertyChanged(SPECIFIED_ACCESS_PROPERTY, oldAccess, newSpecifiedAccess);
-	}
-	
-	protected void setSpecifiedAccess_(AccessType newSpecifiedAccess) {
-		AccessType oldAccess = this.specifiedAccess;
-		this.specifiedAccess = newSpecifiedAccess;
-		firePropertyChanged(SPECIFIED_ACCESS_PROPERTY, oldAccess, newSpecifiedAccess);
-	}
-	
-	@Override
-	public void update() {
-		super.update();
-		setSpecifiedAccess_(getResourceAccess());
-	}
-	
-	protected AccessType getResourceAccess() {
-		return AccessType.fromOrmResourceModel(getResourceAttributeMapping().getAccess());
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmPersistentType.java
deleted file mode 100644
index 839048a7d6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmPersistentType.java
+++ /dev/null
@@ -1,62 +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.eclipselink.core.internal.context.orm;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.context.AccessType;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.orm.AbstractOrmPersistentType;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.resource.orm.Attributes;
-import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping;
-
-public class EclipseLink1_1OrmPersistentType extends AbstractOrmPersistentType
-{
-	
-	public EclipseLink1_1OrmPersistentType(EclipseLinkEntityMappings parent, XmlTypeMapping resourceMapping) {
-		super(parent, resourceMapping);
-	}
-	
-	@Override
-	protected EclipseLink1_1JpaFactory getJpaFactory() {
-		return (EclipseLink1_1JpaFactory)  super.getJpaFactory();
-	}
-	
-	@Override
-	protected Attributes createResourceAttributes() {
-		return EclipseLinkOrmFactory.eINSTANCE.createAttributes();
-	}
-	
-	@Override
-	protected OrmPersistentAttribute buildOrmPersistentAttribute(org.eclipse.jpt.core.context.orm.OrmPersistentAttribute.Owner owner, org.eclipse.jpt.core.resource.orm.XmlAttributeMapping resourceMapping) {
-		return getJpaFactory().buildEclipseLink1_1OrmPersistentAttribute(this, owner, (XmlAttributeMapping) resourceMapping);
-	}
-	
-	@Override
-	protected AccessType getAccess(OrmPersistentAttribute ormPersistentAttribute) {
-		return ((EclipseLink1_1OrmPersistentAttribute) ormPersistentAttribute).getAccess();
-	}
-	
-	@Override
-	protected Iterator<JavaResourcePersistentAttribute> javaPersistentAttributes(JavaResourcePersistentType resourcePersistentType) {
-		AccessType specifiedAccess = getSpecifiedAccess();
-		if (specifiedAccess == null && !getMapping().isMetadataComplete()) {
-			specifiedAccess = getJavaPersistentType().getSpecifiedAccess();
-		}
-		return specifiedAccess == null
-			? super.javaPersistentAttributes(resourcePersistentType)
-			: resourcePersistentType.persistableAttributes(AccessType.toJavaResourceModel(specifiedAccess));
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmTransformationMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmTransformationMappingProvider.java
deleted file mode 100644
index 28d857a09e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmTransformationMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaTransformationMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-
-public class EclipseLink1_1OrmTransformationMappingProvider
-	implements OrmAttributeMappingProvider
-{
-
-	// singleton
-	private static final EclipseLink1_1OrmTransformationMappingProvider INSTANCE = new EclipseLink1_1OrmTransformationMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1OrmTransformationMappingProvider() {
-		super();
-	}
-	
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return EclipseLinkMappingKeys.TRANSFORMATION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlTransformationImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1OrmTransformationMapping(parent, (XmlTransformation) resourceMapping);
-	}
-	
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1VirtualXmlTransformation(ormTypeMapping, (JavaTransformationMapping) javaAttributeMapping);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmTransientMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmTransientMappingProvider.java
deleted file mode 100644
index ace4443de5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmTransientMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaTransientMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlTransient;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-
-public class EclipseLink1_1OrmTransientMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLink1_1OrmTransientMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1OrmTransientMappingProvider() {
-		super();
-	}
-	
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE;
-	}
-	
-	public String getKey() {
-		return MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlTransientImpl();
-	}
-	
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return factory.buildOrmTransientMapping(parent, (XmlTransient) resourceMapping);
-	}
-	
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1VirtualXmlTransient(ormTypeMapping, (JavaTransientMapping) javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmVariableOneToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmVariableOneToOneMappingProvider.java
deleted file mode 100644
index e39ce8412f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmVariableOneToOneMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaVariableOneToOneMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOne;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-
-public class EclipseLink1_1OrmVariableOneToOneMappingProvider
-	implements OrmAttributeMappingProvider
-{
-
-	// singleton
-	private static final EclipseLink1_1OrmVariableOneToOneMappingProvider INSTANCE = new EclipseLink1_1OrmVariableOneToOneMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1OrmVariableOneToOneMappingProvider() {
-		super();
-	}
-	
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return EclipseLinkMappingKeys.VARIABLE_ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlVariableOneToOneImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1OrmVariableOneToOneMapping(parent, (XmlVariableOneToOne) resourceMapping);
-	}
-	
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1VirtualXmlVariableOneToOne(ormTypeMapping, (JavaVariableOneToOneMapping) javaAttributeMapping);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmVersionMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmVersionMappingProvider.java
deleted file mode 100644
index 898530c82b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmVersionMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaVersionMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-
-public class EclipseLink1_1OrmVersionMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLink1_1OrmVersionMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLink1_1OrmVersionMappingProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlVersionImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1OrmVersionMapping(parent, (XmlVersion) resourceMapping);
-	}
-
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLink1_1JpaFactory) factory).buildEclipseLink1_1VirtualXmlVersion(ormTypeMapping, (JavaVersionMapping) javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmXml.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmXml.java
deleted file mode 100644
index e2294ed68e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1OrmXml.java
+++ /dev/null
@@ -1,55 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.EntityMappings;
-import org.eclipse.jpt.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.core.internal.context.orm.AbstractOrmXml;
-import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntityMappings;
-
-public class EclipseLink1_1OrmXml extends AbstractOrmXml
-{
-	public EclipseLink1_1OrmXml(MappingFileRef parent, JpaXmlResource resource) {
-		super(parent, resource);
-		if (!resource.getContentType().isKindOf(JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE)) {
-			throw new IllegalArgumentException(resource + " does not have eclipselink 1.1 orm xml content type"); //$NON-NLS-1$ 
-		}
-	}
-	
-	@Override
-	protected EclipseLink1_1JpaFactory getJpaFactory() {
-		return (EclipseLink1_1JpaFactory) super.getJpaFactory();
-	}
-	
-	@Override
-	protected XmlEntityMappings buildEntityMappingsResource() {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlEntityMappings();
-	}
-	
-	@Override
-	protected EntityMappings buildEntityMappings(org.eclipse.jpt.core.resource.orm.XmlEntityMappings xmlEntityMappings) {
-		return getJpaFactory().buildEclipseLink1_1EntityMappings(this, (XmlEntityMappings) xmlEntityMappings);
-	}
-	
-	
-	// ********** updating **********
-	
-	@Override
-	public void update(JpaXmlResource resource) {
-		if (!resource.getContentType().isKindOf(JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE)) {
-			throw new IllegalArgumentException(resource + " does not have eclipselink 1.1 orm xml content type"); //$NON-NLS-1$ 
-		}
-		super.update(resource);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlBasic.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlBasic.java
deleted file mode 100644
index c7cccbbde4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlBasic.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.java.JavaBasicMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.core.resource.orm.XmlGeneratedValue;
-import org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator;
-import org.eclipse.jpt.core.resource.orm.XmlTableGenerator;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLink1_1VirtualXmlBasic extends EclipseLinkVirtualXmlBasic implements org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic
-{
-		
-	public EclipseLink1_1VirtualXmlBasic(OrmTypeMapping ormTypeMapping, JavaBasicMapping javaBasicMapping) {
-		super(ormTypeMapping, javaBasicMapping);
-	}
-	
-	public AccessType getAccess() {
-		return org.eclipse.jpt.core.context.AccessType.toOrmResourceModel(this.javaAttributeMapping.getPersistentAttribute().getAccess());
-	}
-	
-	public void setAccess(AccessType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-	
-	public XmlTableGenerator getTableGenerator() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	public void setTableGenerator(XmlTableGenerator value) {
-		// TODO Auto-generated method stub
-		
-	}
-	
-	public XmlSequenceGenerator getSequenceGenerator() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	public void setSequenceGenerator(XmlSequenceGenerator value) {
-		// TODO Auto-generated method stub
-		
-	}
-	
-	public XmlGeneratedValue getGeneratedValue() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	public void setGeneratedValue(XmlGeneratedValue value) {
-		// TODO Auto-generated method stub
-		
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlBasicCollection.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlBasicCollection.java
deleted file mode 100644
index e44320cf7c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlBasicCollection.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaBasicCollectionMapping;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollection;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLink1_1VirtualXmlBasicCollection extends VirtualXmlBasicCollection implements XmlBasicCollection
-{
-
-	public EclipseLink1_1VirtualXmlBasicCollection(OrmTypeMapping ormTypeMapping, JavaBasicCollectionMapping javaBasicCollectionMapping) {
-		super(ormTypeMapping, javaBasicCollectionMapping);
-	}
-	
-	public AccessType getAccess() {
-		return org.eclipse.jpt.core.context.AccessType.toOrmResourceModel(this.javaAttributeMapping.getPersistentAttribute().getAccess());
-	}
-	
-	public void setAccess(AccessType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlBasicMap.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlBasicMap.java
deleted file mode 100644
index ed0b83ba36..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlBasicMap.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaBasicMapMapping;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMap;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLink1_1VirtualXmlBasicMap extends VirtualXmlBasicMap implements XmlBasicMap
-{
-
-	public EclipseLink1_1VirtualXmlBasicMap(OrmTypeMapping ormTypeMapping, JavaBasicMapMapping javaBasicMapMappingg) {
-		super(ormTypeMapping, javaBasicMapMappingg);
-	}
-	
-	public AccessType getAccess() {
-		return org.eclipse.jpt.core.context.AccessType.toOrmResourceModel(this.javaAttributeMapping.getPersistentAttribute().getAccess());
-	}
-	
-	public void setAccess(AccessType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlEmbedded.java
deleted file mode 100644
index 5cc3dbe5b9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlEmbedded.java
+++ /dev/null
@@ -1,35 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.java.JavaEmbeddedMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbedded;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLink1_1VirtualXmlEmbedded extends EclipseLinkVirtualXmlEmbedded implements XmlEmbedded
-{
-		
-	public EclipseLink1_1VirtualXmlEmbedded(OrmTypeMapping ormTypeMapping, JavaEmbeddedMapping javaEmbeddedMapping) {
-		super(ormTypeMapping, javaEmbeddedMapping);
-	}
-	
-	public AccessType getAccess() {
-		return org.eclipse.jpt.core.context.AccessType.toOrmResourceModel(this.javaAttributeMapping.getPersistentAttribute().getAccess());
-	}
-	
-	public void setAccess(AccessType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlEmbeddedId.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlEmbeddedId.java
deleted file mode 100644
index d9f9b8250c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlEmbeddedId.java
+++ /dev/null
@@ -1,35 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.java.JavaEmbeddedIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedId;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLink1_1VirtualXmlEmbeddedId extends EclipseLinkVirtualXmlEmbeddedId implements XmlEmbeddedId
-{
-		
-	public EclipseLink1_1VirtualXmlEmbeddedId(OrmTypeMapping ormTypeMapping, JavaEmbeddedIdMapping javaEmbeddedIdMapping) {
-		super(ormTypeMapping, javaEmbeddedIdMapping);
-	}
-	
-	public AccessType getAccess() {
-		return org.eclipse.jpt.core.context.AccessType.toOrmResourceModel(this.javaAttributeMapping.getPersistentAttribute().getAccess());
-	}
-	
-	public void setAccess(AccessType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlId.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlId.java
deleted file mode 100644
index 7e0c3bd8a2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlId.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.java.JavaIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlId;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLink1_1VirtualXmlId extends EclipseLinkVirtualXmlId implements XmlId
-{
-		
-	public EclipseLink1_1VirtualXmlId(OrmTypeMapping ormTypeMapping, JavaIdMapping javaIdMapping) {
-		super(ormTypeMapping, javaIdMapping);
-	}
-	
-	public AccessType getAccess() {
-		return org.eclipse.jpt.core.context.AccessType.toOrmResourceModel(this.javaAttributeMapping.getPersistentAttribute().getAccess());
-	}
-	
-	public void setAccess(AccessType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlManyToMany.java
deleted file mode 100644
index 6eba331ad9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlManyToMany.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.java.JavaManyToManyMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToMany;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLink1_1VirtualXmlManyToMany extends EclipseLinkVirtualXmlManyToMany implements XmlManyToMany
-{
-		
-	public EclipseLink1_1VirtualXmlManyToMany(OrmTypeMapping ormTypeMapping, JavaManyToManyMapping javaManyToManyMapping) {
-		super(ormTypeMapping, javaManyToManyMapping);
-	}
-	
-	public AccessType getAccess() {
-		return org.eclipse.jpt.core.context.AccessType.toOrmResourceModel(this.javaAttributeMapping.getPersistentAttribute().getAccess());
-	}
-	
-	public void setAccess(AccessType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlManyToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlManyToOne.java
deleted file mode 100644
index 1b51926df6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlManyToOne.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.java.JavaManyToOneMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOne;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLink1_1VirtualXmlManyToOne extends EclipseLinkVirtualXmlManyToOne implements XmlManyToOne
-{
-		
-	public EclipseLink1_1VirtualXmlManyToOne(OrmTypeMapping ormTypeMapping, JavaManyToOneMapping javaManyToOneMapping) {
-		super(ormTypeMapping, javaManyToOneMapping);
-	}
-	
-	public AccessType getAccess() {
-		return org.eclipse.jpt.core.context.AccessType.toOrmResourceModel(this.javaAttributeMapping.getPersistentAttribute().getAccess());
-	}
-	
-	public void setAccess(AccessType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlNullAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlNullAttributeMapping.java
deleted file mode 100644
index 6dd3eea5dd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlNullAttributeMapping.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.orm.VirtualXmlNullAttributeMapping;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping;
-
-/**
- * VirtualVersion is an implementation of Version used when there is 
- * no tag in the orm.xml and an underlying javaVersionMapping exists.
- */
-public class EclipseLink1_1VirtualXmlNullAttributeMapping extends VirtualXmlNullAttributeMapping implements XmlNullAttributeMapping, XmlAttributeMapping
-{
-	
-	public EclipseLink1_1VirtualXmlNullAttributeMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping) {
-		super(ormTypeMapping, javaAttributeMapping);
-	}
-	
-	public AccessType getAccess() {
-		return org.eclipse.jpt.core.context.AccessType.toOrmResourceModel(this.javaAttributeMapping.getPersistentAttribute().getAccess());
-	}
-
-	public void setAccess(AccessType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlOneToMany.java
deleted file mode 100644
index 2066e23109..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlOneToMany.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaOneToManyMapping;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToMany;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLink1_1VirtualXmlOneToMany<T extends EclipseLinkJavaOneToManyMapping>
-	extends EclipseLinkVirtualXmlOneToMany<T>
-	implements XmlOneToMany
-{
-		
-	public EclipseLink1_1VirtualXmlOneToMany(
-			OrmTypeMapping ormTypeMapping, T javaOneToManyMapping) {
-		super(ormTypeMapping, javaOneToManyMapping);
-	}
-	
-	public AccessType getAccess() {
-		return org.eclipse.jpt.core.context.AccessType.toOrmResourceModel(this.javaAttributeMapping.getPersistentAttribute().getAccess());
-	}
-	
-	public void setAccess(AccessType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlOneToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlOneToOne.java
deleted file mode 100644
index 68f9624585..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlOneToOne.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.java.JavaOneToOneMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOne;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLink1_1VirtualXmlOneToOne extends EclipseLinkVirtualXmlOneToOne implements XmlOneToOne
-{
-		
-	public EclipseLink1_1VirtualXmlOneToOne(OrmTypeMapping ormTypeMapping, JavaOneToOneMapping javaOneToOneMapping) {
-		super(ormTypeMapping, javaOneToOneMapping);
-	}
-	
-	public AccessType getAccess() {
-		return org.eclipse.jpt.core.context.AccessType.toOrmResourceModel(this.javaAttributeMapping.getPersistentAttribute().getAccess());
-	}
-	
-	public void setAccess(AccessType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlTransformation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlTransformation.java
deleted file mode 100644
index 3e8e650437..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlTransformation.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaTransformationMapping;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformation;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLink1_1VirtualXmlTransformation extends VirtualXmlTransformation implements XmlTransformation
-{
-
-	public EclipseLink1_1VirtualXmlTransformation(OrmTypeMapping ormTypeMapping, JavaTransformationMapping javaTransformationMapping) {
-		super(ormTypeMapping, javaTransformationMapping);
-	}
-	
-	public AccessType getAccess() {
-		return org.eclipse.jpt.core.context.AccessType.toOrmResourceModel(this.javaAttributeMapping.getPersistentAttribute().getAccess());
-	}
-	
-	public void setAccess(AccessType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlTransient.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlTransient.java
deleted file mode 100644
index c08b8c4a01..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlTransient.java
+++ /dev/null
@@ -1,37 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.java.JavaTransientMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.orm.VirtualXmlTransient;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransient;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLink1_1VirtualXmlTransient extends VirtualXmlTransient implements XmlTransient
-{
-
-	public EclipseLink1_1VirtualXmlTransient(OrmTypeMapping ormTypeMapping, JavaTransientMapping javaTransientMapping) {
-		super(ormTypeMapping, javaTransientMapping);
-	}
-	
-	public AccessType getAccess() {
-		return org.eclipse.jpt.core.context.AccessType.toOrmResourceModel(this.javaAttributeMapping.getPersistentAttribute().getAccess());
-	}
-	
-	public void setAccess(AccessType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlVariableOneToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlVariableOneToOne.java
deleted file mode 100644
index 3b68bab394..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlVariableOneToOne.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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaVariableOneToOneMapping;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOne;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLink1_1VirtualXmlVariableOneToOne extends VirtualXmlVariableOneToOne implements XmlVariableOneToOne
-{
-
-	public EclipseLink1_1VirtualXmlVariableOneToOne(OrmTypeMapping ormTypeMapping, JavaVariableOneToOneMapping javaVariableOneToOneMapping) {
-		super(ormTypeMapping, javaVariableOneToOneMapping);
-	}
-	
-	public AccessType getAccess() {
-		return org.eclipse.jpt.core.context.AccessType.toOrmResourceModel(this.javaAttributeMapping.getPersistentAttribute().getAccess());
-	}
-	
-	public void setAccess(AccessType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlVersion.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlVersion.java
deleted file mode 100644
index 8c1e28b4b4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLink1_1VirtualXmlVersion.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.java.JavaVersionMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersion;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLink1_1VirtualXmlVersion extends EclipseLinkVirtualXmlVersion implements XmlVersion
-{
-		
-	public EclipseLink1_1VirtualXmlVersion(OrmTypeMapping ormTypeMapping, JavaVersionMapping javaVersionMapping) {
-		super(ormTypeMapping, javaVersionMapping);
-	}
-	
-	public AccessType getAccess() {
-		return org.eclipse.jpt.core.context.AccessType.toOrmResourceModel(this.javaAttributeMapping.getPersistentAttribute().getAccess());
-	}
-	
-	public void setAccess(AccessType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkEntityMappings.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkEntityMappings.java
deleted file mode 100644
index e0b0fdc4e2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkEntityMappings.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import java.util.ListIterator;
-
-import org.eclipse.jpt.core.context.orm.EntityMappings;
-import org.eclipse.jpt.core.context.orm.OrmNamedNativeQuery;
-import org.eclipse.jpt.core.context.orm.OrmNamedQuery;
-
-public interface EclipseLinkEntityMappings 
-	extends EntityMappings
-{
-	
-	ConverterHolder getConverterHolder();
-
-	// hmmm - these suppress various warnings in EclipseLinkEntityMappingImpl...
-	ListIterator<OrmNamedQuery> namedQueries();
-	ListIterator<OrmNamedNativeQuery> namedNativeQueries();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java
deleted file mode 100644
index 5aaa342b08..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java
+++ /dev/null
@@ -1,72 +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.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.orm.OrmXml;
-import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata;
-import org.eclipse.jpt.core.internal.context.orm.AbstractEntityMappings;
-import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings;
-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 EclipseLinkOrmConverterHolder converterHolder;
-	
-	public EclipseLinkEntityMappingsImpl(OrmXml parent, XmlEntityMappings resource) {
-		super(parent, resource);
-		this.converterHolder = new EclipseLinkOrmConverterHolder(this, (XmlEntityMappings) this.xmlEntityMappings);
-	}
-	
-	@Override
-	protected PersistenceUnitMetadata buildPersistenceUnitMetadata() {
-		return 	getJpaFactory().buildEclipseLinkPersistenceUnitMetadata(this, (XmlEntityMappings) this.xmlEntityMappings);
-	}	
-	
-	@Override
-	protected OrmPersistentType buildPersistentType(XmlTypeMapping resourceMapping) {
-		return getJpaFactory().buildEclipseLinkOrmPersistentType(this, resourceMapping);
-	}
-	
-	// **************** JpaNode impl *******************************************
-	
-	@Override
-	protected EclipseLinkJpaFactory getJpaFactory() {
-		return (EclipseLinkJpaFactory) super.getJpaFactory();
-	}
-	
-	// **************** EclipseLinkEntityMappings impl **********************************
-
-	public ConverterHolder getConverterHolder() {
-		return this.converterHolder;
-	}
-	
-	
-	@Override
-	public void update() {
-		super.update();
-		this.converterHolder.update();
-	}
-	
-	// **************** validation *********************************************
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		this.converterHolder.validate(messages, reporter);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMapping.java
deleted file mode 100644
index 325aae53d4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMapping.java
+++ /dev/null
@@ -1,80 +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.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.orm.OrmConverter;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmBasicMapping;
-import org.eclipse.jpt.eclipselink.core.context.Convert;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkBasicMapping;
-import org.eclipse.jpt.eclipselink.core.context.Mutable;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlMutable;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkOrmBasicMapping<T extends XmlBasic>
-	extends GenericOrmBasicMapping<T>
-	implements EclipseLinkBasicMapping
-{
-	protected EclipseLinkOrmMutable mutable;
-	
-	
-	public EclipseLinkOrmBasicMapping(OrmPersistentAttribute parent, T resourceMapping) {
-		super(parent, resourceMapping);
-		this.mutable = new EclipseLinkOrmMutable(this, (XmlMutable) this.resourceAttributeMapping);
-	}
-	
-	
-	public Mutable getMutable() {
-		return this.mutable;
-	}
-
-	@Override
-	protected OrmConverter buildSpecifiedConverter(String converterType) {
-		OrmConverter ormConverter = super.buildSpecifiedConverter(converterType);
-		if (ormConverter != null) {
-			return ormConverter;
-		}
-		if (converterType == Convert.ECLIPSE_LINK_CONVERTER) {
-			return new EclipseLinkOrmConvert(this, (XmlBasic) this.resourceAttributeMapping);
-		}
-		return null;
-	}
-
-	@Override
-	protected String getResourceConverterType() {
-		//check @Convert first, this is the order that EclipseLink searches
-		if (((XmlBasic) this.resourceAttributeMapping).getConvert() != null) {
-			return Convert.ECLIPSE_LINK_CONVERTER;
-		}
-		return super.getResourceConverterType();
-	}
-	
-	
-	// **************** resource-context interaction ***************************
-	
-	@Override
-	public void update() {
-		super.update();
-		this.mutable.update();
-	}
-	
-	
-	// **************** 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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMappingProvider.java
deleted file mode 100644
index 7626a17192..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaBasicMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic;
-
-public class EclipseLinkOrmBasicMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLinkOrmBasicMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkOrmBasicMappingProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlBasicImpl();
-	}
-	
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkOrmBasicMapping(parent, (XmlBasic) resourceMapping);
-	}
-
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkVirtualXmlBasic(ormTypeMapping, (JavaBasicMapping) javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmCaching.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmCaching.java
deleted file mode 100644
index 1c832cb362..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmCaching.java
+++ /dev/null
@@ -1,662 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.CacheCoordinationType;
-import org.eclipse.jpt.eclipselink.core.context.CacheType;
-import org.eclipse.jpt.eclipselink.core.context.ExistenceType;
-import org.eclipse.jpt.eclipselink.core.context.ExpiryTimeOfDay;
-import org.eclipse.jpt.eclipselink.core.context.java.JavaCaching;
-import org.eclipse.jpt.eclipselink.core.context.orm.OrmCaching;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlCache;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlCacheHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTimeOfDay;
-
-public class EclipseLinkOrmCaching extends AbstractXmlContextNode
-	implements OrmCaching
-{
-	protected final XmlCacheHolder resource;
-	
-	protected int defaultSize;
-	protected Integer specifiedSize;
-	
-	protected boolean defaultShared;
-	protected Boolean specifiedShared;
-	
-	protected CacheType defaultType;
-	protected CacheType specifiedType;
-	
-	protected boolean defaultAlwaysRefresh;
-	protected Boolean specifiedAlwaysRefresh;
-	
-	protected boolean defaultRefreshOnlyIfNewer;
-	protected Boolean specifiedRefreshOnlyIfNewer;
-	
-	protected boolean defaultDisableHits;
-	protected Boolean specifiedDisableHits;
-	
-	protected CacheCoordinationType defaultCoordinationType;
-	protected CacheCoordinationType specifiedCoordinationType;
-	
-	protected ExistenceType specifiedExistenceType;
-	protected ExistenceType defaultExistenceType;
-	
-	protected Integer expiry;
-	protected EclipseLinkOrmExpiryTimeOfDay expiryTimeOfDay;
-	
-	public EclipseLinkOrmCaching(OrmTypeMapping parent, XmlCacheHolder resource, JavaCaching javaCaching) {
-		super(parent);
-		this.resource = resource;
-		XmlCache resourceCache = getResourceCache();
-		this.defaultSize = this.defaultSize(javaCaching);
-		this.specifiedSize = getResourceSize(resourceCache);
-		this.defaultShared = this.defaultShared(javaCaching);
-		this.specifiedShared = this.getResourceShared(resourceCache);
-		this.defaultAlwaysRefresh = this.defaultAlwaysRefresh(javaCaching);
-		this.specifiedAlwaysRefresh = this.getResourceAlwaysRefresh(resourceCache);
-		this.defaultRefreshOnlyIfNewer = this.defaultRefreshOnlyIfNewer(javaCaching);
-		this.specifiedRefreshOnlyIfNewer = this.getResourceRefreshOnlyIfNewer(resourceCache);
-		this.defaultDisableHits = this.defaultDisableHits(javaCaching);
-		this.specifiedDisableHits = this.getResourceDisableHits(resourceCache);
-		this.defaultType = this.defaultType(javaCaching);
-		this.specifiedType = this.getResourceType(resourceCache);
-		this.defaultCoordinationType = this.defaultCoordinationType(javaCaching);
-		this.specifiedCoordinationType = this.getResourceCoordinationType(resourceCache);
-		this.defaultExistenceType = this.defaultExistenceType(javaCaching);
-		this.specifiedExistenceType = this.getResourceExistenceChecking();
-		this.initializeExpiry(resourceCache);
-	}
-
-	public int getSize() {
-		return (this.specifiedSize == null) ? this.defaultSize : this.specifiedSize.intValue();
-	}
-	
-	public int getDefaultSize() {
-		return this.defaultSize;
-	}
-	
-	protected void setDefaultSize(int newSize) {
-		int oldSize = this.defaultSize;
-		this.defaultSize = newSize;
-		firePropertyChanged(DEFAULT_SIZE_PROPERTY, oldSize, newSize);
-	}
-	
-	public Integer getSpecifiedSize() {
-		return this.specifiedSize;
-	}
-	
-	public void setSpecifiedSize(Integer newSpecifiedSize) {
-		Integer oldSpecifiedSize = this.specifiedSize;
-		this.specifiedSize = newSpecifiedSize;
-		if (oldSpecifiedSize != newSpecifiedSize) {
-			if (this.getResourceCache() != null) {
-				this.getResourceCache().setSize(newSpecifiedSize);						
-				if (this.getResourceCache().isUnset()) {
-					removeResourceCache();
-				}
-			}
-			else if (newSpecifiedSize != null) {
-				addResourceCache();
-				getResourceCache().setSize(newSpecifiedSize);
-			}
-		}
-		firePropertyChanged(SPECIFIED_SIZE_PROPERTY, oldSpecifiedSize, newSpecifiedSize);		
-	}
-	
-	protected void setSpecifiedSize_(Integer newSpecifiedSize) {
-		Integer oldSpecifiedSize = this.specifiedSize;
-		this.specifiedSize = newSpecifiedSize;
-		firePropertyChanged(SPECIFIED_SIZE_PROPERTY, oldSpecifiedSize, newSpecifiedSize);
-	}
-	
-	
-	public boolean isShared() {
-		return (this.specifiedShared == null) ? this.defaultShared : this.specifiedShared.booleanValue();
-	}
-	
-	public boolean isDefaultShared() {
-		return this.defaultShared;
-	}
-	
-	protected void setDefaultShared(boolean newDefaultShared) {
-		boolean oldDefaultShared = this.defaultShared;
-		this.defaultShared = newDefaultShared;
-		firePropertyChanged(DEFAULT_SHARED_PROPERTY, oldDefaultShared, newDefaultShared);	
-	}
-	
-	public Boolean getSpecifiedShared() {
-		return this.specifiedShared;
-	}
-	
-	public void setSpecifiedShared(Boolean newSpecifiedShared) {
-		Boolean oldSpecifiedShared = this.specifiedShared;
-		this.specifiedShared = newSpecifiedShared;
-		if (oldSpecifiedShared != newSpecifiedShared) {
-			if (this.getResourceCache() != null) {
-				this.getResourceCache().setShared(newSpecifiedShared);						
-				if (this.getResourceCache().isUnset()) {
-					removeResourceCache();
-				}
-			}
-			else if (newSpecifiedShared != null) {
-				addResourceCache();
-				getResourceCache().setShared(newSpecifiedShared);
-			}
-		}
-		firePropertyChanged(SPECIFIED_SHARED_PROPERTY, oldSpecifiedShared, newSpecifiedShared);		
-		if (newSpecifiedShared == Boolean.FALSE) {
-			setSpecifiedType(null);
-			setSpecifiedSize(null);
-			setSpecifiedAlwaysRefresh(null);
-			setSpecifiedRefreshOnlyIfNewer(null);
-			setSpecifiedDisableHits(null);
-			setSpecifiedCoordinationType(null);
-			setExpiry(null);
-			if (this.expiryTimeOfDay != null) {
-				removeExpiryTimeOfDay();
-			}
-		}
-	}
-	
-	protected void setSpecifiedShared_(Boolean newSpecifiedShared) {
-		Boolean oldSpecifiedShared = this.specifiedShared;
-		this.specifiedShared = newSpecifiedShared;
-		firePropertyChanged(SPECIFIED_SHARED_PROPERTY, oldSpecifiedShared, newSpecifiedShared);	
-	}
-	
-	
-	public boolean isAlwaysRefresh() {
-		return (this.specifiedAlwaysRefresh == null) ? this.defaultAlwaysRefresh : this.specifiedAlwaysRefresh.booleanValue();
-	}
-	
-	public boolean isDefaultAlwaysRefresh() {
-		return this.defaultAlwaysRefresh;
-	}
-	
-	protected void setDefaultAlwaysRefresh(boolean newDefaultAlwaysRefresh) {
-		boolean oldDefaultAlwaysRefresh = this.defaultAlwaysRefresh;
-		this.defaultAlwaysRefresh = newDefaultAlwaysRefresh;
-		firePropertyChanged(DEFAULT_ALWAYS_REFRESH_PROPERTY, oldDefaultAlwaysRefresh, newDefaultAlwaysRefresh);	
-	}
-	
-	public Boolean getSpecifiedAlwaysRefresh() {
-		return this.specifiedAlwaysRefresh;
-	}
-	
-	public void setSpecifiedAlwaysRefresh(Boolean newSpecifiedAlwaysRefresh) {
-		Boolean oldSpecifiedAlwaysRefresh = this.specifiedAlwaysRefresh;
-		this.specifiedAlwaysRefresh = newSpecifiedAlwaysRefresh;
-		if (oldSpecifiedAlwaysRefresh != newSpecifiedAlwaysRefresh) {
-			if (this.getResourceCache() != null) {
-				this.getResourceCache().setAlwaysRefresh(newSpecifiedAlwaysRefresh);						
-				if (this.getResourceCache().isUnset()) {
-					removeResourceCache();
-				}
-			}
-			else if (newSpecifiedAlwaysRefresh != null) {
-				addResourceCache();
-				getResourceCache().setAlwaysRefresh(newSpecifiedAlwaysRefresh);
-			}
-		}
-		firePropertyChanged(SPECIFIED_ALWAYS_REFRESH_PROPERTY, oldSpecifiedAlwaysRefresh, newSpecifiedAlwaysRefresh);		
-	}
-	
-	protected void setSpecifiedAlwaysRefresh_(Boolean newSpecifiedAlwaysRefresh) {
-		Boolean oldSpecifiedAlwaysRefresh = this.specifiedAlwaysRefresh;
-		this.specifiedAlwaysRefresh = newSpecifiedAlwaysRefresh;
-		firePropertyChanged(SPECIFIED_ALWAYS_REFRESH_PROPERTY, oldSpecifiedAlwaysRefresh, newSpecifiedAlwaysRefresh);	
-	}
-	
-	
-	public boolean isRefreshOnlyIfNewer() {
-		return (this.specifiedRefreshOnlyIfNewer == null) ? this.defaultRefreshOnlyIfNewer : this.specifiedRefreshOnlyIfNewer.booleanValue();
-	}
-	
-	public boolean isDefaultRefreshOnlyIfNewer() {
-		return this.defaultRefreshOnlyIfNewer;
-	}
-	
-	protected void setDefaultRefreshOnlyIfNewer(boolean newDefaultRefreshOnlyIfNewer) {
-		boolean oldDefaultRefreshOnlyIfNewer = this.defaultRefreshOnlyIfNewer;
-		this.defaultRefreshOnlyIfNewer = newDefaultRefreshOnlyIfNewer;
-		firePropertyChanged(DEFAULT_REFRESH_ONLY_IF_NEWER_PROPERTY, oldDefaultRefreshOnlyIfNewer, newDefaultRefreshOnlyIfNewer);	
-	}
-	
-	public Boolean getSpecifiedRefreshOnlyIfNewer() {
-		return this.specifiedRefreshOnlyIfNewer;
-	}
-	
-	public void setSpecifiedRefreshOnlyIfNewer(Boolean newSpecifiedRefreshOnlyIfNewer) {
-		Boolean oldSpecifiedRefreshOnlyIfNewer = this.specifiedRefreshOnlyIfNewer;
-		this.specifiedRefreshOnlyIfNewer = newSpecifiedRefreshOnlyIfNewer;
-		if (oldSpecifiedRefreshOnlyIfNewer != newSpecifiedRefreshOnlyIfNewer) {
-			if (this.getResourceCache() != null) {
-				this.getResourceCache().setRefreshOnlyIfNewer(newSpecifiedRefreshOnlyIfNewer);						
-				if (this.getResourceCache().isUnset()) {
-					removeResourceCache();
-				}
-			}
-			else if (newSpecifiedRefreshOnlyIfNewer != null) {
-				addResourceCache();
-				getResourceCache().setRefreshOnlyIfNewer(newSpecifiedRefreshOnlyIfNewer);
-			}
-		}
-		firePropertyChanged(SPECIFIED_REFRESH_ONLY_IF_NEWER_PROPERTY, oldSpecifiedRefreshOnlyIfNewer, newSpecifiedRefreshOnlyIfNewer);		
-	}
-	
-	protected void setSpecifiedRefreshOnlyIfNewer_(Boolean newSpecifiedRefreshOnlyIfNewer) {
-		Boolean oldSpecifiedRefreshOnlyIfNewer = this.specifiedRefreshOnlyIfNewer;
-		this.specifiedRefreshOnlyIfNewer = newSpecifiedRefreshOnlyIfNewer;
-		firePropertyChanged(SPECIFIED_REFRESH_ONLY_IF_NEWER_PROPERTY, oldSpecifiedRefreshOnlyIfNewer, newSpecifiedRefreshOnlyIfNewer);	
-	}
-	
-	
-	public boolean isDisableHits() {
-		return (this.specifiedDisableHits == null) ? this.defaultDisableHits : this.specifiedDisableHits.booleanValue();
-	}
-	
-	public boolean isDefaultDisableHits() {
-		return this.defaultDisableHits;
-	}
-	
-	protected void setDefaultDisableHits(boolean newDefaultDisableHits) {
-		boolean oldDefaultDisableHits = this.defaultDisableHits;
-		this.defaultDisableHits = newDefaultDisableHits;
-		firePropertyChanged(DEFAULT_DISABLE_HITS_PROPERTY, oldDefaultDisableHits, newDefaultDisableHits);	
-	}
-	
-	public Boolean getSpecifiedDisableHits() {
-		return this.specifiedDisableHits;
-	}
-	
-	public void setSpecifiedDisableHits(Boolean newSpecifiedDisableHits) {
-		Boolean oldSpecifiedDisableHits = this.specifiedDisableHits;
-		this.specifiedDisableHits = newSpecifiedDisableHits;
-		if (oldSpecifiedDisableHits != newSpecifiedDisableHits) {
-			if (this.getResourceCache() != null) {
-				this.getResourceCache().setDisableHits(newSpecifiedDisableHits);						
-				if (this.getResourceCache().isUnset()) {
-					removeResourceCache();
-				}
-			}
-			else if (newSpecifiedDisableHits != null) {
-				addResourceCache();
-				getResourceCache().setDisableHits(newSpecifiedDisableHits);
-			}
-		}
-		firePropertyChanged(SPECIFIED_DISABLE_HITS_PROPERTY, oldSpecifiedDisableHits, newSpecifiedDisableHits);		
-	}
-	
-	protected void setSpecifiedDisableHits_(Boolean newSpecifiedDisableHits) {
-		Boolean oldSpecifiedDisableHits = this.specifiedDisableHits;
-		this.specifiedDisableHits = newSpecifiedDisableHits;
-		firePropertyChanged(SPECIFIED_DISABLE_HITS_PROPERTY, oldSpecifiedDisableHits, newSpecifiedDisableHits);	
-	}
-	
-	public CacheType getType() {
-		return (this.specifiedType == null) ? this.defaultType : this.specifiedType;
-	}
-
-	public CacheType getDefaultType() {
-		return this.defaultType;
-	}
-	
-	protected void setDefaultType(CacheType newDefaultType) {
-		CacheType oldDefaultType= this.defaultType;
-		this.defaultType = newDefaultType;
-		firePropertyChanged(DEFAULT_TYPE_PROPERTY, oldDefaultType, newDefaultType);				
-	}
-	
-	public CacheType getSpecifiedType() {
-		return this.specifiedType;
-	}
-	
-	public void setSpecifiedType(CacheType newSpecifiedType) {
-		CacheType oldSpecifiedType = this.specifiedType;
-		this.specifiedType = newSpecifiedType;
-		if (oldSpecifiedType != newSpecifiedType) {
-			if (this.getResourceCache() != null) {
-				this.getResourceCache().setType(CacheType.toOrmResourceModel(newSpecifiedType));						
-				if (this.getResourceCache().isUnset()) {
-					removeResourceCache();
-				}
-			}
-			else if (newSpecifiedType != null) {
-				addResourceCache();
-				getResourceCache().setType(CacheType.toOrmResourceModel(newSpecifiedType));
-			}
-		}
-		firePropertyChanged(SPECIFIED_TYPE_PROPERTY, oldSpecifiedType, newSpecifiedType);		
-	}
-	
-	protected void setSpecifiedType_(CacheType newSpecifiedType) {
-		CacheType oldSpecifiedType= this.specifiedType;
-		this.specifiedType = newSpecifiedType;
-		firePropertyChanged(SPECIFIED_TYPE_PROPERTY, oldSpecifiedType, newSpecifiedType);		
-	}
-	
-	
-	public CacheCoordinationType getCoordinationType() {
-		return (this.specifiedCoordinationType == null) ? this.defaultCoordinationType : this.specifiedCoordinationType;
-	}
-	
-	public CacheCoordinationType getDefaultCoordinationType() {
-		return this.defaultCoordinationType;
-	}
-	
-	protected void setDefaultCoordinationType(CacheCoordinationType newDefaultcCoordinationType) {
-		CacheCoordinationType oldDefaultcCoordinationType= this.defaultCoordinationType;
-		this.defaultCoordinationType = newDefaultcCoordinationType;
-		firePropertyChanged(DEFAULT_COORDINATION_TYPE_PROPERTY, oldDefaultcCoordinationType, newDefaultcCoordinationType);				
-	}
-	
-	public CacheCoordinationType getSpecifiedCoordinationType() {
-		return this.specifiedCoordinationType;
-	}
-	
-	public void setSpecifiedCoordinationType(CacheCoordinationType newSpecifiedCoordinationType) {
-		CacheCoordinationType oldSpecifiedCoordinationType = this.specifiedCoordinationType;
-		this.specifiedCoordinationType = newSpecifiedCoordinationType;
-		if (oldSpecifiedCoordinationType != newSpecifiedCoordinationType) {
-			if (this.getResourceCache() != null) {
-				this.getResourceCache().setCoordinationType(CacheCoordinationType.toOrmResourceModel(newSpecifiedCoordinationType));						
-				if (this.getResourceCache().isUnset()) {
-					removeResourceCache();
-				}
-			}
-			else if (newSpecifiedCoordinationType != null) {
-				addResourceCache();
-				getResourceCache().setCoordinationType(CacheCoordinationType.toOrmResourceModel(newSpecifiedCoordinationType));
-			}
-		}
-		firePropertyChanged(SPECIFIED_COORDINATION_TYPE_PROPERTY, oldSpecifiedCoordinationType, newSpecifiedCoordinationType);		
-	}
-	
-	protected void setSpecifiedCoordinationType_(CacheCoordinationType newSpecifiedCoordinationType) {
-		CacheCoordinationType oldSpecifiedCoordinationType = this.specifiedCoordinationType;
-		this.specifiedCoordinationType = newSpecifiedCoordinationType;
-		firePropertyChanged(SPECIFIED_COORDINATION_TYPE_PROPERTY, oldSpecifiedCoordinationType, newSpecifiedCoordinationType);		
-	}
-	
-	public ExistenceType getExistenceType() {
-		return (this.specifiedExistenceType == null) ? this.defaultExistenceType : this.specifiedExistenceType;
-	}
-	
-	public ExistenceType getDefaultExistenceType() {
-		return this.defaultExistenceType;
-	}
-	
-	protected void setDefaultExistenceType(ExistenceType newDefaultExistenceType) {
-		ExistenceType oldDefaultExistenceType = this.defaultExistenceType;
-		this.defaultExistenceType = newDefaultExistenceType;
-		firePropertyChanged(DEFAULT_EXISTENCE_TYPE_PROPERTY, oldDefaultExistenceType, newDefaultExistenceType);
-	}
-	
-	public ExistenceType getSpecifiedExistenceType() {
-		return this.specifiedExistenceType;
-	}
-	
-	public void setSpecifiedExistenceType(ExistenceType newSpecifiedExistenceType) {
-		ExistenceType oldSpecifiedExistenceType = this.specifiedExistenceType;
-		this.specifiedExistenceType = newSpecifiedExistenceType;
-		this.resource.setExistenceChecking(ExistenceType.toOrmResourceModel(newSpecifiedExistenceType));
-		firePropertyChanged(SPECIFIED_EXISTENCE_TYPE_PROPERTY, oldSpecifiedExistenceType, newSpecifiedExistenceType);			
-	}
-	
-	protected void setSpecifiedExistenceType_(ExistenceType newSpecifiedExistenceType) {
-		ExistenceType oldSpecifiedExistenceType = this.specifiedExistenceType;
-		this.specifiedExistenceType = newSpecifiedExistenceType;
-		firePropertyChanged(SPECIFIED_EXISTENCE_TYPE_PROPERTY, oldSpecifiedExistenceType, newSpecifiedExistenceType);		
-	}	
-	
-	public Integer getExpiry() {
-		return this.expiry;
-	}
-	
-	public void setExpiry(Integer newExpiry) {
-		Integer oldExpiry = this.expiry;
-		this.expiry = newExpiry;
-		if (oldExpiry != newExpiry) {
-			if (this.getResourceCache() != null) {
-				this.getResourceCache().setExpiry(newExpiry);						
-				if (this.getResourceCache().isUnset()) {
-					removeResourceCache();
-				}
-			}
-			else if (newExpiry != null) {
-				addResourceCache();
-				this.getResourceCache().setExpiry(newExpiry);						
-			}
-		}
-		firePropertyChanged(EXPIRY_PROPERTY, oldExpiry, newExpiry);
-		if (newExpiry != null && this.expiryTimeOfDay != null) {
-			removeExpiryTimeOfDay();
-		}
-	}
-	
-	protected void setExpiry_(Integer newExpiry) {
-		Integer oldExpiry = this.expiry;
-		this.expiry = newExpiry;		
-		firePropertyChanged(EXPIRY_PROPERTY, oldExpiry, newExpiry);
-	}
-	
-	public ExpiryTimeOfDay getExpiryTimeOfDay() {
-		return this.expiryTimeOfDay;
-	}
-	
-	public ExpiryTimeOfDay addExpiryTimeOfDay() {
-		if (this.expiryTimeOfDay != null) {
-			throw new IllegalStateException("expiryTimeOfDay already exists, use getExpiryTimeOfDay()"); //$NON-NLS-1$
-		}
-		if (getResourceCache() == null) {
-			addResourceCache();
-		}
-		EclipseLinkOrmExpiryTimeOfDay newExpiryTimeOfDay = new EclipseLinkOrmExpiryTimeOfDay(this);
-		this.expiryTimeOfDay = newExpiryTimeOfDay;
-		XmlTimeOfDay resourceTimeOfDay = EclipseLinkOrmFactory.eINSTANCE.createXmlTimeOfDay();
-		newExpiryTimeOfDay.initialize(resourceTimeOfDay);
-		getResourceCache().setExpiryTimeOfDay(resourceTimeOfDay);
-		firePropertyChanged(EXPIRY_TIME_OF_DAY_PROPERTY, null, newExpiryTimeOfDay);
-		setExpiry(null);
-		return newExpiryTimeOfDay;
-	}
-	
-	public void removeExpiryTimeOfDay() {
-		if (this.expiryTimeOfDay == null) {
-			throw new IllegalStateException("timeOfDayExpiry does not exist"); //$NON-NLS-1$
-		}
-		ExpiryTimeOfDay oldExpiryTimeOfDay = this.expiryTimeOfDay;
-		this.expiryTimeOfDay = null;
-		getResourceCache().setExpiryTimeOfDay(null);
-		if (this.getResourceCache().isUnset()) {
-			removeResourceCache();
-		}
-		firePropertyChanged(EXPIRY_TIME_OF_DAY_PROPERTY, oldExpiryTimeOfDay, null);
-	}
-	
-	protected void setExpiryTimeOfDay(EclipseLinkOrmExpiryTimeOfDay newExpiryTimeOfDay) {
-		EclipseLinkOrmExpiryTimeOfDay oldExpiryTimeOfDay = this.expiryTimeOfDay;
-		this.expiryTimeOfDay = newExpiryTimeOfDay;
-		firePropertyChanged(EXPIRY_TIME_OF_DAY_PROPERTY, oldExpiryTimeOfDay, newExpiryTimeOfDay);
-	}
-	
-	protected XmlCache getResourceCache() {
-		return this.resource.getCache();
-	}
-	
-	protected void addResourceCache() {
-		this.resource.setCache(EclipseLinkOrmFactory.eINSTANCE.createXmlCache());		
-	}
-	
-	protected void removeResourceCache() {
-		this.resource.setCache(null);
-	}
-	
-	
-	// **************** initialize/update **************************************
-
-	protected void initializeExpiry(XmlCache resourceCache) {
-		if (resourceCache == null) {
-			return;
-		}
-		if (resourceCache.getExpiryTimeOfDay() == null) {
-			this.expiry = resourceCache.getExpiry();
-		}
-		else {
-			if (resourceCache.getExpiry() == null) { //handle with validation if both expiry and expiryTimeOfDay are set
-				this.expiryTimeOfDay = new EclipseLinkOrmExpiryTimeOfDay(this);
-				this.expiryTimeOfDay.initialize(resourceCache.getExpiryTimeOfDay());
-			}
-		}
-	}
-
-	protected void update(JavaCaching javaCaching) {
-		XmlCache resourceCache = getResourceCache();
-		setDefaultSize(this.defaultSize(javaCaching));
-		setSpecifiedSize_(this.getResourceSize(resourceCache));
-		setDefaultShared(this.defaultShared(javaCaching));
-		setSpecifiedShared_(this.getResourceShared(resourceCache));
-		setDefaultAlwaysRefresh(this.defaultAlwaysRefresh(javaCaching));
-		setSpecifiedAlwaysRefresh_(this.getResourceAlwaysRefresh(resourceCache));
-		setDefaultRefreshOnlyIfNewer(this.defaultRefreshOnlyIfNewer(javaCaching));
-		setSpecifiedRefreshOnlyIfNewer_(this.getResourceRefreshOnlyIfNewer(resourceCache));
-		setDefaultDisableHits(this.defaultDisableHits(javaCaching));
-		setSpecifiedDisableHits_(this.getResourceDisableHits(resourceCache));
-		setDefaultType(this.defaultType(javaCaching));
-		setSpecifiedType_(this.getResourceType(resourceCache));
-		setDefaultCoordinationType(this.defaultCoordinationType(javaCaching));
-		setSpecifiedCoordinationType_(this.getResourceCoordinationType(resourceCache));
-		setDefaultExistenceType(this.defaultExistenceType(javaCaching));
-		setSpecifiedExistenceType_(this.getResourceExistenceChecking());
-		this.updateExpiry(resourceCache);
-	}
-	
-	protected void updateExpiry(XmlCache resourceCache) {
-		if (resourceCache == null) {
-			setExpiryTimeOfDay(null);
-			setExpiry_(null);
-			return;
-		}
-		if (resourceCache.getExpiryTimeOfDay() == null) {
-			setExpiryTimeOfDay(null);
-			setExpiry_(resourceCache.getExpiry());
-		}
-		else {
-			if (this.expiryTimeOfDay != null) {
-				this.expiryTimeOfDay.update(resourceCache.getExpiryTimeOfDay());
-			}
-			else if (resourceCache.getExpiry() == null){
-				setExpiryTimeOfDay(new EclipseLinkOrmExpiryTimeOfDay(this));
-				this.expiryTimeOfDay.initialize(resourceCache.getExpiryTimeOfDay());
-			}
-			else { //handle with validation if both expiry and expiryTimeOfDay are set
-				setExpiryTimeOfDay(null);
-			}
-		}
-	}
-	
-	protected int defaultSize(JavaCaching javaCaching) {
-		return (javaCaching == null) ? DEFAULT_SIZE : javaCaching.getSize();
-	}
-	
-	protected Integer getResourceSize(XmlCache resource) {
-		return (resource == null) ? null : resource.getSize();
-	}
-	
-	protected boolean defaultShared(JavaCaching javaCaching) {
-		if (javaCaching == null) {
-			return DEFAULT_SHARED;
-		}
-		return getResourceCache() == null ? javaCaching.isShared() : DEFAULT_SHARED;
-	}
-	
-	protected Boolean getResourceShared(XmlCache resource) {
-		return (resource == null) ? null : resource.getShared();
-	}
-	
-	protected boolean defaultAlwaysRefresh(JavaCaching javaCaching) {
-		if (javaCaching == null) {
-			return DEFAULT_ALWAYS_REFRESH;
-		}
-		return getResourceCache() == null ? javaCaching.isAlwaysRefresh() : DEFAULT_ALWAYS_REFRESH;
-	}
-	
-	protected Boolean getResourceAlwaysRefresh(XmlCache resource) {
-		return (resource == null) ? null : resource.getAlwaysRefresh();
-	}
-	
-	protected boolean defaultRefreshOnlyIfNewer(JavaCaching javaCaching) {
-		if (javaCaching == null) {
-			return DEFAULT_REFRESH_ONLY_IF_NEWER;
-		}
-		return getResourceCache() == null ? javaCaching.isRefreshOnlyIfNewer() : DEFAULT_REFRESH_ONLY_IF_NEWER;
-	}
-	
-	protected Boolean getResourceRefreshOnlyIfNewer(XmlCache resource) {
-		return (resource == null) ? null : resource.getRefreshOnlyIfNewer();
-	}
-	
-	protected boolean defaultDisableHits(JavaCaching javaCaching) {
-		if (javaCaching == null) {
-			return DEFAULT_DISABLE_HITS;
-		}
-		return getResourceCache() == null ? javaCaching.isDisableHits() : DEFAULT_DISABLE_HITS;
-	}
-	
-	protected Boolean getResourceDisableHits(XmlCache resource) {
-		return (resource == null) ? null : resource.getDisableHits();
-	}
-	
-	protected CacheType defaultType(JavaCaching javaCaching) {
-		if (javaCaching == null) {
-			return DEFAULT_TYPE;
-		}
-		return getResourceCache() == null ? javaCaching.getType() : DEFAULT_TYPE;
-	}
-	
-	protected CacheType getResourceType(XmlCache resource) {
-		return (resource == null) ? null : CacheType.fromOrmResourceModel(resource.getType());
-	}
-	
-	protected CacheCoordinationType defaultCoordinationType(JavaCaching javaCaching) {
-		if (javaCaching == null) {
-			return DEFAULT_COORDINATION_TYPE;
-		}
-		return getResourceCache() == null ? javaCaching.getCoordinationType() : DEFAULT_COORDINATION_TYPE;
-	}
-	
-	protected CacheCoordinationType getResourceCoordinationType(XmlCache resource) {
-		return (resource == null) ? null : CacheCoordinationType.fromOrmResourceModel(resource.getCoordinationType());
-	}
-	
-	protected ExistenceType defaultExistenceType(JavaCaching javaCaching) {
-		return (javaCaching == null) ? DEFAULT_EXISTENCE_TYPE : javaCaching.getExistenceType();
-	}
-	
-	protected ExistenceType getResourceExistenceChecking() {
-		return (this.resource == null) ? null : ExistenceType.fromOrmResourceModel(this.resource.getExistenceChecking());
-	}
-	
-	protected Integer getResourceExpiry(XmlCache resource) {
-		return (resource == null) ? null : resource.getExpiry();
-	}
-	
-	// **************** validation **************************************
-	
-	public TextRange getValidationTextRange() {
-		XmlCache resource = getResourceCache();
-		return resource == null ? null : resource.getValidationTextRange();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmChangeTracking.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmChangeTracking.java
deleted file mode 100644
index 42c7470dab..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmChangeTracking.java
+++ /dev/null
@@ -1,104 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.ChangeTracking;
-import org.eclipse.jpt.eclipselink.core.context.ChangeTrackingType;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlChangeTracking;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlChangeTrackingHolder;
-
-public class EclipseLinkOrmChangeTracking extends AbstractXmlContextNode
-	implements ChangeTracking
-{
-	protected final XmlChangeTrackingHolder resource;
-	
-	protected ChangeTrackingType defaultType;
-	
-	protected ChangeTrackingType specifiedType;
-	
-	
-	public EclipseLinkOrmChangeTracking(OrmTypeMapping parent, XmlChangeTrackingHolder resource, ChangeTracking javaChangeTracking) {
-		super(parent);
-		this.resource = resource;
-		this.defaultType = calculateDefaultType(javaChangeTracking);
-		this.specifiedType = getResourceChangeTracking();
-	}
-	
-	
-	public ChangeTrackingType getType() {
-		return (getSpecifiedType() != null) ? getSpecifiedType() : getDefaultType();
-	}
-	
-	public ChangeTrackingType getDefaultType() {
-		return this.defaultType;
-	}
-	
-	protected void setDefaultType_(ChangeTrackingType newDefaultType) {
-		ChangeTrackingType oldDefaultType = this.defaultType;
-		this.defaultType = newDefaultType;
-		firePropertyChanged(DEFAULT_TYPE_PROPERTY, oldDefaultType, newDefaultType);
-	}
-	
-	public ChangeTrackingType getSpecifiedType() {
-		return this.specifiedType;
-	}
-	
-	public void setSpecifiedType(ChangeTrackingType newSpecifiedType) {
-		ChangeTrackingType oldSpecifiedType = this.specifiedType;
-		this.specifiedType = newSpecifiedType;
-		
-		if (newSpecifiedType == null) {
-			this.resource.setChangeTracking(null);
-		}
-		else {
-			if (this.resource.getChangeTracking() == null) {
-				this.resource.setChangeTracking(EclipseLinkOrmFactory.eINSTANCE.createXmlChangeTracking());
-			}
-			this.resource.getChangeTracking().setType(ChangeTrackingType.toOrmResourceModel(newSpecifiedType));
-		}
-		
-		firePropertyChanged(SPECIFIED_TYPE_PROPERTY, oldSpecifiedType, newSpecifiedType);
-	}
-	
-	protected void setSpecifiedType_(ChangeTrackingType newSpecifiedType) {
-		ChangeTrackingType oldSpecifiedType = this.specifiedType;
-		this.specifiedType = newSpecifiedType;
-		firePropertyChanged(SPECIFIED_TYPE_PROPERTY, oldSpecifiedType, newSpecifiedType);
-	}
-	
-	
-	// **************** updating **************************************
-	
-	protected void update(ChangeTracking javaChangeTracking) {
-		setDefaultType_(calculateDefaultType(javaChangeTracking));
-		setSpecifiedType_(getResourceChangeTracking());
-	}
-	
-	protected ChangeTrackingType calculateDefaultType(ChangeTracking javaChangeTracking) {
-		return (javaChangeTracking != null) ? javaChangeTracking.getType() : ChangeTracking.DEFAULT_TYPE;
-	}
-	
-	protected ChangeTrackingType getResourceChangeTracking() {
-		XmlChangeTracking xmlChangeTracking = this.resource.getChangeTracking();
-		return (xmlChangeTracking != null) ? ChangeTrackingType.fromOrmResourceModel(xmlChangeTracking.getType()) : null;
-	}
-	
-	
-	// **************** validation **************************************
-	
-	public TextRange getValidationTextRange() {
-		return this.resource.getValidationTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConversionValue.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConversionValue.java
deleted file mode 100644
index 443d94ed7d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConversionValue.java
+++ /dev/null
@@ -1,127 +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.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.ConversionValue;
-import org.eclipse.jpt.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkOrmConversionValue extends AbstractXmlContextNode implements ConversionValue
-{	
-	private XmlConversionValue resourceConversionValue;
-	
-	private String dataValue;
-	
-	private String objectValue;
-	
-	public EclipseLinkOrmConversionValue(EclipseLinkOrmObjectTypeConverter parent) {
-		super(parent);
-	}
-	
-	@Override
-	public EclipseLinkOrmObjectTypeConverter getParent() {
-		return (EclipseLinkOrmObjectTypeConverter) super.getParent();
-	}
-
-	public TextRange getValidationTextRange() {
-		return this.resourceConversionValue.getValidationTextRange();
-	}
-	
-	public String getDataValue() {
-		return this.dataValue;
-	}
-
-	public void setDataValue(String newDataValue) {
-		String oldDataValue = this.dataValue;
-		this.dataValue = newDataValue;
-		this.resourceConversionValue.setDataValue(newDataValue);
-		firePropertyChanged(DATA_VALUE_PROPERTY, oldDataValue, newDataValue);
-	}
-	
-	protected void setDataValue_(String newDataValue) {
-		String oldDataValue = this.dataValue;
-		this.dataValue = newDataValue;
-		firePropertyChanged(DATA_VALUE_PROPERTY, oldDataValue, newDataValue);
-	}
-	
-	public String getObjectValue() {
-		return this.objectValue;
-	}
-
-	public void setObjectValue(String newObjectValue) {
-		String oldObjectValue = this.objectValue;
-		this.objectValue = newObjectValue;
-		this.resourceConversionValue.setObjectValue(newObjectValue);
-		firePropertyChanged(OBJECT_VALUE_PROPERTY, oldObjectValue, newObjectValue);
-	}
-	
-	protected void setObjectValue_(String newObjectValue) {
-		String oldObjectValue = this.objectValue;
-		this.objectValue = newObjectValue;
-		firePropertyChanged(OBJECT_VALUE_PROPERTY, oldObjectValue, newObjectValue);
-	}
-
-	public void initialize(XmlConversionValue resourceConversionValue) {
-		this.resourceConversionValue = resourceConversionValue;
-		this.dataValue = this.getResourceDataValue();
-		this.objectValue = this.getResourceObjectValue();
-	}
-	
-	public void update(XmlConversionValue resourceConversionValue) {
-		this.resourceConversionValue = resourceConversionValue;
-		this.setDataValue_(this.getResourceDataValue());
-		this.setObjectValue_(this.getResourceObjectValue());
-	}
-
-	protected String getResourceDataValue() {
-		return this.resourceConversionValue.getDataValue();
-	}
-
-	protected String getResourceObjectValue() {
-		return this.resourceConversionValue.getObjectValue();
-	}
-
-	public TextRange getDataValueTextRange() {
-		return this.resourceConversionValue.getDataValueTextRange();
-	}
-
-	public TextRange getObjectValueTextRange() {
-		return this.resourceConversionValue.getObjectValueTextRange();
-	}
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		validateDataValuesUnique(messages);
-	}
-	
-	protected void validateDataValuesUnique(List<IMessage> messages) {
-		List<String> dataValues = CollectionTools.list(getParent().dataValues());
-		dataValues.remove(this.dataValue);
-		if (dataValues.contains(this.dataValue)) {
-			messages.add(
-				DefaultEclipseLinkJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					EclipseLinkJpaValidationMessages.MULTIPLE_OBJECT_VALUES_FOR_DATA_VALUE,
-					new String[] {this.dataValue}, 
-					this,
-					this.getDataValueTextRange()
-				)
-			);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConvert.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConvert.java
deleted file mode 100644
index 9a13e6a9a2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConvert.java
+++ /dev/null
@@ -1,274 +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.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmConverter;
-import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.Convert;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertibleMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkOrmConvert extends AbstractXmlContextNode implements Convert, OrmConverter
-{
-	protected String specifiedConverterName;
-	
-	protected XmlConvertibleMapping resourceMapping;
-	
-	protected EclipseLinkOrmConverter converter;
-	
-	public EclipseLinkOrmConvert(OrmAttributeMapping parent, XmlConvertibleMapping resourceMapping) {
-		super(parent);
-		this.initialize(resourceMapping);
-	}
-
-	@Override
-	public OrmAttributeMapping getParent() {
-		return (OrmAttributeMapping) super.getParent();
-	}
-
-	public String getType() {
-		return Convert.ECLIPSE_LINK_CONVERTER;
-	}
-		
-	public void addToResourceModel() {
-		this.resourceMapping.setConvert(""); //$NON-NLS-1$
-	}
-	
-	public void removeFromResourceModel() {
-		this.resourceMapping.setConvert(null);
-	}
-
-	public TextRange getValidationTextRange() {
-		return this.resourceMapping.getConvertTextRange();
-	}
-	
-	public String getConverterName() {
-		return getSpecifiedConverterName() == null ? getDefaultConverterName() : getSpecifiedConverterName();
-	}
-
-	public String getDefaultConverterName() {
-		return DEFAULT_CONVERTER_NAME;
-	}
-
-	public String getSpecifiedConverterName() {
-		return this.specifiedConverterName;
-	}
-
-	public void setSpecifiedConverterName(String newSpecifiedConverterName) {
-		String oldSpecifiedConverterName = this.specifiedConverterName;
-		this.specifiedConverterName = newSpecifiedConverterName;
-		this.resourceMapping.setConvert(newSpecifiedConverterName);
-		firePropertyChanged(SPECIFIED_CONVERTER_NAME_PROPERTY, oldSpecifiedConverterName, newSpecifiedConverterName);
-	}
-	
-	protected void setSpecifiedConverterName_(String newSpecifiedConverterName) {
-		String oldSpecifiedConverterName = this.specifiedConverterName;
-		this.specifiedConverterName = newSpecifiedConverterName;
-		firePropertyChanged(SPECIFIED_CONVERTER_NAME_PROPERTY, oldSpecifiedConverterName, newSpecifiedConverterName);
-	}
-
-	public EclipseLinkOrmConverter getConverter() {
-		return this.converter;
-	}
-	
-	protected String getConverterType() {
-		if (this.converter == null) {
-			return EclipseLinkConverter.NO_CONVERTER;
-		}
-		return this.converter.getType();
-	}
-
-	public void setConverter(String converterType) {
-		if (getConverterType() == converterType) {
-			return;
-		}
-		EclipseLinkOrmConverter oldConverter = this.converter;
-		if (oldConverter != null) {
-			this.converter = null; //set to null now to avoid update triggering events
-			removeConverter(oldConverter.getType());
-		}
-		JpaEObject resourceConverter = buildResourceConverter(converterType);
-		EclipseLinkOrmConverter newConverter = buildConverter(converterType, resourceConverter);
-		this.converter = newConverter;
-		if (newConverter != null) {
-			addConverter(converterType, resourceConverter);
-		}
-		firePropertyChanged(CONVERTER_PROPERTY, oldConverter, newConverter);
-	}
-
-	//TODO yes, i know, many if/else type checks in the methods below.
-	//will look at factoring this out when I have time after M3!  Also EclipseLinkJavaConvert
-	protected void removeConverter(String converterType) {
-		if (converterType == EclipseLinkConverter.CUSTOM_CONVERTER) {
-			this.resourceMapping.setConverter(null);
-		}
-		else if (converterType == EclipseLinkConverter.TYPE_CONVERTER) {
-			this.resourceMapping.setTypeConverter(null);
-		}
-		else if (converterType == EclipseLinkConverter.OBJECT_TYPE_CONVERTER) {
-			this.resourceMapping.setObjectTypeConverter(null);
-		}
-		else if (converterType == EclipseLinkConverter.STRUCT_CONVERTER) {
-			this.resourceMapping.setStructConverter(null);
-		}
-	}
-	
-	protected JpaEObject buildResourceConverter(String converterType) {
-		if (converterType == EclipseLinkConverter.CUSTOM_CONVERTER) {
-			return EclipseLinkOrmFactory.eINSTANCE.createXmlConverterImpl();
-		}
-		else if (converterType == EclipseLinkConverter.TYPE_CONVERTER) {
-			return EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverterImpl();
-		}
-		else if (converterType == EclipseLinkConverter.OBJECT_TYPE_CONVERTER) {
-			return EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverterImpl();
-		}
-		else if (converterType == EclipseLinkConverter.STRUCT_CONVERTER) {
-			return EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverterImpl();
-		}
-		return null;
-	}
-
-	protected void addConverter(String converterType, JpaEObject resourceConverter) {
-		if (converterType == EclipseLinkConverter.CUSTOM_CONVERTER) {
-			this.resourceMapping.setConverter((XmlConverter) resourceConverter);
-		}
-		else if (converterType == EclipseLinkConverter.TYPE_CONVERTER) {
-			this.resourceMapping.setTypeConverter((XmlTypeConverter) resourceConverter);
-		}
-		else if (converterType == EclipseLinkConverter.OBJECT_TYPE_CONVERTER) {
-			this.resourceMapping.setObjectTypeConverter((XmlObjectTypeConverter) resourceConverter);
-		}
-		else if (converterType == EclipseLinkConverter.STRUCT_CONVERTER) {
-			this.resourceMapping.setStructConverter((XmlStructConverter) resourceConverter);
-		}
-	}
-	
-	protected EclipseLinkOrmConverter<?> buildConverter(String converterType, JpaEObject resourceConverter) {
-		if (converterType == EclipseLinkConverter.NO_CONVERTER) {
-			return null;
-		}
-		if (converterType == EclipseLinkConverter.CUSTOM_CONVERTER) {
-			return buildCustomConverter((XmlConverter) resourceConverter);
-		}
-		else if (converterType == EclipseLinkConverter.TYPE_CONVERTER) {
-			return buildTypeConverter((XmlTypeConverter) resourceConverter);
-		}
-		else if (converterType == EclipseLinkConverter.OBJECT_TYPE_CONVERTER) {
-			return buildObjectTypeConverter((XmlObjectTypeConverter) resourceConverter);
-		}
-		else if (converterType == EclipseLinkConverter.STRUCT_CONVERTER) {
-			return buildStructConverter((XmlStructConverter) resourceConverter);
-		}
-		return null;
-	}
-
-	protected void setConverter(EclipseLinkOrmConverter<?> newConverter) {
-		EclipseLinkOrmConverter<?> oldConverter = this.converter;
-		this.converter = newConverter;
-		firePropertyChanged(CONVERTER_PROPERTY, oldConverter, newConverter);
-	}
-	
-	protected void initialize(XmlConvertibleMapping resourceMapping) {
-		this.resourceMapping = resourceMapping;
-		this.specifiedConverterName = this.getResourceConvert();
-		this.converter = this.buildConverter();
-	}
-	
-	public void update() {
-		this.setSpecifiedConverterName_(this.getResourceConvert());
-		if (getResourceConverterType() == getConverterType()) {
-			this.converter.update();
-		}
-		else {
-			setConverter(buildConverter());
-		}
-	}
-	
-	protected String getResourceConvert() {
-		return this.resourceMapping == null ? null : this.resourceMapping.getConvert();
-	}
-
-	protected String getResourceConverterType() {
-		if (this.resourceMapping.getConverter() != null) {
-			return EclipseLinkConverter.CUSTOM_CONVERTER;
-		}
-		else if (this.resourceMapping.getTypeConverter() != null) {
-			return EclipseLinkConverter.TYPE_CONVERTER;
-		}
-		else if (this.resourceMapping.getObjectTypeConverter() != null) {
-			return EclipseLinkConverter.OBJECT_TYPE_CONVERTER;
-		}
-		else if (this.resourceMapping.getStructConverter() != null) {
-			return EclipseLinkConverter.STRUCT_CONVERTER;
-		}
-		
-		return null;
-	}
-	protected EclipseLinkOrmConverter<?> buildConverter() {
-		if (this.resourceMapping.getConverter() != null) {
-			return buildCustomConverter(this.resourceMapping.getConverter());
-		}
-		else if (this.resourceMapping.getTypeConverter() != null) {
-			return buildTypeConverter(this.resourceMapping.getTypeConverter());
-		}
-		else if (this.resourceMapping.getObjectTypeConverter() != null) {
-			return buildObjectTypeConverter(this.resourceMapping.getObjectTypeConverter());
-		}
-		else if (this.resourceMapping.getStructConverter() != null) {
-			return buildStructConverter(this.resourceMapping.getStructConverter());
-		}
-		
-		return null;
-	}
-
-	protected EclipseLinkOrmCustomConverter buildCustomConverter(XmlConverter resourceConverter) {
-		EclipseLinkOrmCustomConverter contextConverter = new EclipseLinkOrmCustomConverter(this);
-		contextConverter.initialize(resourceConverter);
-		return contextConverter;
-	}
-
-	protected EclipseLinkOrmTypeConverter buildTypeConverter(XmlTypeConverter resourceConverter) {
-		EclipseLinkOrmTypeConverter contextConverter = new EclipseLinkOrmTypeConverter(this);
-		contextConverter.initialize(resourceConverter);
-		return contextConverter;
-	}
-
-	protected EclipseLinkOrmObjectTypeConverter buildObjectTypeConverter(XmlObjectTypeConverter resourceConverter) {
-		EclipseLinkOrmObjectTypeConverter contextConverter = new EclipseLinkOrmObjectTypeConverter(this);
-		contextConverter.initialize(resourceConverter);
-		return contextConverter;
-	}
-
-	protected EclipseLinkOrmStructConverter buildStructConverter(XmlStructConverter resourceConverter) {
-		EclipseLinkOrmStructConverter contextConverter = new EclipseLinkOrmStructConverter(this);
-		contextConverter.initialize(resourceConverter);
-		return contextConverter;
-	}
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		if (getConverter() != null) {
-			getConverter().validate(messages, reporter);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConverter.java
deleted file mode 100644
index c98d1da2e9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConverter.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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.XmlContextNode;
-import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaConverter;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlNamedConverter;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-public abstract class EclipseLinkOrmConverter<T extends XmlNamedConverter>
-	extends AbstractXmlContextNode implements EclipseLinkConverter
-{
-	protected T resourceConverter;
-	
-	protected String name;
-	
-	
-	protected EclipseLinkOrmConverter(XmlContextNode parent) {
-		super(parent);
-	}
-		
-	@Override
-	public EclipseLinkPersistenceUnit getPersistenceUnit() {
-		return (EclipseLinkPersistenceUnit) super.getPersistenceUnit();
-	}
-	
-	
-	protected T getXmlResource() {
-		return this.resourceConverter;
-	}
-
-	// **************** name ***************************************************
-	
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		this.resourceConverter.setName(newName);
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
-	}
-
-	protected void setName_(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
-	}
-	
-	
-	// **************** resource interaction ***********************************
-	
-	protected void initialize(T resource) {
-		this.resourceConverter = resource;
-		this.name = getResourceName();
-	}
-	
-	public void update() {
-		this.setName_(getResourceName());
-		getPersistenceUnit().addConverter(this);
-	}
-	
-	protected String getResourceName() {
-		return this.resourceConverter.getName();
-	}
-	
-	
-	// **************** validation *********************************************
-	
-	public boolean overrides(EclipseLinkConverter converter) {
-		if (getName() == null) {
-			return false;
-		}
-		// this isn't ideal, but it will have to do until we have further adopter input
-		return this.getName().equals(converter.getName()) && converter instanceof EclipseLinkJavaConverter;
-	}
-	
-	public boolean duplicates(EclipseLinkConverter converter) {
-		return (this != converter)
-				&& ! StringTools.stringIsEmpty(this.name)
-				&& this.name.equals(converter.getName())
-				&& ! this.overrides(converter)
-				&& ! converter.overrides(this);
-	}
-	
-	public TextRange getValidationTextRange() {
-		return this.resourceConverter.getValidationTextRange();
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConverterHolder.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConverterHolder.java
deleted file mode 100644
index dbe705af79..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConverterHolder.java
+++ /dev/null
@@ -1,451 +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.eclipselink.core.internal.context.orm;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.XmlContextNode;
-import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.CustomConverter;
-import org.eclipse.jpt.eclipselink.core.context.ObjectTypeConverter;
-import org.eclipse.jpt.eclipselink.core.context.StructConverter;
-import org.eclipse.jpt.eclipselink.core.context.TypeConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertersHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkOrmConverterHolder extends AbstractXmlContextNode implements ConverterHolder
-{	
-	private final XmlConvertersHolder resourceConvertersHolder;
-	
-	protected final List<EclipseLinkOrmCustomConverter> customConverters;
-	protected final List<EclipseLinkOrmObjectTypeConverter> objectTypeConverters;
-	protected final List<EclipseLinkOrmStructConverter> structConverters;
-	protected final List<EclipseLinkOrmTypeConverter> typeConverters;
-	
-	public EclipseLinkOrmConverterHolder(XmlContextNode parent, XmlConvertersHolder resourceConvertersHolder) {
-		super(parent);
-		this.resourceConvertersHolder = resourceConvertersHolder;
-		this.customConverters = new ArrayList<EclipseLinkOrmCustomConverter>();
-		this.objectTypeConverters = new ArrayList<EclipseLinkOrmObjectTypeConverter>();
-		this.structConverters = new ArrayList<EclipseLinkOrmStructConverter>();
-		this.typeConverters = new ArrayList<EclipseLinkOrmTypeConverter>();
-		this.initializeCustomConverters();
-		this.initializeObjectTypeConverters();
-		this.initializeStructConverters();
-		this.initializeTypeConverters();		
-	}
-
-	public ListIterator<EclipseLinkOrmCustomConverter> customConverters() {
-		return this.customConverters.listIterator();
-	}
-
-	public int customConvertersSize() {
-		return this.customConverters.size();
-	}
-
-	public CustomConverter addCustomConverter(int index) {
-		XmlConverter resourceConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlConverterImpl();
-		EclipseLinkOrmCustomConverter contextConverter = this.buildCustomConverter(resourceConverter);
-		this.customConverters.add(index, contextConverter);
-		this.resourceConvertersHolder.getConverters().add(index, resourceConverter);
-		this.fireItemAdded(CUSTOM_CONVERTERS_LIST, index, contextConverter);
-		return contextConverter;
-	}
-
-	protected void addCustomConverter(int index, EclipseLinkOrmCustomConverter converter) {
-		addItemToList(index, converter, this.customConverters, CUSTOM_CONVERTERS_LIST);
-	}
-
-	protected void addCustomConverter(EclipseLinkOrmCustomConverter converter) {
-		this.addCustomConverter(this.customConverters.size(), converter);
-	}
-
-	public void removeCustomConverter(int index) {
-		EclipseLinkOrmCustomConverter removedConverter = this.customConverters.remove(index);
-		this.resourceConvertersHolder.getConverters().remove(index);
-		fireItemRemoved(CUSTOM_CONVERTERS_LIST, index, removedConverter);
-	}
-
-	public void removeCustomConverter(CustomConverter converter) {
-		this.removeCustomConverter(this.customConverters.indexOf(converter));
-	}
-
-	protected void removeConverter_(CustomConverter converter) {
-		removeItemFromList(converter, this.customConverters, CUSTOM_CONVERTERS_LIST);
-	}
-
-	public void moveCustomConverter(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.customConverters, targetIndex, sourceIndex);
-		this.resourceConvertersHolder.getConverters().move(targetIndex, sourceIndex);
-		fireItemMoved(CUSTOM_CONVERTERS_LIST, targetIndex, sourceIndex);		
-	}
-	
-	protected void moveCustomConverter_(int index, EclipseLinkOrmCustomConverter converter) {
-		moveItemInList(index, this.customConverters.indexOf(converter), this.customConverters, CUSTOM_CONVERTERS_LIST);
-	}
-
-	public ListIterator<EclipseLinkOrmObjectTypeConverter> objectTypeConverters() {
-		return this.objectTypeConverters.listIterator();
-	}
-
-	public int objectTypeConvertersSize() {
-		return this.objectTypeConverters.size();
-	}
-
-	public ObjectTypeConverter addObjectTypeConverter(int index) {
-		XmlObjectTypeConverter resourceObjectTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverterImpl();
-		EclipseLinkOrmObjectTypeConverter contextObjectTypeConverter = this.buildObjectTypeConverter(resourceObjectTypeConverter);
-		this.objectTypeConverters.add(index, contextObjectTypeConverter);
-		this.resourceConvertersHolder.getObjectTypeConverters().add(index, resourceObjectTypeConverter);
-		this.fireItemAdded(OBJECT_TYPE_CONVERTERS_LIST, index, contextObjectTypeConverter);
-		return contextObjectTypeConverter;
-	}
-
-	protected void addObjectTypeConverter(int index, EclipseLinkOrmObjectTypeConverter converter) {
-		addItemToList(index, converter, this.objectTypeConverters, OBJECT_TYPE_CONVERTERS_LIST);
-	}
-
-	protected void addObjectTypeConverter(EclipseLinkOrmObjectTypeConverter converter) {
-		this.addObjectTypeConverter(this.objectTypeConverters.size(), converter);
-	}
-
-	public void removeObjectTypeConverter(int index) {
-		EclipseLinkOrmObjectTypeConverter removedObjectTypeConverter = this.objectTypeConverters.remove(index);
-		this.resourceConvertersHolder.getObjectTypeConverters().remove(index);
-		fireItemRemoved(OBJECT_TYPE_CONVERTERS_LIST, index, removedObjectTypeConverter);
-	}
-
-	public void removeObjectTypeConverter(ObjectTypeConverter converter) {
-		this.removeObjectTypeConverter(this.objectTypeConverters.indexOf(converter));
-	}
-
-	protected void removeObjectTypeConverter_(ObjectTypeConverter converter) {
-		removeItemFromList(converter, this.objectTypeConverters, OBJECT_TYPE_CONVERTERS_LIST);
-	}
-
-	public void moveObjectTypeConverter(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.objectTypeConverters, targetIndex, sourceIndex);
-		this.resourceConvertersHolder.getObjectTypeConverters().move(targetIndex, sourceIndex);
-		fireItemMoved(OBJECT_TYPE_CONVERTERS_LIST, targetIndex, sourceIndex);		
-	}
-	
-	protected void moveObjectTypeConverter_(int index, EclipseLinkOrmObjectTypeConverter converter) {
-		moveItemInList(index, this.objectTypeConverters.indexOf(converter), this.objectTypeConverters, OBJECT_TYPE_CONVERTERS_LIST);
-	}
-
-	public ListIterator<EclipseLinkOrmStructConverter> structConverters() {
-		return this.structConverters.listIterator();
-	}
-
-	public int structConvertersSize() {
-		return this.structConverters.size();
-	}
-
-	public StructConverter addStructConverter(int index) {
-		XmlStructConverter resourceStructConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverterImpl();
-		EclipseLinkOrmStructConverter contextStructConverter = this.buildStructConverter(resourceStructConverter);
-		this.structConverters.add(index, contextStructConverter);
-		this.resourceConvertersHolder.getStructConverters().add(index, resourceStructConverter);
-		this.fireItemAdded(STRUCT_CONVERTERS_LIST, index, contextStructConverter);
-		return contextStructConverter;
-	}
-
-	protected void addStructConverter(int index, EclipseLinkOrmStructConverter converter) {
-		addItemToList(index, converter, this.structConverters, STRUCT_CONVERTERS_LIST);
-	}
-
-	protected void addStructConverter(EclipseLinkOrmStructConverter converter) {
-		this.addStructConverter(this.structConverters.size(), converter);
-	}
-
-	public void removeStructConverter(int index) {
-		EclipseLinkOrmStructConverter removedStructConverter = this.structConverters.remove(index);
-		this.resourceConvertersHolder.getStructConverters().remove(index);
-		fireItemRemoved(STRUCT_CONVERTERS_LIST, index, removedStructConverter);
-	}
-
-	public void removeStructConverter(StructConverter converter) {
-		this.removeStructConverter(this.structConverters.indexOf(converter));
-	}
-
-	protected void removeStructConverter_(StructConverter converter) {
-		removeItemFromList(converter, this.structConverters, STRUCT_CONVERTERS_LIST);
-	}
-
-	public void moveStructConverter(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.structConverters, targetIndex, sourceIndex);
-		this.resourceConvertersHolder.getStructConverters().move(targetIndex, sourceIndex);
-		fireItemMoved(STRUCT_CONVERTERS_LIST, targetIndex, sourceIndex);		
-	}
-	
-	protected void moveStructConverter_(int index, EclipseLinkOrmStructConverter converter) {
-		moveItemInList(index, this.structConverters.indexOf(converter), this.structConverters, STRUCT_CONVERTERS_LIST);
-	}
-
-
-	public ListIterator<EclipseLinkOrmTypeConverter> typeConverters() {
-		return this.typeConverters.listIterator();
-	}
-
-	public int typeConvertersSize() {
-		return this.typeConverters.size();
-	}
-
-	public TypeConverter addTypeConverter(int index) {
-		XmlTypeConverter resourceTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverterImpl();
-		EclipseLinkOrmTypeConverter contextTypeConverter = this.buildTypeConverter(resourceTypeConverter);
-		this.typeConverters.add(index, contextTypeConverter);
-		this.resourceConvertersHolder.getTypeConverters().add(index, resourceTypeConverter);
-		this.fireItemAdded(TYPE_CONVERTERS_LIST, index, contextTypeConverter);
-		return contextTypeConverter;
-	}
-
-	protected void addTypeConverter(int index, EclipseLinkOrmTypeConverter converter) {
-		addItemToList(index, converter, this.typeConverters, TYPE_CONVERTERS_LIST);
-	}
-
-	protected void addTypeConverter(EclipseLinkOrmTypeConverter converter) {
-		this.addTypeConverter(this.typeConverters.size(), converter);
-	}
-
-	public void removeTypeConverter(int index) {
-		EclipseLinkOrmTypeConverter removedTypeConverter = this.typeConverters.remove(index);
-		this.resourceConvertersHolder.getTypeConverters().remove(index);
-		fireItemRemoved(TYPE_CONVERTERS_LIST, index, removedTypeConverter);
-	}
-
-	public void removeTypeConverter(TypeConverter converter) {
-		this.removeTypeConverter(this.typeConverters.indexOf(converter));
-	}
-
-	protected void removeTypeConverter_(TypeConverter converter) {
-		removeItemFromList(converter, this.typeConverters, TYPE_CONVERTERS_LIST);
-	}
-
-	public void moveTypeConverter(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.typeConverters, targetIndex, sourceIndex);
-		this.resourceConvertersHolder.getTypeConverters().move(targetIndex, sourceIndex);
-		fireItemMoved(TYPE_CONVERTERS_LIST, targetIndex, sourceIndex);		
-	}
-	
-	protected void moveTypeConverter_(int index, EclipseLinkOrmTypeConverter converter) {
-		moveItemInList(index, this.typeConverters.indexOf(converter), this.typeConverters, TYPE_CONVERTERS_LIST);
-	}
-		
-	protected void initializeCustomConverters() {
-		for (XmlConverter resourceConverter : this.resourceConvertersHolder.getConverters()) {
-			this.customConverters.add(this.buildCustomConverter(resourceConverter));
-		}
-	}
-	
-	protected void initializeObjectTypeConverters() {
-		for (XmlObjectTypeConverter resourceConverter : this.resourceConvertersHolder.getObjectTypeConverters()) {
-			this.objectTypeConverters.add(this.buildObjectTypeConverter(resourceConverter));
-		}
-	}
-	
-	protected void initializeStructConverters() {
-		for (XmlStructConverter resourceConverter : this.resourceConvertersHolder.getStructConverters()) {
-			this.structConverters.add(this.buildStructConverter(resourceConverter));
-		}
-	}
-	
-	protected void initializeTypeConverters() {
-		for (XmlTypeConverter resourceConverter : this.resourceConvertersHolder.getTypeConverters()) {
-			this.typeConverters.add(this.buildTypeConverter(resourceConverter));
-		}
-	}
-	
-	protected EclipseLinkOrmCustomConverter buildCustomConverter(XmlConverter resourceConverter) {
-		EclipseLinkOrmCustomConverter contextConverter = new EclipseLinkOrmCustomConverter(this);
-		contextConverter.initialize(resourceConverter);
-		return contextConverter;
-	}
-
-	protected EclipseLinkOrmTypeConverter buildTypeConverter(XmlTypeConverter resourceConverter) {
-		EclipseLinkOrmTypeConverter contextConverter = new EclipseLinkOrmTypeConverter(this);
-		contextConverter.initialize(resourceConverter);
-		return contextConverter;
-	}
-
-	protected EclipseLinkOrmObjectTypeConverter buildObjectTypeConverter(XmlObjectTypeConverter resourceConverter) {
-		EclipseLinkOrmObjectTypeConverter contextConverter = new EclipseLinkOrmObjectTypeConverter(this);
-		contextConverter.initialize(resourceConverter);
-		return contextConverter;
-	}
-
-	protected EclipseLinkOrmStructConverter buildStructConverter(XmlStructConverter resourceConverter) {
-		EclipseLinkOrmStructConverter contextConverter = new EclipseLinkOrmStructConverter(this);
-		contextConverter.initialize(resourceConverter);
-		return contextConverter;
-	}
-
-	public void update() {
-		this.updateCustomConverters();
-		this.updateObjectTypeConverters();
-		this.updateStructConverters();
-		this.updateTypeConverters();		
-	}
-	
-	protected void updateCustomConverters() {
-		Collection<EclipseLinkOrmCustomConverter> contextConvertersToRemove = CollectionTools.collection(customConverters());
-		Collection<EclipseLinkOrmCustomConverter> contextConvertersToUpdate = new ArrayList<EclipseLinkOrmCustomConverter>();
-		int resourceIndex = 0;
-		
-		// make a copy of the XML conversion values (to prevent ConcurrentModificationException)
-		List<XmlConverter> xmlConverters = this.resourceConvertersHolder.getConverters();
-		for (XmlConverter resourceConverter : xmlConverters.toArray(new XmlConverter[xmlConverters.size()])) {
-			boolean contextConverterFound = false;
-			for (EclipseLinkOrmCustomConverter contextConverter : contextConvertersToRemove) {
-				if (contextConverter.getXmlResource() == resourceConverter) {
-					moveCustomConverter_(resourceIndex, contextConverter);
-					contextConvertersToRemove.remove(contextConverter);
-					contextConvertersToUpdate.add(contextConverter);
-					contextConverterFound = true;
-					break;
-				}
-			}
-			if (!contextConverterFound) {
-				addCustomConverter(this.buildCustomConverter(resourceConverter));
-			}
-			resourceIndex++;
-		}
-		for (EclipseLinkOrmCustomConverter contextConverter : contextConvertersToRemove) {
-			removeConverter_(contextConverter);
-		}
-		//first handle adding/removing of the converters, then update the others last, 
-		//this causes less churn in the update process
-		for (EclipseLinkOrmCustomConverter contextConverter : contextConvertersToUpdate) {
-			contextConverter.update();
-		}	
-	}
-	
-	protected void updateObjectTypeConverters() {
-		Collection<EclipseLinkOrmObjectTypeConverter> contextConvertersToRemove = CollectionTools.collection(objectTypeConverters());
-		Collection<EclipseLinkOrmObjectTypeConverter> contextConvertersToUpdate = new ArrayList<EclipseLinkOrmObjectTypeConverter>();
-		int resourceIndex = 0;
-
-		// make a copy of the XML converters (to prevent ConcurrentModificationException)
-		List<XmlObjectTypeConverter> xmlConverters = this.resourceConvertersHolder.getObjectTypeConverters();
-		for (XmlObjectTypeConverter xmlConverter : xmlConverters.toArray(new XmlObjectTypeConverter[xmlConverters.size()])) {
-			boolean contextConverterFound = false;
-			for (EclipseLinkOrmObjectTypeConverter contextObjectTypeConverter : contextConvertersToRemove) {
-				if (contextObjectTypeConverter.getXmlResource() == xmlConverter) {
-					moveObjectTypeConverter_(resourceIndex, contextObjectTypeConverter);
-					contextConvertersToRemove.remove(contextObjectTypeConverter);
-					contextConvertersToUpdate.add(contextObjectTypeConverter);
-					contextConverterFound = true;
-					break;
-				}
-			}
-			if (!contextConverterFound) {
-				addObjectTypeConverter(this.buildObjectTypeConverter(xmlConverter));
-			}
-			resourceIndex++;
-		}
-		for (EclipseLinkOrmObjectTypeConverter contextObjectTypeConverter : contextConvertersToRemove) {
-			removeObjectTypeConverter_(contextObjectTypeConverter);
-		}
-		//first handle adding/removing of the converters, then update the others last, 
-		//this causes less churn in the update process
-		for (EclipseLinkOrmObjectTypeConverter contextObjectTypeConverter : contextConvertersToUpdate) {
-			contextObjectTypeConverter.update();
-		}	
-	}
-	
-	protected void updateTypeConverters() {
-		Collection<EclipseLinkOrmTypeConverter> contextConvertersToRemove = CollectionTools.collection(typeConverters());
-		Collection<EclipseLinkOrmTypeConverter> contextConvertersToUpdate = new ArrayList<EclipseLinkOrmTypeConverter>();
-		int resourceIndex = 0;
-		
-		List<XmlTypeConverter> xmlConverters = this.resourceConvertersHolder.getTypeConverters();
-		for (XmlTypeConverter xmlConverter : xmlConverters.toArray(new XmlTypeConverter[xmlConverters.size()])) {
-			boolean contextTypeConverterFound = false;
-			for (EclipseLinkOrmTypeConverter contextTypeConverter : contextConvertersToRemove) {
-				if (contextTypeConverter.getXmlResource() == xmlConverter) {
-					moveTypeConverter_(resourceIndex, contextTypeConverter);
-					contextConvertersToRemove.remove(contextTypeConverter);
-					contextConvertersToUpdate.add(contextTypeConverter);
-					contextTypeConverterFound = true;
-					break;
-				}
-			}
-			if (!contextTypeConverterFound) {
-				addTypeConverter(this.buildTypeConverter(xmlConverter));
-			}
-			resourceIndex++;
-		}
-		for (EclipseLinkOrmTypeConverter contextTypeConverter : contextConvertersToRemove) {
-			removeTypeConverter_(contextTypeConverter);
-		}
-		//first handle adding/removing of the converters, then update the others last, 
-		//this causes less churn in the update process
-		for (EclipseLinkOrmTypeConverter contextTypeConverter : contextConvertersToUpdate) {
-			contextTypeConverter.update();
-		}	
-	}
-	
-	protected void updateStructConverters() {
-		Collection<EclipseLinkOrmStructConverter> contextConvertersToRemove = CollectionTools.collection(structConverters());
-		Collection<EclipseLinkOrmStructConverter> contextConvertersToUpdate = new ArrayList<EclipseLinkOrmStructConverter>();
-		int resourceIndex = 0;
-		
-		// make a copy of the XML converters (to prevent ConcurrentModificationException)
-		List<XmlStructConverter> xmlConverters = this.resourceConvertersHolder.getStructConverters();
-		for (XmlStructConverter resourceStructConverter : xmlConverters.toArray(new XmlStructConverter[xmlConverters.size()])) {
-			boolean contextStructConverterFound = false;
-			for (EclipseLinkOrmStructConverter contextStructConverter : contextConvertersToRemove) {
-				if (contextStructConverter.getXmlResource() == resourceStructConverter) {
-					moveStructConverter_(resourceIndex, contextStructConverter);
-					contextConvertersToRemove.remove(contextStructConverter);
-					contextConvertersToUpdate.add(contextStructConverter);
-					contextStructConverterFound = true;
-					break;
-				}
-			}
-			if (!contextStructConverterFound) {
-				addStructConverter(this.buildStructConverter(resourceStructConverter));
-			}
-			resourceIndex++;
-		}
-		for (EclipseLinkOrmStructConverter contextStructConverter : contextConvertersToRemove) {
-			removeStructConverter_(contextStructConverter);
-		}
-		//first handle adding/removing of the converters, then update the others last, 
-		//this causes less churn in the update process
-		for (EclipseLinkOrmStructConverter contextStructConverter : contextConvertersToUpdate) {
-			contextStructConverter.update();
-		}	
-	}
-
-	//************ validation ***************
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-	}
-
-
-	public TextRange getValidationTextRange() {
-		return this.resourceConvertersHolder.getValidationTextRange();
-	}
-
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmCustomConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmCustomConverter.java
deleted file mode 100644
index c055b16971..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmCustomConverter.java
+++ /dev/null
@@ -1,100 +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.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.XmlContextNode;
-import org.eclipse.jpt.eclipselink.core.context.CustomConverter;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverter;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkOrmCustomConverter extends EclipseLinkOrmConverter<XmlConverter>
-	implements CustomConverter
-{	
-	private String converterClass;
-	
-	
-	public EclipseLinkOrmCustomConverter(XmlContextNode parent) {
-		super(parent);
-	}
-	
-	
-	public String getType() {
-		return EclipseLinkConverter.CUSTOM_CONVERTER;
-	}
-
-	
-	// **************** converter class ****************************************
-	
-	public String getConverterClass() {
-		return this.converterClass;
-	}
-	
-	public void setConverterClass(String newConverterClass) {
-		String oldConverterClass = this.converterClass;
-		this.converterClass = newConverterClass;
-		this.resourceConverter.setClassName(newConverterClass);
-		firePropertyChanged(CONVERTER_CLASS_PROPERTY, oldConverterClass, newConverterClass);
-	}
-	
-	protected void setConverterClass_(String newConverterClass) {
-		String oldConverterClass = this.converterClass;
-		this.converterClass = newConverterClass;
-		firePropertyChanged(CONVERTER_CLASS_PROPERTY, oldConverterClass, newConverterClass);
-	}
-	
-	
-	// **************** resource interaction ***********************************
-	
-	@Override
-	protected void initialize(XmlConverter xmlResource) {
-		super.initialize(xmlResource);
-		this.converterClass = getResourceClassName();
-	}
-	
-	@Override
-	public void update() {
-		super.update();
-		setConverterClass_(getResourceClassName());
-	}
-	
-	protected String getResourceClassName() {
-		return this.resourceConverter.getClassName();
-	}
-	
-	
-	// **************** validation *********************************************
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		validateConverterClass(messages);
-	}
-//TODO validate converter class	
-	protected void validateConverterClass(List<IMessage> messages) {
-//		if (!getResourceConverter().implementsConverter()) {
-//			messages.add(
-//				DefaultEclipseLinkJpaValidationMessages.buildMessage(
-//					IMessage.HIGH_SEVERITY,
-//					EclipseLinkJpaValidationMessages.CONVERTER_CLASS_IMPLEMENTS_CONVERTER,
-//					new String[] {this.converterClass},
-//					this, 
-//					getConverterClassTextRange()
-//				)
-//			);
-//		}
-	}
-	
-//	public TextRange getConverterClassTextRange() {
-//		return getResourceConverter().getClassNameTextRange();
-//	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmCustomizer.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmCustomizer.java
deleted file mode 100644
index 02efc3c378..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmCustomizer.java
+++ /dev/null
@@ -1,115 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.Customizer;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlCustomizer;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlCustomizerHolder;
-
-public class EclipseLinkOrmCustomizer extends AbstractXmlContextNode
-	implements Customizer
-{
-	protected final XmlCustomizerHolder resource;
-	
-	protected String specifiedCustomizerClass;
-	
-	protected String defaultCustomizerClass;
-	
-	public EclipseLinkOrmCustomizer(OrmTypeMapping parent, XmlCustomizerHolder resource, Customizer javaCustomizer) {
-		super(parent);
-		this.resource = resource;
-		this.defaultCustomizerClass = getJavaCustomizerClass(javaCustomizer);
-		this.specifiedCustomizerClass = getResourceCustomizerClass();
-	}
-	
-	public String getCustomizerClass() {
-		return this.specifiedCustomizerClass == null ? this.defaultCustomizerClass : this.specifiedCustomizerClass;
-	}
-	
-	public String getDefaultCustomizerClass() {
-		return this.defaultCustomizerClass;
-	}
-	
-	protected void setDefaultCustomizerClass(String newDefaultCustomizerClass) {
-		String oldDefaultCustomizerClass = this.defaultCustomizerClass;
-		this.defaultCustomizerClass = newDefaultCustomizerClass;
-		firePropertyChanged(DEFAULT_CUSTOMIZER_CLASS_PROPERTY, oldDefaultCustomizerClass, newDefaultCustomizerClass);
-	}
-	
-	public String getSpecifiedCustomizerClass() {
-		return this.specifiedCustomizerClass;
-	}
-	
-	public void setSpecifiedCustomizerClass(String newCustomizerClass) {
-		String oldCustomizerClass = this.specifiedCustomizerClass;
-		this.specifiedCustomizerClass = newCustomizerClass;
-		if (oldCustomizerClass != newCustomizerClass) {
-			if (this.getResourceCustomizer() != null) {
-				this.getResourceCustomizer().setCustomizerClassName(newCustomizerClass);						
-				if (this.getResourceCustomizer().isUnset()) {
-					removeResourceCustomizer();
-				}
-			}
-			else if (newCustomizerClass != null) {
-				addResourceCustomizer();
-				getResourceCustomizer().setCustomizerClassName(newCustomizerClass);
-			}
-		}
-		firePropertyChanged(SPECIFIED_CUSTOMIZER_CLASS_PROPERTY, oldCustomizerClass, newCustomizerClass);
-	}
-	
-	protected void setSpecifiedCustomizerClass_(String newCustomizerClass) {
-		String oldCustomizerClass = this.specifiedCustomizerClass;
-		this.specifiedCustomizerClass = newCustomizerClass;
-		firePropertyChanged(SPECIFIED_CUSTOMIZER_CLASS_PROPERTY, oldCustomizerClass, newCustomizerClass);
-	}
-	
-	protected XmlCustomizer getResourceCustomizer() {
-		return this.resource.getCustomizer();
-	}
-	
-	protected void addResourceCustomizer() {
-		this.resource.setCustomizer(EclipseLinkOrmFactory.eINSTANCE.createXmlCustomizer());		
-	}
-	
-	protected void removeResourceCustomizer() {
-		this.resource.setCustomizer(null);
-	}
-	
-	
-	// **************** updating **************************************
-	
-	protected void update(Customizer javaCustomizer) {
-		setDefaultCustomizerClass(getJavaCustomizerClass(javaCustomizer));
-		setSpecifiedCustomizerClass_(getResourceCustomizerClass());
-	}
-	
-	protected String getJavaCustomizerClass(Customizer javaCustomizer) {
-		return (javaCustomizer == null) ? null : javaCustomizer.getCustomizerClass();
-	}
-	
-	protected String getResourceCustomizerClass() {
-		XmlCustomizer resource = getResourceCustomizer();
-		return (resource == null) ? null : resource.getCustomizerClassName();
-	}
-	
-	
-	// **************** validation **************************************
-	
-	public TextRange getValidationTextRange() {
-		XmlCustomizer resource = getResourceCustomizer();
-		return resource == null ? null : resource.getCustomizerClassNameTextRange();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddable.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddable.java
deleted file mode 100644
index 22811ef27b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddable.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmEmbeddable;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkEmbeddable;
-
-/**
- * 
- * 
- * 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 EclipseLinkOrmEmbeddable extends EclipseLinkEmbeddable, OrmEmbeddable
-{
-	ConverterHolder getConverterHolder();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableImpl.java
deleted file mode 100644
index 7a077e5c06..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableImpl.java
+++ /dev/null
@@ -1,90 +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.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.internal.context.orm.AbstractOrmEmbeddable;
-import org.eclipse.jpt.eclipselink.core.context.ChangeTracking;
-import org.eclipse.jpt.eclipselink.core.context.Customizer;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaEmbeddable;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlChangeTrackingHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertersHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlCustomizerHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddable;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkOrmEmbeddableImpl extends AbstractOrmEmbeddable
-	implements EclipseLinkOrmEmbeddable
-{
-	protected final EclipseLinkOrmCustomizer customizer;
-	
-	protected final EclipseLinkOrmChangeTracking changeTracking;
-	
-	protected final EclipseLinkOrmConverterHolder converterHolder;
-	
-	public EclipseLinkOrmEmbeddableImpl(OrmPersistentType parent, XmlEmbeddable resourceMapping) {
-		super(parent, resourceMapping);
-		this.customizer = new EclipseLinkOrmCustomizer(this, (XmlCustomizerHolder) this.resourceTypeMapping, getJavaCustomizer());
-		this.changeTracking = new EclipseLinkOrmChangeTracking(this, (XmlChangeTrackingHolder) this.resourceTypeMapping, getJavaChangeTracking());
-		this.converterHolder = new EclipseLinkOrmConverterHolder(this, (XmlConvertersHolder) this.resourceTypeMapping); 
-	}
-
-	public Customizer getCustomizer() {
-		return this.customizer;
-	}
-	
-	public ChangeTracking getChangeTracking() {
-		return this.changeTracking;
-	}
-
-	public ConverterHolder getConverterHolder() {
-		return this.converterHolder;
-	}
-
-	
-	
-	// **************** resource-context interaction ***************************
-
-	@Override
-	public void update() {
-		super.update();
-		this.customizer.update(getJavaCustomizer());
-		this.changeTracking.update(getJavaChangeTracking());
-		this.converterHolder.update(); 
-	}
-	
-	@Override
-	protected EclipseLinkJavaEmbeddable getJavaEmbeddableForDefaults() {
-		return (EclipseLinkJavaEmbeddable) super.getJavaEmbeddableForDefaults();
-	}
-	
-	
-	protected Customizer getJavaCustomizer() {
-		EclipseLinkJavaEmbeddable javaEmbeddable = getJavaEmbeddableForDefaults();
-		return (javaEmbeddable == null) ? null : javaEmbeddable.getCustomizer();
-	}
-	
-	protected ChangeTracking getJavaChangeTracking() {
-		EclipseLinkJavaEmbeddable javaEmbeddable = getJavaEmbeddableForDefaults();
-		return (javaEmbeddable == null) ? null : javaEmbeddable.getChangeTracking();
-	}
-	
-	
-	// **************** validation **************************************
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		this.customizer.validate(messages, reporter);
-		this.changeTracking.validate(messages, reporter);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableProvider.java
deleted file mode 100644
index 52b570bc82..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableProvider.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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMappingProvider;
-import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddable;
-
-/**
- * EclipseLink ORM Embeddable provider
- * Allow for EclipseLink extensions to Embeddable
- */
-public class EclipseLinkOrmEmbeddableProvider
-	implements OrmTypeMappingProvider
-{
-
-	// singleton
-	private static final OrmTypeMappingProvider INSTANCE = new EclipseLinkOrmEmbeddableProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmTypeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkOrmEmbeddableProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-	
-	public XmlTypeMapping buildResourceMapping() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlEmbeddable();
-	}
-
-	public OrmTypeMapping buildMapping(OrmPersistentType parent, XmlTypeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkOrmEmbeddable(parent, (XmlEmbeddable) resourceMapping);
-	}
-
-	public String getKey() {
-		return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddedIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddedIdMappingProvider.java
deleted file mode 100644
index c94f416900..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddedIdMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaEmbeddedIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedId;
-
-public class EclipseLinkOrmEmbeddedIdMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLinkOrmEmbeddedIdMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkOrmEmbeddedIdMappingProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlEmbeddedIdImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkOrmEmbeddedIdMapping(parent, (XmlEmbeddedId) resourceMapping);
-	}
-
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkVirtualXmlEmbeddedId(ormTypeMapping, (JavaEmbeddedIdMapping) javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddedMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddedMappingProvider.java
deleted file mode 100644
index 4098dc9100..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddedMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaEmbeddedMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded;
-
-public class EclipseLinkOrmEmbeddedMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLinkOrmEmbeddedMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkOrmEmbeddedMappingProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlEmbeddedImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkOrmEmbeddedMapping(parent, (XmlEmbedded) resourceMapping);
-	}
-
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkVirtualXmlEmbedded(ormTypeMapping, (JavaEmbeddedMapping) javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEntity.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEntity.java
deleted file mode 100644
index 43fafde3e3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEntity.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmEntity;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkEntity;
-
-public interface EclipseLinkOrmEntity extends EclipseLinkEntity, OrmEntity
-{
-	ConverterHolder getConverterHolder();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEntityImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEntityImpl.java
deleted file mode 100644
index 6eac4be5d1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEntityImpl.java
+++ /dev/null
@@ -1,121 +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.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.internal.context.orm.AbstractOrmEntity;
-import org.eclipse.jpt.eclipselink.core.context.Caching;
-import org.eclipse.jpt.eclipselink.core.context.ChangeTracking;
-import org.eclipse.jpt.eclipselink.core.context.Customizer;
-import org.eclipse.jpt.eclipselink.core.context.ReadOnly;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaEntity;
-import org.eclipse.jpt.eclipselink.core.context.java.JavaCaching;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlCacheHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlChangeTrackingHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertersHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlCustomizerHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlReadOnly;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkOrmEntityImpl extends AbstractOrmEntity
-	implements EclipseLinkOrmEntity
-{
-	protected final EclipseLinkOrmReadOnly readOnly;
-	
-	protected final EclipseLinkOrmCustomizer customizer;
-	
-	protected final EclipseLinkOrmChangeTracking changeTracking;
-	
-	protected final EclipseLinkOrmCaching caching;
-	
-	protected final EclipseLinkOrmConverterHolder converterHolder;
-	
-	
-	public EclipseLinkOrmEntityImpl(OrmPersistentType parent, XmlEntity resourceMapping) {
-		super(parent, resourceMapping);
-		this.readOnly = new EclipseLinkOrmReadOnly(this, (XmlReadOnly) this.resourceTypeMapping, getJavaReadOnly());
-		this.customizer = new EclipseLinkOrmCustomizer(this, (XmlCustomizerHolder) this.resourceTypeMapping, getJavaCustomizer());
-		this.changeTracking = new EclipseLinkOrmChangeTracking(this, (XmlChangeTrackingHolder) this.resourceTypeMapping, getJavaChangeTracking());
-		this.caching = new EclipseLinkOrmCaching(this, (XmlCacheHolder) this.resourceTypeMapping, getJavaCaching());
-		this.converterHolder = new EclipseLinkOrmConverterHolder(this, (XmlConvertersHolder) this.resourceTypeMapping);
-	}
-	
-	public Caching getCaching() {
-		return this.caching;
-	}
-
-	public Customizer getCustomizer() {
-		return this.customizer;
-	}
-
-	public ChangeTracking getChangeTracking() {
-		return this.changeTracking;
-	}
-
-	public EclipseLinkOrmReadOnly getReadOnly() {
-		return this.readOnly;
-	}
-	
-	public ConverterHolder getConverterHolder() {
-		return this.converterHolder;
-	}
-	
-	// **************** resource-context interaction ***************************
-	
-	@Override
-	public void update() {
-		super.update();
-		this.readOnly.update(getJavaReadOnly());
-		this.customizer.update(getJavaCustomizer());
-		this.changeTracking.update(getJavaChangeTracking());
-		this.caching.update(getJavaCaching());
-		this.converterHolder.update(); 
-	}
-	
-	@Override
-	protected EclipseLinkJavaEntity getJavaEntityForDefaults() {
-		return (EclipseLinkJavaEntity) super.getJavaEntityForDefaults();
-	}
-	
-	protected ReadOnly getJavaReadOnly() {
-		EclipseLinkJavaEntity javaEntity = getJavaEntityForDefaults();
-		return (javaEntity == null) ? null : javaEntity.getReadOnly();
-	}
-	
-	protected Customizer getJavaCustomizer() {
-		EclipseLinkJavaEntity javaEntity = getJavaEntityForDefaults();
-		return (javaEntity == null) ? null : javaEntity.getCustomizer();
-	}
-	
-	protected ChangeTracking getJavaChangeTracking() {
-		EclipseLinkJavaEntity javaEntity = getJavaEntityForDefaults();
-		return (javaEntity == null) ? null : javaEntity.getChangeTracking();
-	}
-	
-	protected JavaCaching getJavaCaching() {
-		EclipseLinkJavaEntity javaEntity = getJavaEntityForDefaults();
-		return (javaEntity == null) ? null : javaEntity.getCaching();
-	}
-	
-	
-	// **************** validation **************************************
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		this.readOnly.validate(messages, reporter);
-		this.customizer.validate(messages, reporter);
-		this.changeTracking.validate(messages, reporter);
-		this.caching.validate(messages, reporter);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEntityProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEntityProvider.java
deleted file mode 100644
index f9e94839c9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEntityProvider.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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMappingProvider;
-import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity;
-
-/**
- * EclipseLink ORM Entity provider
- * Allow for EclipseLink extensions to Entity
- */
-public class EclipseLinkOrmEntityProvider
-	implements OrmTypeMappingProvider
-{
-	// singleton
-	private static final OrmTypeMappingProvider INSTANCE = new EclipseLinkOrmEntityProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmTypeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkOrmEntityProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-	
-	public XmlTypeMapping buildResourceMapping() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlEntity();
-	}
-
-	public OrmTypeMapping buildMapping(OrmPersistentType parent, XmlTypeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkOrmEntity(parent, (XmlEntity) resourceMapping);
-	}
-
-	public String getKey() {
-		return MappingKeys.ENTITY_TYPE_MAPPING_KEY;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmExpiryTimeOfDay.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmExpiryTimeOfDay.java
deleted file mode 100644
index 490730e46b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmExpiryTimeOfDay.java
+++ /dev/null
@@ -1,137 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.ExpiryTimeOfDay;
-import org.eclipse.jpt.eclipselink.core.context.orm.OrmCaching;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTimeOfDay;
-
-public class EclipseLinkOrmExpiryTimeOfDay extends AbstractXmlContextNode
-	implements ExpiryTimeOfDay
-{
-	
-	protected Integer hour;
-	protected Integer minute;
-	protected Integer second;
-	protected Integer millisecond;
-	
-	protected XmlTimeOfDay resourceTimeOfDay;
-	
-	public EclipseLinkOrmExpiryTimeOfDay(OrmCaching parent) {
-		super(parent);
-	}
-	
-	
-	public Integer getHour() {
-		return this.hour;
-	}
-
-	public void setHour(Integer newHour) {
-		Integer oldHour = this.hour;
-		this.hour = newHour;
-		this.resourceTimeOfDay.setHour(newHour);
-		firePropertyChanged(HOUR_PROPERTY, oldHour, newHour);
-	}
-
-	protected void setHour_(Integer newHour) {
-		Integer oldHour = this.hour;
-		this.hour = newHour;
-		firePropertyChanged(HOUR_PROPERTY, oldHour, newHour);
-	}
-
-	public Integer getMinute() {
-		return this.minute;
-	}
-
-	public void setMinute(Integer newMinute) {
-		Integer oldMinute = this.minute;
-		this.minute = newMinute;
-		this.resourceTimeOfDay.setMinute(newMinute);
-		firePropertyChanged(MINUTE_PROPERTY, oldMinute, newMinute);
-	}
-
-	protected void setMinute_(Integer newMinute) {
-		Integer oldMinute = this.minute;
-		this.minute = newMinute;
-		firePropertyChanged(MINUTE_PROPERTY, oldMinute, newMinute);
-	}
-
-	public Integer getSecond() {
-		return this.second;
-	}
-
-	public void setSecond(Integer newSecond) {
-		Integer oldSecond = this.second;
-		this.second = newSecond;
-		this.resourceTimeOfDay.setSecond(newSecond);
-		firePropertyChanged(SECOND_PROPERTY, oldSecond, newSecond);
-	}
-	
-	protected void setSecond_(Integer newSecond) {
-		Integer oldSecond = this.second;
-		this.second = newSecond;
-		firePropertyChanged(SECOND_PROPERTY, oldSecond, newSecond);
-	}
-
-	public Integer getMillisecond() {
-		return this.millisecond;
-	}
-
-	public void setMillisecond(Integer newMillisecond) {
-		Integer oldMillisecond = this.millisecond;
-		this.millisecond = newMillisecond;
-		this.resourceTimeOfDay.setMillisecond(newMillisecond);
-		firePropertyChanged(MILLISECOND_PROPERTY, oldMillisecond, newMillisecond);
-	}
-	
-	protected void setMillisecond_(Integer newMillisecond) {
-		Integer oldMillisecond = this.millisecond;
-		this.millisecond = newMillisecond;
-		firePropertyChanged(MILLISECOND_PROPERTY, oldMillisecond, newMillisecond);
-	}
-
-	public TextRange getValidationTextRange() {
-		return this.resourceTimeOfDay.getValidationTextRange();
-	}
-	
-	public void initialize(XmlTimeOfDay resource) {
-		this.resourceTimeOfDay = resource;
-		this.hour = getResourceHour();
-		this.minute = getResourceMinute();
-		this.second = getResourceSecond();
-		this.millisecond = getResourceMillisecond();
-	}
-	
-	public void update(XmlTimeOfDay resource) {
-		this.resourceTimeOfDay = resource;
-		this.setHour_(getResourceHour());
-		this.setMinute_(getResourceMinute());
-		this.setSecond_(getResourceSecond());
-		this.setMillisecond_(getResourceMillisecond());
-	}
-	
-	protected Integer getResourceHour() {
-		return this.resourceTimeOfDay.getHour();
-	}
-	
-	protected Integer getResourceMinute() {
-		return this.resourceTimeOfDay.getMinute();
-	}
-	
-	protected Integer getResourceSecond() {
-		return this.resourceTimeOfDay.getSecond();
-	}
-	
-	protected Integer getResourceMillisecond() {
-		return this.resourceTimeOfDay.getMillisecond();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMapping.java
deleted file mode 100644
index 0757317df9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMapping.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.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.orm.OrmConverter;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmIdMapping;
-import org.eclipse.jpt.eclipselink.core.context.Convert;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkIdMapping;
-import org.eclipse.jpt.eclipselink.core.context.Mutable;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlId;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlMutable;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkOrmIdMapping<T extends XmlId> 
-	extends GenericOrmIdMapping<T>
-	implements EclipseLinkIdMapping
-{
-	protected EclipseLinkOrmMutable mutable;
-	
-	
-	public EclipseLinkOrmIdMapping(OrmPersistentAttribute parent, T resourceMapping) {
-		super(parent, resourceMapping);
-		this.mutable = new EclipseLinkOrmMutable(this, (XmlMutable) this.resourceAttributeMapping);
-	}
-	
-	
-	public Mutable getMutable() {
-		return this.mutable;
-	}
-
-	@Override
-	protected OrmConverter buildSpecifiedConverter(String converterType) {
-		OrmConverter ormConverter = super.buildSpecifiedConverter(converterType);
-		if (ormConverter != null) {
-			return ormConverter;
-		}
-		if (converterType == Convert.ECLIPSE_LINK_CONVERTER) {
-			return new EclipseLinkOrmConvert(this, (XmlId) this.resourceAttributeMapping);
-		}
-		return null;
-	}
-	
-	@Override
-	protected String getResourceConverterType() {
-		//check @Convert first, this is the order that EclipseLink searches
-		if (((XmlId) this.resourceAttributeMapping).getConvert() != null) {
-			return Convert.ECLIPSE_LINK_CONVERTER;
-		}
-		return super.getResourceConverterType();
-	}
-	
-	// **************** resource-context interaction ***************************
-	
-	@Override
-	public void update() {
-		super.update();
-		this.mutable.update();
-	}
-	
-	
-	// **************** 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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMappingProvider.java
deleted file mode 100644
index 964cc6fbc3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlId;
-
-public class EclipseLinkOrmIdMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLinkOrmIdMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkOrmIdMappingProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlIdImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkOrmIdMapping(parent, (XmlId) resourceMapping);
-	}
-
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkVirtualXmlId(ormTypeMapping, (JavaIdMapping) javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmJoinFetch.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmJoinFetch.java
deleted file mode 100644
index 1ee0b4405c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmJoinFetch.java
+++ /dev/null
@@ -1,68 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetch;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetchType;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetch;
-
-public class EclipseLinkOrmJoinFetch extends AbstractXmlContextNode
-	implements JoinFetch
-{
-	protected XmlJoinFetch resource;
-	
-	protected JoinFetchType joinFetchValue;
-	
-	
-	public EclipseLinkOrmJoinFetch(OrmAttributeMapping parent, XmlJoinFetch resource) {
-		super(parent);
-		this.resource = resource;
-		this.joinFetchValue = getResourceJoinFetch();
-	}
-	
-	
-	public JoinFetchType getValue() {
-		return this.joinFetchValue;
-	}
-	
-	public void setValue(JoinFetchType newJoinFetchValue) {
-		JoinFetchType oldJoinFetchValue = this.joinFetchValue;
-		this.joinFetchValue = newJoinFetchValue;
-		this.resource.setJoinFetch(JoinFetchType.toOrmResourceModel(newJoinFetchValue));
-		firePropertyChanged(VALUE_PROPERTY, oldJoinFetchValue, newJoinFetchValue);
-	}
-	
-	protected void setValue_(JoinFetchType newJoinFetchValue) {
-		JoinFetchType oldJoinFetchValue = this.joinFetchValue;
-		this.joinFetchValue = newJoinFetchValue;
-		firePropertyChanged(VALUE_PROPERTY, oldJoinFetchValue, newJoinFetchValue);
-	}
-	
-	
-	// **************** initialize/update **************************************
-	
-	protected void update() {
-		setValue_(getResourceJoinFetch());
-	}
-	
-	protected JoinFetchType getResourceJoinFetch() {
-		return JoinFetchType.fromOrmResourceModel(this.resource.getJoinFetch());
-	}
-	
-	// **************** validation **************************************
-	
-	public TextRange getValidationTextRange() {
-		return this.resource.getJoinFetchTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToManyMapping.java
deleted file mode 100644
index 59ef5f14c7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToManyMapping.java
+++ /dev/null
@@ -1,57 +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.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmManyToManyMapping;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkRelationshipMapping;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetch;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetch;
-import org.eclipse.jpt.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 EclipseLinkOrmManyToManyMapping<T extends XmlManyToMany>
-	extends GenericOrmManyToManyMapping<T>
-	implements EclipseLinkRelationshipMapping
-{
-	protected EclipseLinkOrmJoinFetch joinFetch;
-	
-	
-	public EclipseLinkOrmManyToManyMapping(OrmPersistentAttribute parent, T resourceMapping) {
-		super(parent, resourceMapping);
-		this.joinFetch = new EclipseLinkOrmJoinFetch(this, (XmlJoinFetch) this.resourceAttributeMapping);
-	}
-	
-	
-	public JoinFetch getJoinFetch() {
-		return this.joinFetch;
-	}
-	
-	
-	// **************** resource-context interaction ***************************
-	
-	@Override
-	public void update() {
-		super.update();
-		this.joinFetch.update();
-	}
-	
-	
-	// **************** validation **************************************
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		// TODO - private owned, join fetch validation
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToManyMappingProvider.java
deleted file mode 100644
index 9fdc4bea01..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToManyMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaManyToManyMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany;
-
-public class EclipseLinkOrmManyToManyMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLinkOrmManyToManyMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkOrmManyToManyMappingProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlManyToManyImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkOrmManyToManyMapping(parent, (XmlManyToMany) resourceMapping);
-	}
-
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkVirtualXmlManyToMany(ormTypeMapping, (JavaManyToManyMapping) javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToOneMapping.java
deleted file mode 100644
index 0a26017eba..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToOneMapping.java
+++ /dev/null
@@ -1,57 +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.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmManyToOneMapping;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkRelationshipMapping;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetch;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetch;
-import org.eclipse.jpt.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 EclipseLinkOrmManyToOneMapping<T extends XmlManyToOne>
-	extends GenericOrmManyToOneMapping<T>
-	implements EclipseLinkRelationshipMapping
-{
-	protected EclipseLinkOrmJoinFetch joinFetch;
-	
-	
-	public EclipseLinkOrmManyToOneMapping(OrmPersistentAttribute parent, T resourceMapping) {
-		super(parent, resourceMapping);
-		this.joinFetch = new EclipseLinkOrmJoinFetch(this, (XmlJoinFetch) this.resourceAttributeMapping);
-	}
-	
-	
-	public JoinFetch getJoinFetch() {
-		return this.joinFetch;
-	}
-	
-	
-	// **************** resource-context interaction ***************************
-	
-	@Override
-	public void update() {
-		super.update();
-		this.joinFetch.update();
-	}
-	
-	
-	// **************** validation **************************************
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		// TODO - private owned, join fetch validation
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToOneMappingProvider.java
deleted file mode 100644
index ac27afaf9b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToOneMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaManyToOneMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne;
-
-public class EclipseLinkOrmManyToOneMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLinkOrmManyToOneMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkOrmManyToOneMappingProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlManyToOneImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkOrmManyToOneMapping(parent, (XmlManyToOne) resourceMapping);
-	}
-
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkVirtualXmlManyToOne(ormTypeMapping, (JavaManyToOneMapping) javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmMappedSuperclass.java
deleted file mode 100644
index 09950fc8e3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmMappedSuperclass.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmMappedSuperclass;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkMappedSuperclass;
-
-public interface EclipseLinkOrmMappedSuperclass extends EclipseLinkMappedSuperclass, OrmMappedSuperclass
-{
-	ConverterHolder getConverterHolder();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmMappedSuperclassImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmMappedSuperclassImpl.java
deleted file mode 100644
index b06d09575c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmMappedSuperclassImpl.java
+++ /dev/null
@@ -1,122 +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.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.internal.context.orm.AbstractOrmMappedSuperclass;
-import org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass;
-import org.eclipse.jpt.eclipselink.core.context.Caching;
-import org.eclipse.jpt.eclipselink.core.context.ChangeTracking;
-import org.eclipse.jpt.eclipselink.core.context.Customizer;
-import org.eclipse.jpt.eclipselink.core.context.ReadOnly;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaMappedSuperclass;
-import org.eclipse.jpt.eclipselink.core.context.java.JavaCaching;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlCacheHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlChangeTrackingHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertersHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlCustomizerHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlReadOnly;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkOrmMappedSuperclassImpl extends AbstractOrmMappedSuperclass
-	implements EclipseLinkOrmMappedSuperclass
-{
-	protected final EclipseLinkOrmReadOnly readOnly;
-	
-	protected final EclipseLinkOrmCustomizer customizer;
-	
-	protected final EclipseLinkOrmChangeTracking changeTracking;
-	
-	protected final EclipseLinkOrmCaching caching;
-	
-	protected final EclipseLinkOrmConverterHolder converterHolder;
-	
-	
-	public EclipseLinkOrmMappedSuperclassImpl(OrmPersistentType parent, XmlMappedSuperclass resourceMapping) {
-		super(parent, resourceMapping);
-		this.readOnly = new EclipseLinkOrmReadOnly(this, (XmlReadOnly) this.resourceTypeMapping, getJavaReadOnly());
-		this.customizer = new EclipseLinkOrmCustomizer(this, (XmlCustomizerHolder) this.resourceTypeMapping, getJavaCustomizer());
-		this.changeTracking = new EclipseLinkOrmChangeTracking(this, (XmlChangeTrackingHolder) this.resourceTypeMapping, getJavaChangeTracking());
-		this.caching = new EclipseLinkOrmCaching(this, (XmlCacheHolder) this.resourceTypeMapping, getJavaCaching());
-		this.converterHolder = new EclipseLinkOrmConverterHolder(this, (XmlConvertersHolder) this.resourceTypeMapping);
-	}
-	
-	public Caching getCaching() {
-		return this.caching;
-	}
-
-	public Customizer getCustomizer() {
-		return this.customizer;
-	}
-
-	public ChangeTracking getChangeTracking() {
-		return this.changeTracking;
-	}
-
-	public EclipseLinkOrmReadOnly getReadOnly() {
-		return this.readOnly;
-	}
-	
-	public ConverterHolder getConverterHolder() {
-		return this.converterHolder;
-	}
-	
-	
-	// **************** resource-context interaction ***************************
-	
-	@Override
-	public void update() {
-		super.update();
-		this.readOnly.update(getJavaReadOnly());
-		this.customizer.update(getJavaCustomizer());
-		this.changeTracking.update(getJavaChangeTracking());
-		this.caching.update(getJavaCaching());
-		this.converterHolder.update(); 
-	}
-	
-	@Override
-	protected EclipseLinkJavaMappedSuperclass getJavaMappedSuperclassForDefaults() {
-		return (EclipseLinkJavaMappedSuperclass) super.getJavaMappedSuperclassForDefaults();
-	}
-	
-	protected ReadOnly getJavaReadOnly() {
-		EclipseLinkJavaMappedSuperclass javaMappedSuperclass = getJavaMappedSuperclassForDefaults();
-		return (javaMappedSuperclass == null) ? null : javaMappedSuperclass.getReadOnly();
-	}
-	
-	protected Customizer getJavaCustomizer() {
-		EclipseLinkJavaMappedSuperclass javaMappedSuperclass = getJavaMappedSuperclassForDefaults();
-		return (javaMappedSuperclass == null) ? null : javaMappedSuperclass.getCustomizer();
-	}
-	
-	protected ChangeTracking getJavaChangeTracking() {
-		EclipseLinkJavaMappedSuperclass javaMappedSuperclass = getJavaMappedSuperclassForDefaults();
-		return (javaMappedSuperclass == null) ? null : javaMappedSuperclass.getChangeTracking();
-	}
-	
-	protected JavaCaching getJavaCaching() {
-		EclipseLinkJavaMappedSuperclass javaMappedSuperclass = getJavaMappedSuperclassForDefaults();
-		return (javaMappedSuperclass == null) ? null : javaMappedSuperclass.getCaching();
-	}
-	
-	
-	// **************** validation **************************************
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		this.readOnly.validate(messages, reporter);
-		this.customizer.validate(messages, reporter);
-		this.changeTracking.validate(messages, reporter);
-		this.caching.validate(messages, reporter);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmMappedSuperclassProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmMappedSuperclassProvider.java
deleted file mode 100644
index 9081ecdc3c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmMappedSuperclassProvider.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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMappingProvider;
-import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlMappedSuperclass;
-
-/**
- * EclipseLink ORM Mapped Superclass provider
- * Allow for EclipseLink extensions to Mapped Superclass
- */
-public class EclipseLinkOrmMappedSuperclassProvider
-	implements OrmTypeMappingProvider
-{
-	// singleton
-	private static final OrmTypeMappingProvider INSTANCE = new EclipseLinkOrmMappedSuperclassProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmTypeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkOrmMappedSuperclassProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-	
-	public XmlTypeMapping buildResourceMapping() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlMappedSuperclass();
-	}
-
-	public OrmTypeMapping buildMapping(OrmPersistentType parent, XmlTypeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkOrmMappedSuperclass(parent, (XmlMappedSuperclass) resourceMapping);
-	}
-
-	public String getKey() {
-		return MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmMutable.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmMutable.java
deleted file mode 100644
index 9ea6c80138..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmMutable.java
+++ /dev/null
@@ -1,109 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.Mutable;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.AbstractEclipseLinkJavaPersistentAttribute;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlMutable;
-
-public class EclipseLinkOrmMutable extends AbstractXmlContextNode 
-	implements Mutable
-{
-	protected final XmlMutable resource;
-	
-	protected boolean defaultMutable;
-	
-	protected Boolean specifiedMutable;
-	
-	
-	public EclipseLinkOrmMutable(OrmAttributeMapping parent, XmlMutable resource) {
-		super(parent);
-		this.resource = resource;
-		this.defaultMutable = this.calculateDefaultMutable();
-		this.specifiedMutable = this.getResourceMutable();
-	}
-		
-	@Override
-	public EclipseLinkPersistenceUnit getPersistenceUnit() {
-		return (EclipseLinkPersistenceUnit) super.getPersistenceUnit();
-	}
-	
-	protected OrmAttributeMapping getAttributeMapping() {
-		return (OrmAttributeMapping) getParent();
-	}
-	
-	public boolean isMutable() {
-		return (this.specifiedMutable != null) ? this.specifiedMutable.booleanValue() : this.defaultMutable;
-	}
-	
-	public boolean isDefaultMutable() {
-		return this.defaultMutable;
-	}
-	
-	protected void setDefaultMutable(boolean newDefaultMutable) {
-		boolean oldDefaultMutable = this.defaultMutable;
-		this.defaultMutable = newDefaultMutable;
-		firePropertyChanged(DEFAULT_MUTABLE_PROPERTY, oldDefaultMutable, newDefaultMutable);
-	}
-	
-	public Boolean getSpecifiedMutable() {
-		return this.specifiedMutable;
-	}
-	
-	public void setSpecifiedMutable(Boolean newSpecifiedMutable) {
-		Boolean oldSpecifiedMutable = this.specifiedMutable;
-		this.specifiedMutable = newSpecifiedMutable;
-		this.resource.setMutable(newSpecifiedMutable);
-		firePropertyChanged(SPECIFIED_MUTABLE_PROPERTY, oldSpecifiedMutable, newSpecifiedMutable);
-	}
-	
-	protected void setSpecifiedMutable_(Boolean newSpecifiedMutable) {
-		Boolean oldSpecifiedMutable = this.specifiedMutable;
-		this.specifiedMutable = newSpecifiedMutable;
-		firePropertyChanged(SPECIFIED_MUTABLE_PROPERTY, oldSpecifiedMutable, newSpecifiedMutable);
-	}
-	
-	
-	// **************** initialize/update **************************************
-		
-	protected void update() {
-		setDefaultMutable(this.calculateDefaultMutable());
-		setSpecifiedMutable_(this.getResourceMutable());
-	}
-	
-	protected Boolean getResourceMutable() {
-		return this.resource.getMutable();
-	}
-	
-	protected boolean calculateDefaultMutable() {
-		AbstractEclipseLinkJavaPersistentAttribute javaAttribute = (AbstractEclipseLinkJavaPersistentAttribute) this.getAttributeMapping().getPersistentAttribute().getJavaPersistentAttribute();
-		if (javaAttribute == null) {
-			return false;
-		}
-		if (javaAttribute.typeIsDateOrCalendar()) {
-			Boolean persistenceUnitDefaultMutable = getPersistenceUnit().getOptions().getTemporalMutable();
-			return persistenceUnitDefaultMutable == null ? false : persistenceUnitDefaultMutable.booleanValue();
-		}
-		return javaAttribute.typeIsSerializable();
-	}
-	
-	
-	// **************** validation **************************************
-	
-	public TextRange getValidationTextRange() {
-		return this.resource.getMutableTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java
deleted file mode 100644
index f5e49a6dac..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java
+++ /dev/null
@@ -1,245 +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.eclipselink.core.internal.context.orm;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.XmlContextNode;
-import org.eclipse.jpt.eclipselink.core.context.ConversionValue;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.eclipselink.core.context.ObjectTypeConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneIterator;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationListIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkOrmObjectTypeConverter extends EclipseLinkOrmConverter<XmlObjectTypeConverter>
-	implements ObjectTypeConverter
-{	
-	private String dataType;
-	
-	private String objectType;
-	
-	private final List<EclipseLinkOrmConversionValue> conversionValues;
-	
-	private String defaultObjectValue;
-	
-	
-	public EclipseLinkOrmObjectTypeConverter(XmlContextNode parent) {
-		super(parent);
-		this.conversionValues = new ArrayList<EclipseLinkOrmConversionValue>();
-	}
-	
-	public String getType() {
-		return EclipseLinkConverter.OBJECT_TYPE_CONVERTER;
-	}	
-	
-	// **************** data type **********************************************
-	
-	public String getDataType() {
-		return this.dataType;
-	}
-	
-	public void setDataType(String newDataType) {
-		String oldDataType = this.dataType;
-		this.dataType = newDataType;
-		getXmlResource().setDataType(newDataType);
-		firePropertyChanged(DATA_TYPE_PROPERTY, oldDataType, newDataType);
-	}
-	
-	protected void setDataType_(String newDataType) {
-		String oldDataType = this.dataType;
-		this.dataType = newDataType;
-		firePropertyChanged(DATA_TYPE_PROPERTY, oldDataType, newDataType);
-	}
-	
-	
-	// **************** object type ********************************************
-	
-	public String getObjectType() {
-		return this.objectType;
-	}
-	
-	public void setObjectType(String newObjectType) {
-		String oldObjectType = this.objectType;
-		this.objectType = newObjectType;
-		getXmlResource().setObjectType(newObjectType);
-		firePropertyChanged(OBJECT_TYPE_PROPERTY, oldObjectType, newObjectType);
-	}
-	
-	protected void setObjectType_(String newObjectType) {
-		String oldObjectType = this.objectType;
-		this.objectType = newObjectType;
-		firePropertyChanged(OBJECT_TYPE_PROPERTY, oldObjectType, newObjectType);
-	}
-	
-	
-	// **************** conversion values **************************************
-	
-	public ListIterator<EclipseLinkOrmConversionValue> conversionValues() {
-		return new CloneListIterator<EclipseLinkOrmConversionValue>(this.conversionValues);
-	}
-	
-	public int conversionValuesSize() {
-		return this.conversionValues.size();
-	}
-	
-	public EclipseLinkOrmConversionValue addConversionValue(int index) {
-		XmlConversionValue resourceConversionValue = EclipseLinkOrmFactory.eINSTANCE.createXmlConversionValueImpl();
-		EclipseLinkOrmConversionValue contextConversionValue = buildConversionValue(resourceConversionValue);
-		this.conversionValues.add(index, contextConversionValue);
-		getXmlResource().getConversionValues().add(index, resourceConversionValue);
-		fireItemAdded(CONVERSION_VALUES_LIST, index, contextConversionValue);
-		return contextConversionValue;
-	}
-	
-	public EclipseLinkOrmConversionValue addConversionValue() {
-		return this.addConversionValue(this.conversionValues.size());
-	}
-	
-	protected void addConversionValue(int index, EclipseLinkOrmConversionValue conversionValue) {
-		addItemToList(index, conversionValue, this.conversionValues, CONVERSION_VALUES_LIST);
-	}
-	
-	protected void addConversionValue(EclipseLinkOrmConversionValue conversionValue) {
-		this.addConversionValue(this.conversionValues.size(), conversionValue);
-	}
-	
-	public void removeConversionValue(int index) {
-		EclipseLinkOrmConversionValue removedJoinColumn = this.conversionValues.remove(index);
-		getXmlResource().getConversionValues().remove(index);
-		fireItemRemoved(CONVERSION_VALUES_LIST, index, removedJoinColumn);
-	}
-	
-	public void removeConversionValue(ConversionValue conversionValue) {
-		this.removeConversionValue(this.conversionValues.indexOf(conversionValue));
-	}
-	
-	protected void removeConversionValue_(ConversionValue conversionValue) {
-		removeItemFromList(conversionValue, this.conversionValues, CONVERSION_VALUES_LIST);
-	}
-	
-	public void moveConversionValue(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.conversionValues, targetIndex, sourceIndex);
-		getXmlResource().getConversionValues().move(targetIndex, sourceIndex);
-		fireItemMoved(CONVERSION_VALUES_LIST, targetIndex, sourceIndex);		
-	}
-	
-	public ListIterator<String> dataValues() {
-		return new TransformationListIterator<EclipseLinkOrmConversionValue, String>(conversionValues()) {
-			@Override
-			protected String transform(EclipseLinkOrmConversionValue next) {
-				return next.getDataValue();
-			}
-		};
-	}
-	
-	
-	// **************** default object value ***********************************
-	
-	public String getDefaultObjectValue() {
-		return this.defaultObjectValue;
-	}
-	
-	public void setDefaultObjectValue(String newDefaultObjectValue) {
-		String oldDefaultObjectValue = this.defaultObjectValue;
-		this.defaultObjectValue = newDefaultObjectValue;
-		getXmlResource().setDefaultObjectValue(newDefaultObjectValue);
-		firePropertyChanged(DEFAULT_OBJECT_VALUE_PROPERTY, oldDefaultObjectValue, newDefaultObjectValue);
-	}
-	
-	protected void setDefaultObjectValue_(String newDefaultObjectValue) {
-		String oldDefaultObjectValue = this.defaultObjectValue;
-		this.defaultObjectValue = newDefaultObjectValue;
-		firePropertyChanged(DEFAULT_OBJECT_VALUE_PROPERTY, oldDefaultObjectValue, newDefaultObjectValue);
-	}
-	
-	
-	// **************** resource interaction ***********************************
-	
-	@Override
-	protected void initialize(XmlObjectTypeConverter xmlResource) {
-		super.initialize(xmlResource);
-		this.dataType = this.getResourceDataType();
-		this.objectType = this.getResourceObjectType();
-		this.defaultObjectValue = this.getResourceDefaultObjectValue();
-		this.initializeConversionValues();
-	}
-	
-	protected void initializeConversionValues() {	
-		for (XmlConversionValue resourceConversionValue : getXmlResource().getConversionValues()) {
-			this.conversionValues.add(buildConversionValue(resourceConversionValue));
-		}
-	}
-	
-	@Override
-	public void update() {
-		super.update();
-		setDataType_(getResourceDataType());
-		setObjectType_(getResourceObjectType());
-		setDefaultObjectValue_(getResourceDefaultObjectValue());
-		updateConversionValues();
-	}
-	
-	protected void updateConversionValues( ) {
-		// make a copy of the XML conversion values (to prevent ConcurrentModificationException)
-		Iterator<XmlConversionValue> xmlConversionValues = new CloneIterator<XmlConversionValue>(this.getXmlResource().getConversionValues());
-		
-		for (Iterator<EclipseLinkOrmConversionValue> contextConversionValues = this.conversionValues(); contextConversionValues.hasNext(); ) {
-			EclipseLinkOrmConversionValue contextConversionValue = contextConversionValues.next();
-			if (xmlConversionValues.hasNext()) {
-				contextConversionValue.update(xmlConversionValues.next());
-			}
-			else {
-				removeConversionValue_(contextConversionValue);
-			}
-		}
-		
-		while (xmlConversionValues.hasNext()) {
-			addConversionValue(buildConversionValue(xmlConversionValues.next()));
-		}
-	}
-	
-	protected EclipseLinkOrmConversionValue buildConversionValue(XmlConversionValue resourceConversionValue) {
-		EclipseLinkOrmConversionValue conversionValue = new EclipseLinkOrmConversionValue(this);
-		conversionValue.initialize(resourceConversionValue);
-		return conversionValue;
-	}
-	
-	protected String getResourceDataType() {
-		return this.resourceConverter.getDataType();
-	}
-
-	protected String getResourceObjectType() {
-		return this.resourceConverter.getObjectType();
-	}
-
-	protected String getResourceDefaultObjectValue() {
-		return this.resourceConverter.getDefaultObjectValue();
-	}
-	
-	
-	// **************** validation *********************************************
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		for (Iterator<EclipseLinkOrmConversionValue> stream = conversionValues(); stream.hasNext();) {
-			stream.next().validate(messages, reporter);
-		}
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyMapping.java
deleted file mode 100644
index 6e89f05750..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyMapping.java
+++ /dev/null
@@ -1,78 +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.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmRelationshipReference;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmOneToManyMapping;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkOneToManyMapping;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetch;
-import org.eclipse.jpt.eclipselink.core.context.PrivateOwned;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetch;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlPrivateOwned;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkOrmOneToManyMapping<T extends XmlOneToMany>
-	extends GenericOrmOneToManyMapping<T>
-	implements EclipseLinkOneToManyMapping
-{
-	protected EclipseLinkOrmPrivateOwned privateOwned;
-	
-	protected EclipseLinkOrmJoinFetch joinFetch;
-	
-	
-	public EclipseLinkOrmOneToManyMapping(OrmPersistentAttribute parent, T resourceMapping) {
-		super(parent, resourceMapping);
-		this.privateOwned = new EclipseLinkOrmPrivateOwned(this, (XmlPrivateOwned) this.resourceAttributeMapping);
-		this.joinFetch = new EclipseLinkOrmJoinFetch(this, (XmlJoinFetch) this.resourceAttributeMapping);
-	}
-	
-	
-	@Override
-	protected OrmRelationshipReference buildRelationshipReference() {
-		return new EclipseLinkOrmOneToManyRelationshipReference(this, this.resourceAttributeMapping);
-	}
-	
-	@Override
-	public EclipseLinkOrmOneToManyRelationshipReference getRelationshipReference() {
-		return (EclipseLinkOrmOneToManyRelationshipReference) super.getRelationshipReference();
-	}
-	
-	public PrivateOwned getPrivateOwned() {
-		return this.privateOwned;
-	}
-	
-	public JoinFetch getJoinFetch() {
-		return this.joinFetch;
-	}
-	
-	
-	// **************** resource -> context ************************************
-	
-	@Override
-	public void update() {
-		super.update();
-		this.privateOwned.update();
-		this.joinFetch.update();
-	}
-	
-	
-	// **************** 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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyMappingProvider.java
deleted file mode 100644
index 256327d61d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyMappingProvider.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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaOneToManyMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany;
-
-public class EclipseLinkOrmOneToManyMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLinkOrmOneToManyMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkOrmOneToManyMappingProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlOneToManyImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkOrmOneToManyMapping(parent, (XmlOneToMany) resourceMapping);
-	}
-
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkVirtualXmlOneToMany(ormTypeMapping, (EclipseLinkJavaOneToManyMapping) javaAttributeMapping);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyRelationshipReference.java
deleted file mode 100644
index 238c9e383f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyRelationshipReference.java
+++ /dev/null
@@ -1,165 +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.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.AttributeMapping;
-import org.eclipse.jpt.core.context.JoinColumn;
-import org.eclipse.jpt.core.context.JoiningStrategy;
-import org.eclipse.jpt.core.context.orm.OrmJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmJoinColumnEnabledRelationshipReference;
-import org.eclipse.jpt.core.context.orm.OrmOneToManyMapping;
-import org.eclipse.jpt.core.context.orm.OrmRelationshipReference;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmOneToManyRelationshipReference;
-import org.eclipse.jpt.core.internal.context.orm.OrmJoinColumnJoiningStrategy;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkOneToManyRelationshipReference;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkOrmOneToManyRelationshipReference
-	extends GenericOrmOneToManyRelationshipReference
-	implements EclipseLinkOneToManyRelationshipReference,
-		OrmJoinColumnEnabledRelationshipReference
-{
-	protected OrmJoinColumnJoiningStrategy joinColumnJoiningStrategy;
-	
-	
-	public EclipseLinkOrmOneToManyRelationshipReference(
-			EclipseLinkOrmOneToManyMapping parent, XmlOneToMany resource) {
-		super(parent, resource);
-	}
-	
-	
-	@Override
-	protected void initializeJoiningStrategies() {
-		this.joinColumnJoiningStrategy =
-			new OrmJoinColumnJoiningStrategy(this, getResourceMapping());
-		super.initializeJoiningStrategies();
-	}
-	
-	@Override
-	public void initializeOn(OrmRelationshipReference newRelationshipReference) {
-		super.initializeOn(newRelationshipReference);
-		newRelationshipReference.initializeFromJoinColumnEnabledRelationshipReference(this);
-	}
-	
-	@Override
-	public void initializeFromJoinColumnEnabledRelationshipReference(
-			OrmJoinColumnEnabledRelationshipReference oldRelationshipReference) {
-		super.initializeFromJoinColumnEnabledRelationshipReference(oldRelationshipReference);
-		int index = 0;
-		for (JoinColumn joinColumn : 
-				CollectionTools.iterable(
-					oldRelationshipReference.getJoinColumnJoiningStrategy().specifiedJoinColumns())) {
-			OrmJoinColumn newJoinColumn = getJoinColumnJoiningStrategy().addSpecifiedJoinColumn(index++);
-			newJoinColumn.initializeFrom(joinColumn);
-		}
-	}
-	
-	@Override
-	public OrmOneToManyMapping getRelationshipMapping() {
-		return (OrmOneToManyMapping) getParent();
-	}
-	
-	@Override
-	public XmlOneToMany getResourceMapping() {
-		return (XmlOneToMany) super.getResourceMapping();
-	}
-	
-	@Override
-	protected JoiningStrategy calculatePredominantJoiningStrategy() {
-		if (this.mappedByJoiningStrategy.getMappedByAttribute() != null) {
-			return this.mappedByJoiningStrategy;
-		}
-		else if (this.joinColumnJoiningStrategy.hasSpecifiedJoinColumns()) {
-			return this.joinColumnJoiningStrategy;
-		}
-		else {
-			return this.joinTableJoiningStrategy;
-		}
-	}
-	
-	
-	// **************** mapped by **********************************************
-	
-	@Override
-	public void setMappedByJoiningStrategy() {
-		this.joinColumnJoiningStrategy.removeStrategy();
-		super.setMappedByJoiningStrategy();
-	}
-	
-	@Override
-	public boolean mayBeMappedBy(AttributeMapping mappedByMapping) {
-		return super.mayBeMappedBy(mappedByMapping) ||
-			mappedByMapping.getKey() == MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	
-	// **************** join table *********************************************
-	
-	@Override
-	public void setJoinTableJoiningStrategy() {
-		this.joinColumnJoiningStrategy.removeStrategy();
-		super.setJoinTableJoiningStrategy();
-	}
-	
-	@Override
-	public boolean mayHaveDefaultJoinTable() {
-		return super.mayHaveDefaultJoinTable()
-			&& ! this.joinColumnJoiningStrategy.hasSpecifiedJoinColumns();
-	}
-	
-	
-	// **************** join columns *******************************************
-	
-	public OrmJoinColumnJoiningStrategy getJoinColumnJoiningStrategy() {
-		return this.joinColumnJoiningStrategy;
-	}
-	
-	public boolean usesJoinColumnJoiningStrategy() {
-		return getPredominantJoiningStrategy() == this.joinColumnJoiningStrategy;
-	}
-	
-	public void setJoinColumnJoiningStrategy() {
-		this.mappedByJoiningStrategy.removeStrategy();
-		this.joinTableJoiningStrategy.removeStrategy();
-		this.joinColumnJoiningStrategy.addStrategy();
-	}
-	
-	public void unsetJoinColumnJoiningStrategy() {
-		this.joinColumnJoiningStrategy.removeStrategy();
-	}
-	
-	public boolean mayHaveDefaultJoinColumn() {
-		return false;
-	}
-	
-	
-	// **************** resource => context ************************************
-	
-	@Override
-	protected void updateJoiningStrategies() {
-		this.joinColumnJoiningStrategy.update();
-		super.updateJoiningStrategies();
-	}
-	
-	
-	// **************** Validation *********************************************
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		this.joinColumnJoiningStrategy.validate(messages, reporter);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToOneMapping.java
deleted file mode 100644
index a5064c6081..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToOneMapping.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.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmOneToOneMapping;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkOneToOneMapping;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetch;
-import org.eclipse.jpt.eclipselink.core.context.PrivateOwned;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetch;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlPrivateOwned;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkOrmOneToOneMapping<T extends XmlOneToOne>
-	extends GenericOrmOneToOneMapping<T>
-	implements EclipseLinkOneToOneMapping
-{
-	protected EclipseLinkOrmPrivateOwned privateOwned;
-	
-	protected EclipseLinkOrmJoinFetch joinFetch;
-	
-	
-	public EclipseLinkOrmOneToOneMapping(OrmPersistentAttribute parent, T resourceMapping) {
-		super(parent, resourceMapping);
-		this.privateOwned = new EclipseLinkOrmPrivateOwned(this, (XmlPrivateOwned) this.resourceAttributeMapping);
-		this.joinFetch = new EclipseLinkOrmJoinFetch(this, (XmlJoinFetch) this.resourceAttributeMapping);
-	}
-	
-	
-	public PrivateOwned getPrivateOwned() {
-		return this.privateOwned;
-	}
-	
-	public JoinFetch getJoinFetch() {
-		return this.joinFetch;
-	}
-	
-	
-	// **************** resource-context interaction ***************************
-	
-	@Override
-	public void update() {
-		super.update();
-		this.privateOwned.update();
-		this.joinFetch.update();
-	}
-	
-	
-	// **************** validation **************************************
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		// TODO - private owned, join fetch validation
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToOneMappingProvider.java
deleted file mode 100644
index 6da6412b8d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToOneMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaOneToOneMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne;
-
-public class EclipseLinkOrmOneToOneMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLinkOrmOneToOneMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkOrmOneToOneMappingProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlOneToOneImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkOrmOneToOneMapping(parent, (XmlOneToOne) resourceMapping);
-	}
-
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkVirtualXmlOneToOne(ormTypeMapping, (JavaOneToOneMapping) javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentType.java
deleted file mode 100644
index a1f4090fb6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentType.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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.internal.context.orm.AbstractOrmPersistentType;
-import org.eclipse.jpt.core.resource.orm.Attributes;
-import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-
-public class EclipseLinkOrmPersistentType extends AbstractOrmPersistentType
-{
-	
-	public EclipseLinkOrmPersistentType(EclipseLinkEntityMappings parent, XmlTypeMapping resourceMapping) {
-		super(parent, resourceMapping);
-	}
-	
-	@Override
-	protected Attributes createResourceAttributes() {
-		return EclipseLinkOrmFactory.eINSTANCE.createAttributes();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmPrivateOwned.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmPrivateOwned.java
deleted file mode 100644
index ef58b74b18..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmPrivateOwned.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.PrivateOwned;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlPrivateOwned;
-
-public class EclipseLinkOrmPrivateOwned extends AbstractXmlContextNode
-	implements PrivateOwned
-{
-	protected final XmlPrivateOwned resource;
-	
-	protected boolean privateOwned;
-	
-	
-	public EclipseLinkOrmPrivateOwned(OrmAttributeMapping parent, XmlPrivateOwned resource) {
-		super(parent);
-		this.resource = resource;
-		this.privateOwned = this.getResourcePrivateOwned();
-	}
-	
-	
-	public boolean isPrivateOwned() {
-		return this.privateOwned;
-	}
-	
-	public void setPrivateOwned(boolean newPrivateOwned) {
-		boolean oldPrivateOwned = this.privateOwned;
-		this.privateOwned = newPrivateOwned;
-		this.resource.setPrivateOwned(newPrivateOwned);
-		firePropertyChanged(PRIVATE_OWNED_PROPERTY, oldPrivateOwned, newPrivateOwned);
-	}
-	
-	protected void setPrivateOwned_(boolean newPrivateOwned) {
-		boolean oldPrivateOwned = this.privateOwned;
-		this.privateOwned = newPrivateOwned;
-		firePropertyChanged(PRIVATE_OWNED_PROPERTY, oldPrivateOwned, newPrivateOwned);
-	}
-	
-	
-	// **************** initialize/update **************************************
-	
-	protected void update() {
-		setPrivateOwned_(this.getResourcePrivateOwned());
-	}
-	
-	protected boolean getResourcePrivateOwned() {
-		return this.resource.isPrivateOwned();
-	}
-	
-	// **************** validation **************************************
-	
-	public TextRange getValidationTextRange() {
-		return this.resource.getPrivateOwnedTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmReadOnly.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmReadOnly.java
deleted file mode 100644
index b292b0fd46..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmReadOnly.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2008  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.ReadOnly;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlReadOnly;
-
-public class EclipseLinkOrmReadOnly extends AbstractXmlContextNode
-	implements ReadOnly
-{
-	protected final XmlReadOnly resource;
-	
-	protected boolean defaultReadOnly;
-	
-	protected Boolean specifiedReadOnly;
-	
-	
-	public EclipseLinkOrmReadOnly(OrmTypeMapping parent, XmlReadOnly resource, ReadOnly javaReadOnly) {
-		super(parent);
-		this.resource = resource;
-		this.defaultReadOnly = this.getJavaReadOnly(javaReadOnly);
-		this.specifiedReadOnly = this.getResourceReadOnly();
-	}
-	
-	
-	public boolean isReadOnly() {
-		return (this.specifiedReadOnly == null) ? this.defaultReadOnly : this.specifiedReadOnly.booleanValue();
-	}
-	
-	public boolean isDefaultReadOnly() {
-		return this.defaultReadOnly;
-	}
-	
-	public void setDefaultReadOnly(boolean newValue) {
-		boolean oldValue = this.defaultReadOnly;
-		this.defaultReadOnly = newValue;
-		firePropertyChanged(DEFAULT_READ_ONLY_PROPERTY, oldValue, newValue);
-	}
-	
-	public Boolean getSpecifiedReadOnly() {
-		return this.specifiedReadOnly;
-	}
-	
-	public void setSpecifiedReadOnly(Boolean newSpecifiedReadOnly) {
-		Boolean oldSpecifiedReadOnly = this.specifiedReadOnly;
-		this.specifiedReadOnly = newSpecifiedReadOnly;
-		this.resource.setReadOnly(newSpecifiedReadOnly);
-		firePropertyChanged(SPECIFIED_READ_ONLY_PROPERTY, oldSpecifiedReadOnly, newSpecifiedReadOnly);
-	}
-	
-	
-	// **************** initialize/update **************************************
-	
-	protected void update(ReadOnly javaReadOnly) {
-		setDefaultReadOnly(this.getJavaReadOnly(javaReadOnly));
-		setSpecifiedReadOnly(this.getResourceReadOnly());
-	}
-	
-	protected boolean getJavaReadOnly(ReadOnly javaReadOnly) {
-		return (javaReadOnly == null) ? false : javaReadOnly.isReadOnly();
-	}
-	
-	protected Boolean getResourceReadOnly() {
-		return this.resource.getReadOnly();
-	}
-	
-	// **************** validation **************************************
-	
-	public TextRange getValidationTextRange() {
-		return this.resource.getReadOnlyTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmStructConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmStructConverter.java
deleted file mode 100644
index 1b408df07b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmStructConverter.java
+++ /dev/null
@@ -1,100 +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.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.XmlContextNode;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.eclipselink.core.context.StructConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkOrmStructConverter extends EclipseLinkOrmConverter<XmlStructConverter>
-	implements StructConverter
-{	
-	private String converterClass;
-	
-	
-	public EclipseLinkOrmStructConverter(XmlContextNode parent) {
-		super(parent);
-	}
-		
-	public String getType() {
-		return EclipseLinkConverter.STRUCT_CONVERTER;
-	}
-	
-	
-	// **************** converter class ****************************************
-	
-	public String getConverterClass() {
-		return this.converterClass;
-	}
-	
-	public void setConverterClass(String newConverterClass) {
-		String oldConverterClass = this.converterClass;
-		this.converterClass = newConverterClass;
-		getXmlResource().setConverter(newConverterClass);
-		firePropertyChanged(CONVERTER_CLASS_PROPERTY, oldConverterClass, newConverterClass);
-	}
-	
-	protected void setConverterClass_(String newConverterClass) {
-		String oldConverterClass = this.converterClass;
-		this.converterClass = newConverterClass;
-		firePropertyChanged(CONVERTER_CLASS_PROPERTY, oldConverterClass, newConverterClass);
-	}
-	
-	
-	// **************** resource interaction ***********************************
-	
-	@Override
-	protected void initialize(XmlStructConverter xmlResource) {
-		super.initialize(xmlResource);
-		this.converterClass = getResourceConverterClass();
-	}
-	
-	@Override
-	public void update() {
-		super.update();
-		setConverterClass_(getResourceConverterClass());
-	}
-	
-	protected String getResourceConverterClass() {
-		return this.resourceConverter.getConverter();
-	}
-	
-	
-	// **************** validation *********************************************
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		validateConverterClass(messages);
-	}
-	
-//TODO validate converter class	
-	protected void validateConverterClass(List<IMessage> messages) {
-//		if (!getResourceConverter().implementsConverter()) {
-//			messages.add(
-//				DefaultEclipseLinkJpaValidationMessages.buildMessage(
-//					IMessage.HIGH_SEVERITY,
-//					EclipseLinkJpaValidationMessages.CONVERTER_CLASS_IMPLEMENTS_CONVERTER,
-//					new String[] {this.converterClass},
-//					this, 
-//					getConverterClassTextRange()
-//				)
-//			);
-//		}
-	}
-	
-//	public TextRange getConverterClassTextRange() {
-//		return getResourceConverter().getClassNameTextRange();
-//	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmTypeConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmTypeConverter.java
deleted file mode 100644
index 3ea6279bf7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmTypeConverter.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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.XmlContextNode;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.eclipselink.core.context.TypeConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter;
-
-public class EclipseLinkOrmTypeConverter extends EclipseLinkOrmConverter<XmlTypeConverter> 
-	implements TypeConverter
-{	
-	private String dataType;
-	
-	private String objectType;
-	
-	
-	public EclipseLinkOrmTypeConverter(XmlContextNode parent) {
-		super(parent);
-	}
-		
-	public String getType() {
-		return EclipseLinkConverter.TYPE_CONVERTER;
-	}
-		
-	// **************** data type **********************************************
-	
-	public String getDataType() {
-		return this.dataType;
-	}
-	
-	public void setDataType(String newDataType) {
-		String oldDataType = this.dataType;
-		this.dataType = newDataType;
-		getXmlResource().setDataType(newDataType);
-		firePropertyChanged(DATA_TYPE_PROPERTY, oldDataType, newDataType);
-	}
-	
-	protected void setDataType_(String newDataType) {
-		String oldDataType = this.dataType;
-		this.dataType = newDataType;
-		firePropertyChanged(DATA_TYPE_PROPERTY, oldDataType, newDataType);
-	}
-	
-	
-	// **************** object type ********************************************
-	
-	public String getObjectType() {
-		return this.objectType;
-	}
-	
-	public void setObjectType(String newObjectType) {
-		String oldObjectType = this.objectType;
-		this.objectType = newObjectType;
-		getXmlResource().setObjectType(newObjectType);
-		firePropertyChanged(OBJECT_TYPE_PROPERTY, oldObjectType, newObjectType);
-	}
-	
-	protected void setObjectType_(String newObjectType) {
-		String oldObjectType = this.objectType;
-		this.objectType = newObjectType;
-		firePropertyChanged(OBJECT_TYPE_PROPERTY, oldObjectType, newObjectType);
-	}
-	
-	
-	// **************** resource interaction ***********************************
-	
-	@Override
-	protected void initialize(XmlTypeConverter xmlResource) {
-		super.initialize(xmlResource);
-		this.dataType = getResourceDataType();
-		this.objectType = getResourceObjectType();
-	}
-	
-	@Override
-	public void update() {
-		super.update();
-		setDataType_(getResourceDataType());
-		setObjectType_(getResourceObjectType());
-	}
-	
-	protected String getResourceDataType() {
-		return this.resourceConverter.getDataType();
-	}
-	
-	protected String getResourceObjectType() {
-		return this.resourceConverter.getObjectType();
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMapping.java
deleted file mode 100644
index f904dbe8d7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMapping.java
+++ /dev/null
@@ -1,80 +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.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.orm.OrmConverter;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmVersionMapping;
-import org.eclipse.jpt.eclipselink.core.context.Convert;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkVersionMapping;
-import org.eclipse.jpt.eclipselink.core.context.Mutable;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlMutable;
-import org.eclipse.jpt.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 EclipseLinkOrmVersionMapping<T extends XmlVersion>
-	extends GenericOrmVersionMapping<T>
-	implements EclipseLinkVersionMapping
-{	
-	protected EclipseLinkOrmMutable mutable;
-	
-	
-	public EclipseLinkOrmVersionMapping(OrmPersistentAttribute parent, T resourceMapping) {
-		super(parent, resourceMapping);
-		this.mutable = new EclipseLinkOrmMutable(this, (XmlMutable) this.resourceAttributeMapping);
-	}
-	
-	
-	public Mutable getMutable() {
-		return this.mutable;
-	}
-
-	@Override
-	protected OrmConverter buildSpecifiedConverter(String converterType) {
-		OrmConverter ormConverter = super.buildSpecifiedConverter(converterType);
-		if (ormConverter != null) {
-			return ormConverter;
-		}
-		if (converterType == Convert.ECLIPSE_LINK_CONVERTER) {
-			return new EclipseLinkOrmConvert(this, (XmlVersion) this.resourceAttributeMapping);
-		}
-		return null;
-	}
-	
-	@Override
-	protected String getResourceConverterType() {
-		//check @Convert first, this is the order that EclipseLink searches
-		if (((XmlVersion) this.resourceAttributeMapping).getConvert() != null) {
-			return Convert.ECLIPSE_LINK_CONVERTER;
-		}
-		return super.getResourceConverterType();
-	}
-	
-	// **************** resource-context interaction ***************************
-
-	
-	@Override
-	public void update() {
-		super.update();
-		this.mutable.update();
-	}
-	
-	
-	// **************** 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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMappingProvider.java
deleted file mode 100644
index 625dd25c76..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaVersionMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion;
-
-public class EclipseLinkOrmVersionMappingProvider
-	implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmAttributeMappingProvider INSTANCE = new EclipseLinkOrmVersionMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkOrmVersionMappingProvider() {
-		super();
-	}
-
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlVersionImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkOrmVersionMapping(parent, (XmlVersion) resourceMapping);
-	}
-
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkVirtualXmlVersion(ormTypeMapping, (JavaVersionMapping) javaAttributeMapping);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmXml.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmXml.java
deleted file mode 100644
index 2f5ab59763..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmXml.java
+++ /dev/null
@@ -1,57 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.EntityMappings;
-import org.eclipse.jpt.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.core.internal.context.orm.AbstractOrmXml;
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-
-public class EclipseLinkOrmXml extends AbstractOrmXml
-{
-	public EclipseLinkOrmXml(MappingFileRef parent, JpaXmlResource resource) {
-		super(parent, resource);
-		if (!resource.getContentType().isKindOf(JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE)) {
-			throw new IllegalArgumentException(resource + " does not have eclipselink orm xml content type"); //$NON-NLS-1$ 
-		}
-	}
-	
-	@Override
-	protected EclipseLinkJpaFactory getJpaFactory() {
-		return (EclipseLinkJpaFactory) super.getJpaFactory();
-	}
-	
-	@Override
-	protected XmlEntityMappings buildEntityMappingsResource() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlEntityMappings();
-	}
-	
-	
-	@Override
-	protected EntityMappings buildEntityMappings(XmlEntityMappings xmlEntityMappings) {
-		return getJpaFactory().buildEclipseLinkEntityMappings(this, (org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings) xmlEntityMappings);
-	}
-	
-	
-	// ********** updating **********
-	
-	@Override
-	public void update(JpaXmlResource resource) {
-		if (!resource.getContentType().isKindOf(JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE)) {
-			throw new IllegalArgumentException(resource + " does not have eclipselink orm xml content type"); //$NON-NLS-1$ 
-		}
-		super.update(resource);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkPersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkPersistenceUnitMetadata.java
deleted file mode 100644
index 27aaa0143f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkPersistenceUnitMetadata.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.EntityMappings;
-import org.eclipse.jpt.core.internal.context.orm.AbstractPersistenceUnitMetadata;
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-
-public class EclipseLinkPersistenceUnitMetadata extends AbstractPersistenceUnitMetadata
-{
-
-	public EclipseLinkPersistenceUnitMetadata(EntityMappings parent, XmlEntityMappings resource) {
-		super(parent, resource);
-	}
-
-	public XmlPersistenceUnitMetadata createResourcePersistenceUnitMetadata() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata();
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlBasic.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlBasic.java
deleted file mode 100644
index c218bd7e4a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlBasic.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.context.java.JavaBasicMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.orm.VirtualXmlBasic;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.Convert;
-import org.eclipse.jpt.eclipselink.core.context.CustomConverter;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkBasicMapping;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.eclipselink.core.context.ObjectTypeConverter;
-import org.eclipse.jpt.eclipselink.core.context.StructConverter;
-import org.eclipse.jpt.eclipselink.core.context.TypeConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLinkVirtualXmlBasic extends VirtualXmlBasic implements XmlBasic
-{
-		
-	public EclipseLinkVirtualXmlBasic(OrmTypeMapping ormTypeMapping, JavaBasicMapping javaBasicMapping) {
-		super(ormTypeMapping, javaBasicMapping);
-	}
-
-	public Boolean getMutable() {
-		if (isOrmMetadataComplete()) {
-			return Boolean.valueOf(((EclipseLinkBasicMapping) this.javaAttributeMapping).getMutable().isDefaultMutable());
-		}
-		return Boolean.valueOf(((EclipseLinkBasicMapping) this.javaAttributeMapping).getMutable().isMutable());
-	}
-	
-	public void setMutable(@SuppressWarnings("unused") Boolean value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public String getConvert() {
-		if (isOrmMetadataComplete()) {
-			return null;
-		}
-		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
-			return ((Convert) this.javaAttributeMapping.getConverter()).getConverterName();
-		}
-		return null;
-	}
-	
-	public void setConvert(@SuppressWarnings("unused") String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-	
-	public TextRange getMutableTextRange() {
-		return null;
-	}
-	
-	public TextRange getConvertTextRange() {
-		return null;
-	}
-
-	public XmlConverter getConverter() {
-		if (isOrmMetadataComplete()) {
-			return null;
-		}
-		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
-			EclipseLinkConverter converter = ((Convert) this.javaAttributeMapping.getConverter()).getConverter();
-			if (converter != null && converter.getType() == EclipseLinkConverter.CUSTOM_CONVERTER) {
-				return new EclipseLinkVirtualXmlConverter(this.ormTypeMapping, (CustomConverter) ((Convert) this.javaAttributeMapping.getConverter()).getConverter());
-			}
-		}
-		return null;
-	}
-
-	public void setConverter(@SuppressWarnings("unused") XmlConverter value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public XmlObjectTypeConverter getObjectTypeConverter() {
-		if (isOrmMetadataComplete()) {
-			return null;
-		}
-		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
-			EclipseLinkConverter converter = ((Convert) this.javaAttributeMapping.getConverter()).getConverter();
-			if (converter != null && converter.getType() == EclipseLinkConverter.OBJECT_TYPE_CONVERTER) {
-				return new EclipseLinkVirtualXmlObjectTypeConverter(this.ormTypeMapping, (ObjectTypeConverter) ((Convert) this.javaAttributeMapping.getConverter()).getConverter());
-			}
-		}
-		return null;
-	}
-
-	public void setObjectTypeConverter(@SuppressWarnings("unused") XmlObjectTypeConverter value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public XmlStructConverter getStructConverter() {
-		if (isOrmMetadataComplete()) {
-			return null;
-		}
-		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
-			EclipseLinkConverter converter = ((Convert) this.javaAttributeMapping.getConverter()).getConverter();
-			if (converter != null && converter.getType() == EclipseLinkConverter.STRUCT_CONVERTER) {
-				return new EclipseLinkVirtualXmlStructConverter(this.ormTypeMapping, (StructConverter) ((Convert) this.javaAttributeMapping.getConverter()).getConverter());
-			}
-		}
-		return null;
-	}
-
-	public void setStructConverter(@SuppressWarnings("unused") XmlStructConverter value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public XmlTypeConverter getTypeConverter() {
-		if (isOrmMetadataComplete()) {
-			return null;
-		}
-		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
-			EclipseLinkConverter converter = ((Convert) this.javaAttributeMapping.getConverter()).getConverter();
-			if (converter != null && converter.getType() == EclipseLinkConverter.TYPE_CONVERTER) {
-				return new EclipseLinkVirtualXmlTypeConverter(this.ormTypeMapping, (TypeConverter) ((Convert) this.javaAttributeMapping.getConverter()).getConverter());
-			}
-		}
-		return null;
-	}
-
-	public void setTypeConverter(@SuppressWarnings("unused") XmlTypeConverter value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-		
-	public XmlAccessMethods getAccessMethods() {
-		return null;
-	}
-	
-	public void setAccessMethods(XmlAccessMethods value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$		
-	}
-	
-	public EList<XmlProperty> getProperties() {
-		// TODO get from java annotations
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlConversionValue.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlConversionValue.java
deleted file mode 100644
index f81aefc3b2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlConversionValue.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.ConversionValue;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLinkVirtualXmlConversionValue extends AbstractJpaEObject implements XmlConversionValue
-{
-	protected OrmTypeMapping ormTypeMapping;
-	
-	protected ConversionValue javaConversionValue;
-	
-	public EclipseLinkVirtualXmlConversionValue(OrmTypeMapping ormTypeMapping, ConversionValue javaConversionValue) {
-		super();
-		this.ormTypeMapping = ormTypeMapping;
-		this.javaConversionValue = javaConversionValue;
-	}
-	
-	protected boolean isOrmMetadataComplete() {
-		return this.ormTypeMapping.isMetadataComplete();
-	}
-	
-	public String getDataValue() {
-		if (isOrmMetadataComplete()) {
-			return null;
-		}
-		return this.javaConversionValue.getDataValue();
-	}
-	
-	public void setDataValue(@SuppressWarnings("unused") String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-	
-	public String getObjectValue() {
-		if (isOrmMetadataComplete()) {
-			return null;
-		}
-		return this.javaConversionValue.getObjectValue();
-	}
-	
-	public void setObjectValue(@SuppressWarnings("unused") String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public TextRange getDataValueTextRange() {
-		return null;
-	}
-	
-	public TextRange getObjectValueTextRange() {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlConverter.java
deleted file mode 100644
index 4479f80e56..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlConverter.java
+++ /dev/null
@@ -1,58 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.eclipselink.core.context.CustomConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverter;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLinkVirtualXmlConverter extends AbstractJpaEObject implements XmlConverter
-{
-	protected OrmTypeMapping ormTypeMapping;
-	
-	protected CustomConverter javaConverter;
-	
-	public EclipseLinkVirtualXmlConverter(OrmTypeMapping ormTypeMapping, CustomConverter javaConverter) {
-		super();
-		this.ormTypeMapping = ormTypeMapping;
-		this.javaConverter = javaConverter;
-	}
-	
-	protected boolean isOrmMetadataComplete() {
-		return this.ormTypeMapping.isMetadataComplete();
-	}
-
-	public String getClassName() {
-		if (isOrmMetadataComplete()) {
-			return null;
-		}
-		return this.javaConverter.getConverterClass();
-	}
-	
-	public void setClassName(@SuppressWarnings("unused") String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-	
-	public String getName() {
-		if (isOrmMetadataComplete()) {
-			return null;
-		}
-		return this.javaConverter.getName();
-	}
-	
-	public void setName(@SuppressWarnings("unused") String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlEmbedded.java
deleted file mode 100644
index 8ce8a65e2c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlEmbedded.java
+++ /dev/null
@@ -1,43 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.context.java.JavaEmbeddedMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.orm.VirtualXmlEmbedded;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLinkVirtualXmlEmbedded extends VirtualXmlEmbedded implements XmlEmbedded
-{
-		
-	public EclipseLinkVirtualXmlEmbedded(OrmTypeMapping ormTypeMapping, JavaEmbeddedMapping javaEmbeddedMapping) {
-		super(ormTypeMapping, javaEmbeddedMapping);
-	}
-	
-	public XmlAccessMethods getAccessMethods() {
-		return null;
-	}
-	
-	public void setAccessMethods(XmlAccessMethods value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$		
-	}
-	
-	public EList<XmlProperty> getProperties() {
-		// TODO get from java annotations
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlEmbeddedId.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlEmbeddedId.java
deleted file mode 100644
index dda40aacf9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlEmbeddedId.java
+++ /dev/null
@@ -1,43 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.context.java.JavaEmbeddedIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.orm.VirtualXmlEmbeddedId;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedId;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLinkVirtualXmlEmbeddedId extends VirtualXmlEmbeddedId implements XmlEmbeddedId
-{
-		
-	public EclipseLinkVirtualXmlEmbeddedId(OrmTypeMapping ormTypeMapping, JavaEmbeddedIdMapping javaEmbeddedIdMapping) {
-		super(ormTypeMapping, javaEmbeddedIdMapping);
-	}
-	
-	public XmlAccessMethods getAccessMethods() {
-		return null;
-	}
-	
-	public void setAccessMethods(XmlAccessMethods value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$		
-	}
-	
-	public EList<XmlProperty> getProperties() {
-		// TODO get from java annotations
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlId.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlId.java
deleted file mode 100644
index 2f7abd7564..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlId.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.context.java.JavaIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.orm.VirtualXmlId;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.Convert;
-import org.eclipse.jpt.eclipselink.core.context.CustomConverter;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkIdMapping;
-import org.eclipse.jpt.eclipselink.core.context.ObjectTypeConverter;
-import org.eclipse.jpt.eclipselink.core.context.StructConverter;
-import org.eclipse.jpt.eclipselink.core.context.TypeConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlId;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLinkVirtualXmlId extends VirtualXmlId implements XmlId
-{
-		
-	public EclipseLinkVirtualXmlId(OrmTypeMapping ormTypeMapping, JavaIdMapping javaIdMapping) {
-		super(ormTypeMapping, javaIdMapping);
-	}
-
-	public Boolean getMutable() {
-		//don't need isOrmMetadataComplete() check because there is no default Id mapping
-		return Boolean.valueOf(((EclipseLinkIdMapping) this.javaAttributeMapping).getMutable().isMutable());
-	}
-	
-	public void setMutable(@SuppressWarnings("unused") Boolean value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public String getConvert() {
-		//don't need isOrmMetadataComplete() check because there is no default Id mapping
-		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
-			return ((Convert) this.javaAttributeMapping.getConverter()).getConverterName();
-		}
-		return null;
-	}
-	
-	public void setConvert(@SuppressWarnings("unused") String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-	
-	public XmlConverter getConverter() {
-		//don't need isOrmMetadataComplete() check because there is no default Id mapping
-		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
-			EclipseLinkConverter converter = ((Convert) this.javaAttributeMapping.getConverter()).getConverter();
-			if (converter != null && converter.getType() == EclipseLinkConverter.CUSTOM_CONVERTER) {
-				return new EclipseLinkVirtualXmlConverter(this.ormTypeMapping, (CustomConverter) ((Convert) this.javaAttributeMapping.getConverter()).getConverter());
-			}
-		}
-		return null;
-	}
-
-	public void setConverter(@SuppressWarnings("unused") XmlConverter value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public XmlObjectTypeConverter getObjectTypeConverter() {
-		//don't need isOrmMetadataComplete() check because there is no default Id mapping
-		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
-			EclipseLinkConverter converter = ((Convert) this.javaAttributeMapping.getConverter()).getConverter();
-			if (converter != null && converter.getType() == EclipseLinkConverter.OBJECT_TYPE_CONVERTER) {
-				return new EclipseLinkVirtualXmlObjectTypeConverter(this.ormTypeMapping, (ObjectTypeConverter) ((Convert) this.javaAttributeMapping.getConverter()).getConverter());
-			}
-		}
-		return null;
-	}
-
-	public void setObjectTypeConverter(@SuppressWarnings("unused") XmlObjectTypeConverter value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public XmlStructConverter getStructConverter() {
-		//don't need isOrmMetadataComplete() check because there is no default Id mapping
-		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
-			EclipseLinkConverter converter = ((Convert) this.javaAttributeMapping.getConverter()).getConverter();
-			if (converter != null && converter.getType() == EclipseLinkConverter.STRUCT_CONVERTER) {
-				return new EclipseLinkVirtualXmlStructConverter(this.ormTypeMapping, (StructConverter) ((Convert) this.javaAttributeMapping.getConverter()).getConverter());
-			}
-		}
-		return null;
-	}
-
-	public void setStructConverter(@SuppressWarnings("unused") XmlStructConverter value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public XmlTypeConverter getTypeConverter() {
-		//don't need isOrmMetadataComplete() check because there is no default Id mapping
-		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
-			EclipseLinkConverter converter = ((Convert) this.javaAttributeMapping.getConverter()).getConverter();
-			if (converter != null && converter.getType() == EclipseLinkConverter.TYPE_CONVERTER) {
-				return new EclipseLinkVirtualXmlTypeConverter(this.ormTypeMapping, (TypeConverter) ((Convert) this.javaAttributeMapping.getConverter()).getConverter());
-			}
-		}
-		return null;
-	}
-
-	public void setTypeConverter(@SuppressWarnings("unused") XmlTypeConverter value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-	
-	public XmlAccessMethods getAccessMethods() {
-		return null;
-	}
-	
-	public void setAccessMethods(XmlAccessMethods value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$		
-	}
-	
-	public EList<XmlProperty> getProperties() {
-		// TODO get from java annotations
-		return null;
-	}
-	
-	public TextRange getMutableTextRange() {
-		return null;
-	}
-
-	public TextRange getConvertTextRange() {
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlManyToMany.java
deleted file mode 100644
index 59ea2fa260..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlManyToMany.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.context.java.JavaManyToManyMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.orm.VirtualXmlManyToMany;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetch;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetchType;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaManyToManyMappingImpl;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLinkVirtualXmlManyToMany extends VirtualXmlManyToMany implements XmlManyToMany
-{
-		
-	public EclipseLinkVirtualXmlManyToMany(OrmTypeMapping ormTypeMapping, JavaManyToManyMapping javaManyToManyMapping) {
-		super(ormTypeMapping, javaManyToManyMapping);
-	}
-
-	public XmlJoinFetchType getJoinFetch() {
-		if (isOrmMetadataComplete()) {
-			return JoinFetchType.toOrmResourceModel(JoinFetch.DEFAULT_VALUE);
-		}
-		return JoinFetchType.toOrmResourceModel(((EclipseLinkJavaManyToManyMappingImpl) this.javaAttributeMapping).getJoinFetch().getValue());
-	}
-	
-	public void setJoinFetch(@SuppressWarnings("unused") XmlJoinFetchType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-	
-	public XmlAccessMethods getAccessMethods() {
-		return null;
-	}
-	
-	public void setAccessMethods(XmlAccessMethods value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$		
-	}
-	
-	public EList<XmlProperty> getProperties() {
-		// TODO get from java annotations
-		return null;
-	}
-	
-	public TextRange getJoinFetchTextRange() {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlManyToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlManyToOne.java
deleted file mode 100644
index db004888d2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlManyToOne.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.context.java.JavaManyToOneMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.orm.VirtualXmlManyToOne;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetch;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetchType;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaManyToOneMappingImpl;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLinkVirtualXmlManyToOne extends VirtualXmlManyToOne implements XmlManyToOne
-{
-		
-	public EclipseLinkVirtualXmlManyToOne(OrmTypeMapping ormTypeMapping, JavaManyToOneMapping javaManyToOneMapping) {
-		super(ormTypeMapping, javaManyToOneMapping);
-	}
-
-	public XmlJoinFetchType getJoinFetch() {
-		if (isOrmMetadataComplete()) {
-			return JoinFetchType.toOrmResourceModel(JoinFetch.DEFAULT_VALUE);
-		}
-		return JoinFetchType.toOrmResourceModel(((EclipseLinkJavaManyToOneMappingImpl) this.javaAttributeMapping).getJoinFetch().getValue());
-	}
-	
-	public void setJoinFetch(@SuppressWarnings("unused") XmlJoinFetchType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-	
-	public XmlAccessMethods getAccessMethods() {
-		return null;
-	}
-	
-	public void setAccessMethods(XmlAccessMethods value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$		
-	}
-	
-	public EList<XmlProperty> getProperties() {
-		// TODO get from java annotations
-		return null;
-	}
-	
-	public TextRange getJoinFetchTextRange() {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlObjectTypeConverter.java
deleted file mode 100644
index 002f851a3f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlObjectTypeConverter.java
+++ /dev/null
@@ -1,99 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.eclipselink.core.context.ConversionValue;
-import org.eclipse.jpt.eclipselink.core.context.ObjectTypeConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLinkVirtualXmlObjectTypeConverter extends AbstractJpaEObject implements XmlObjectTypeConverter
-{
-	protected OrmTypeMapping ormTypeMapping;
-	
-	protected ObjectTypeConverter javaConverter;
-	
-	public EclipseLinkVirtualXmlObjectTypeConverter(OrmTypeMapping ormTypeMapping, ObjectTypeConverter javaConverter) {
-		super();
-		this.ormTypeMapping = ormTypeMapping;
-		this.javaConverter = javaConverter;
-	}
-	
-	protected boolean isOrmMetadataComplete() {
-		return this.ormTypeMapping.isMetadataComplete();
-	}
-	
-	public String getName() {
-		if (isOrmMetadataComplete()) {
-			return null;
-		}
-		return this.javaConverter.getName();
-	}
-	
-	public void setName(@SuppressWarnings("unused") String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public String getDataType() {
-		if (isOrmMetadataComplete()) {
-			return null;
-		}
-		return this.javaConverter.getDataType();
-	}
-	
-	public void setDataType(@SuppressWarnings("unused") String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public String getObjectType() {
-		if (isOrmMetadataComplete()) {
-			return null;
-		}
-		return this.javaConverter.getObjectType();
-	}
-	
-	public void setObjectType(@SuppressWarnings("unused") String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public String getDefaultObjectValue() {
-		if (isOrmMetadataComplete()) {
-			return null;
-		}
-		return this.javaConverter.getDefaultObjectValue();
-	}
-
-	public void setDefaultObjectValue(@SuppressWarnings("unused") String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-	
-	public EList<XmlConversionValue> getConversionValues() {
-		EList<XmlConversionValue> conversionValues = new EObjectContainmentEList<XmlConversionValue>(XmlConversionValue.class, this, EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES);
-		if (isOrmMetadataComplete()) {
-			return conversionValues;
-		}
-		for (ConversionValue javaConversionValue : CollectionTools.iterable(this.javaConverter.conversionValues())) {
-			XmlConversionValue xmlConversionValue = new EclipseLinkVirtualXmlConversionValue(this.ormTypeMapping, javaConversionValue);
-			conversionValues.add(xmlConversionValue);
-		}
-		return conversionValues;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlOneToMany.java
deleted file mode 100644
index 49258e21cc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlOneToMany.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.jpt.core.context.java.JavaJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.orm.VirtualXmlJoinColumn;
-import org.eclipse.jpt.core.internal.context.orm.VirtualXmlOneToMany;
-import org.eclipse.jpt.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetch;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetchType;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaOneToManyMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLinkVirtualXmlOneToMany<T extends EclipseLinkJavaOneToManyMapping>
-	extends VirtualXmlOneToMany<T>
-	implements XmlOneToMany
-{	
-	public EclipseLinkVirtualXmlOneToMany(
-			OrmTypeMapping ormTypeMapping, T javaOneToManyMapping) {
-		super(ormTypeMapping, javaOneToManyMapping);
-	}
-	
-	
-	@Override
-	public EList<XmlJoinColumn> getJoinColumns() {
-		//TODO need to check metadataComplete here
-		EList<XmlJoinColumn> joinColumns = 
-			new EObjectContainmentEList<XmlJoinColumn>(XmlJoinColumn.class, this, OrmPackage.XML_ONE_TO_ONE__JOIN_COLUMNS);
-		//TODO here i'm using joinColumns() while VirtualXmlJoinTable uses specifiedJoinColumns()???
-		for (JavaJoinColumn joinColumn : 
-				CollectionTools.iterable(
-					this.javaAttributeMapping.getRelationshipReference().
-						getJoinColumnJoiningStrategy().joinColumns())) {
-			XmlJoinColumn xmlJoinColumn = new VirtualXmlJoinColumn(joinColumn, this.isOrmMetadataComplete());
-			joinColumns.add(xmlJoinColumn);
-		}
-		return joinColumns;
-	}
-
-	public XmlJoinFetchType getJoinFetch() {
-		if (isOrmMetadataComplete()) {
-			return JoinFetchType.toOrmResourceModel(JoinFetch.DEFAULT_VALUE);
-		}
-		return JoinFetchType.toOrmResourceModel(((EclipseLinkJavaOneToManyMapping) this.javaAttributeMapping).getJoinFetch().getValue());
-	}
-	
-	public void setJoinFetch(@SuppressWarnings("unused") XmlJoinFetchType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-	
-	public boolean isPrivateOwned() {
-		if (isOrmMetadataComplete()) {
-			return false;
-		}
-		return ((EclipseLinkJavaOneToManyMapping) this.javaAttributeMapping).getPrivateOwned().isPrivateOwned();
-	}
-	
-	public void setPrivateOwned(@SuppressWarnings("unused") boolean value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-	
-	public XmlAccessMethods getAccessMethods() {
-		return null;
-	}
-	
-	public void setAccessMethods(XmlAccessMethods value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$		
-	}
-	
-	public EList<XmlProperty> getProperties() {
-		// TODO get from java annotations
-		return null;
-	}
-	
-	public TextRange getJoinFetchTextRange() {
-		return null;
-	}
-	
-	public TextRange getPrivateOwnedTextRange() {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlOneToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlOneToOne.java
deleted file mode 100644
index ecae88bf41..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlOneToOne.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.context.java.JavaOneToOneMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.orm.VirtualXmlOneToOne;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetch;
-import org.eclipse.jpt.eclipselink.core.context.JoinFetchType;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaOneToOneMappingImpl;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLinkVirtualXmlOneToOne extends VirtualXmlOneToOne implements XmlOneToOne
-{
-		
-	public EclipseLinkVirtualXmlOneToOne(OrmTypeMapping ormTypeMapping, JavaOneToOneMapping javaOneToOneMapping) {
-		super(ormTypeMapping, javaOneToOneMapping);
-	}
-
-	public XmlJoinFetchType getJoinFetch() {
-		if (isOrmMetadataComplete()) {
-			return JoinFetchType.toOrmResourceModel(JoinFetch.DEFAULT_VALUE);
-		}
-		return JoinFetchType.toOrmResourceModel(((EclipseLinkJavaOneToOneMappingImpl) this.javaAttributeMapping).getJoinFetch().getValue());
-	}
-	
-	public void setJoinFetch(@SuppressWarnings("unused") XmlJoinFetchType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-	
-	public boolean isPrivateOwned() {
-		if (isOrmMetadataComplete()) {
-			return false;
-		}
-		return ((EclipseLinkJavaOneToOneMappingImpl) this.javaAttributeMapping).getPrivateOwned().isPrivateOwned();
-	}
-	
-	public void setPrivateOwned(@SuppressWarnings("unused") boolean value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-	
-	public XmlAccessMethods getAccessMethods() {
-		return null;
-	}
-	
-	public void setAccessMethods(XmlAccessMethods value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$		
-	}
-	
-	public EList<XmlProperty> getProperties() {
-		// TODO get from java annotations
-		return null;
-	}
-	
-	public TextRange getJoinFetchTextRange() {
-		return null;
-	}
-	
-	public TextRange getPrivateOwnedTextRange() {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlStructConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlStructConverter.java
deleted file mode 100644
index b4179db45c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlStructConverter.java
+++ /dev/null
@@ -1,58 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.eclipselink.core.context.StructConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLinkVirtualXmlStructConverter extends AbstractJpaEObject implements XmlStructConverter
-{
-	protected OrmTypeMapping ormTypeMapping;
-	
-	protected StructConverter javaConverter;
-	
-	public EclipseLinkVirtualXmlStructConverter(OrmTypeMapping ormTypeMapping, StructConverter javaConverter) {
-		super();
-		this.ormTypeMapping = ormTypeMapping;
-		this.javaConverter = javaConverter;
-	}
-	
-	protected boolean isOrmMetadataComplete() {
-		return this.ormTypeMapping.isMetadataComplete();
-	}
-
-	public String getConverter() {
-		if (isOrmMetadataComplete()) {
-			return null;
-		}
-		return this.javaConverter.getConverterClass();
-	}
-	
-	public void setConverter(@SuppressWarnings("unused") String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-	
-	public String getName() {
-		if (isOrmMetadataComplete()) {
-			return null;
-		}
-		return this.javaConverter.getName();
-	}
-	
-	public void setName(@SuppressWarnings("unused") String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlTypeConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlTypeConverter.java
deleted file mode 100644
index ad63917042..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlTypeConverter.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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.eclipselink.core.context.TypeConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLinkVirtualXmlTypeConverter extends AbstractJpaEObject implements XmlTypeConverter
-{
-	protected OrmTypeMapping ormTypeMapping;
-	
-	protected TypeConverter javaConverter;
-	
-	public EclipseLinkVirtualXmlTypeConverter(OrmTypeMapping ormTypeMapping, TypeConverter javaConverter) {
-		super();
-		this.ormTypeMapping = ormTypeMapping;
-		this.javaConverter = javaConverter;
-	}
-	
-	protected boolean isOrmMetadataComplete() {
-		return this.ormTypeMapping.isMetadataComplete();
-	}
-	
-	public String getName() {
-		if (isOrmMetadataComplete()) {
-			return null;
-		}
-		return this.javaConverter.getName();
-	}
-	
-	public void setName(@SuppressWarnings("unused") String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public String getDataType() {
-		if (isOrmMetadataComplete()) {
-			return null;
-		}
-		return this.javaConverter.getDataType();
-	}
-	
-	public void setDataType(@SuppressWarnings("unused") String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public String getObjectType() {
-		if (isOrmMetadataComplete()) {
-			return null;
-		}
-		return this.javaConverter.getObjectType();
-	}
-	
-	public void setObjectType(@SuppressWarnings("unused") String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlVersion.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlVersion.java
deleted file mode 100644
index 887bfceb19..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlVersion.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.context.java.JavaVersionMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.orm.VirtualXmlVersion;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.context.Convert;
-import org.eclipse.jpt.eclipselink.core.context.CustomConverter;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkVersionMapping;
-import org.eclipse.jpt.eclipselink.core.context.ObjectTypeConverter;
-import org.eclipse.jpt.eclipselink.core.context.StructConverter;
-import org.eclipse.jpt.eclipselink.core.context.TypeConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class EclipseLinkVirtualXmlVersion extends VirtualXmlVersion implements XmlVersion
-{
-		
-	public EclipseLinkVirtualXmlVersion(OrmTypeMapping ormTypeMapping, JavaVersionMapping javaVersionMapping) {
-		super(ormTypeMapping, javaVersionMapping);
-	}
-
-	public Boolean getMutable() {
-		//don't need isOrmMetadataComplete() check because there is no default Id mapping
-		return Boolean.valueOf(((EclipseLinkVersionMapping) this.javaAttributeMapping).getMutable().isMutable());
-	}
-	
-	public void setMutable(@SuppressWarnings("unused") Boolean value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public String getConvert() {
-		//don't need isOrmMetadataComplete() check because there is no default Id mapping
-		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
-			return ((Convert) this.javaAttributeMapping.getConverter()).getConverterName();
-		}
-		return null;
-	}
-	
-	public void setConvert(@SuppressWarnings("unused") String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public TextRange getMutableTextRange() {
-		return null;
-	}
-	
-	public TextRange getConvertTextRange() {
-		return null;
-	}
-
-	public XmlConverter getConverter() {
-		//don't need isOrmMetadataComplete() check because there is no default Id mapping
-		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
-			EclipseLinkConverter converter = ((Convert) this.javaAttributeMapping.getConverter()).getConverter();
-			if (converter != null && converter.getType() == EclipseLinkConverter.CUSTOM_CONVERTER) {
-				return new EclipseLinkVirtualXmlConverter(this.ormTypeMapping, (CustomConverter) ((Convert) this.javaAttributeMapping.getConverter()).getConverter());
-			}
-		}
-		return null;
-	}
-
-	public void setConverter(@SuppressWarnings("unused") XmlConverter value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public XmlObjectTypeConverter getObjectTypeConverter() {
-		//don't need isOrmMetadataComplete() check because there is no default Id mapping
-		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
-			EclipseLinkConverter converter = ((Convert) this.javaAttributeMapping.getConverter()).getConverter();
-			if (converter != null && converter.getType() == EclipseLinkConverter.OBJECT_TYPE_CONVERTER) {
-				return new EclipseLinkVirtualXmlObjectTypeConverter(this.ormTypeMapping, (ObjectTypeConverter) ((Convert) this.javaAttributeMapping.getConverter()).getConverter());
-			}
-		}
-		return null;
-	}
-
-	public void setObjectTypeConverter(@SuppressWarnings("unused") XmlObjectTypeConverter value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public XmlStructConverter getStructConverter() {
-		//don't need isOrmMetadataComplete() check because there is no default Id mapping
-		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
-			EclipseLinkConverter converter = ((Convert) this.javaAttributeMapping.getConverter()).getConverter();
-			if (converter != null && converter.getType() == EclipseLinkConverter.STRUCT_CONVERTER) {
-				return new EclipseLinkVirtualXmlStructConverter(this.ormTypeMapping, (StructConverter) ((Convert) this.javaAttributeMapping.getConverter()).getConverter());
-			}
-		}
-		return null;
-	}
-
-	public void setStructConverter(@SuppressWarnings("unused") XmlStructConverter value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-
-	public XmlTypeConverter getTypeConverter() {
-		//don't need isOrmMetadataComplete() check because there is no default Id mapping
-		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
-			EclipseLinkConverter converter = ((Convert) this.javaAttributeMapping.getConverter()).getConverter();
-			if (converter != null && converter.getType() == EclipseLinkConverter.TYPE_CONVERTER) {
-				return new EclipseLinkVirtualXmlTypeConverter(this.ormTypeMapping, (TypeConverter) ((Convert) this.javaAttributeMapping.getConverter()).getConverter());
-			}
-		}
-		return null;
-	}
-
-	public void setTypeConverter(@SuppressWarnings("unused") XmlTypeConverter value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
-	}
-	
-	
-	public XmlAccessMethods getAccessMethods() {
-		return null;
-	}
-	
-	public void setAccessMethods(XmlAccessMethods value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$		
-	}
-	
-	public EList<XmlProperty> getProperties() {
-		// TODO get from java annotations
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmBasicCollectionMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmBasicCollectionMapping.java
deleted file mode 100644
index cf38130211..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmBasicCollectionMapping.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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.orm.AbstractOrmAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.context.BasicCollectionMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.Attributes;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection;
-
-public class OrmBasicCollectionMapping<T extends XmlBasicCollection>
-	extends AbstractOrmAttributeMapping<T> 
-	implements BasicCollectionMapping
-{
-	public OrmBasicCollectionMapping(OrmPersistentAttribute parent, T resourceMapping) {
-		super(parent, resourceMapping);
-	}
-	
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmAttributeMapping(this);
-	}
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.BASIC_COLLECTION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public void addToResourceModel(org.eclipse.jpt.core.resource.orm.Attributes resourceAttributes) {
-		((Attributes) resourceAttributes).getBasicCollections().add(this.resourceAttributeMapping);
-	}
-	
-	public void removeFromResourceModel(org.eclipse.jpt.core.resource.orm.Attributes resourceAttributes) {
-		((Attributes) resourceAttributes).getBasicCollections().remove(this.resourceAttributeMapping);
-	}
-
-	public int getXmlSequence() {
-		return 23;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmBasicCollectionMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmBasicCollectionMappingProvider.java
deleted file mode 100644
index e1bc974c1d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmBasicCollectionMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaBasicCollectionMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection;
-
-public class OrmBasicCollectionMappingProvider
-	implements OrmAttributeMappingProvider
-{
-
-	// singleton
-	private static final OrmBasicCollectionMappingProvider INSTANCE = new OrmBasicCollectionMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private OrmBasicCollectionMappingProvider() {
-		super();
-	}
-	
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.BASIC_COLLECTION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlBasicCollectionImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildOrmBasicCollectionMapping(parent, (XmlBasicCollection) resourceMapping);
-	}
-	
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildVirtualXmlBasicCollection(ormTypeMapping, (JavaBasicCollectionMapping) javaAttributeMapping);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmBasicMapMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmBasicMapMapping.java
deleted file mode 100644
index f1a0ed25a6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmBasicMapMapping.java
+++ /dev/null
@@ -1,48 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.orm.AbstractOrmAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.context.BasicMapMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.Attributes;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap;
-
-public class OrmBasicMapMapping<T extends XmlBasicMap>
-	extends AbstractOrmAttributeMapping<T> 
-	implements BasicMapMapping
-{
-	public OrmBasicMapMapping(OrmPersistentAttribute parent, T resourceMapping) {
-		super(parent, resourceMapping);
-	}
-	
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmAttributeMapping(this);
-	}
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.BASIC_MAP_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public void addToResourceModel(org.eclipse.jpt.core.resource.orm.Attributes resourceAttributes) {
-		((Attributes) resourceAttributes).getBasicMaps().add(this.resourceAttributeMapping);
-	}
-	
-	public void removeFromResourceModel(org.eclipse.jpt.core.resource.orm.Attributes resourceAttributes) {
-		((Attributes) resourceAttributes).getBasicMaps().remove(this.resourceAttributeMapping);
-	}
-
-	
-	public int getXmlSequence() {
-		return 27;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmBasicMapMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmBasicMapMappingProvider.java
deleted file mode 100644
index f43724830e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmBasicMapMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaBasicMapMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap;
-
-public class OrmBasicMapMappingProvider
-	implements OrmAttributeMappingProvider
-{
-
-	// singleton
-	private static final OrmBasicMapMappingProvider INSTANCE = new OrmBasicMapMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private OrmBasicMapMappingProvider() {
-		super();
-	}
-	
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return EclipseLinkMappingKeys.BASIC_MAP_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlBasicMapImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildOrmBasicMapMapping(parent, (XmlBasicMap) resourceMapping);
-	}
-	
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildVirtualXmlBasicMap(ormTypeMapping, (JavaBasicMapMapping) javaAttributeMapping);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmTransformationMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmTransformationMapping.java
deleted file mode 100644
index 1f0127e619..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmTransformationMapping.java
+++ /dev/null
@@ -1,48 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.orm.AbstractOrmAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.context.TransformationMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.Attributes;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation;
-
-public class OrmTransformationMapping<T extends XmlTransformation>
-	extends AbstractOrmAttributeMapping<T> 
-	implements TransformationMapping
-{
-	public OrmTransformationMapping(OrmPersistentAttribute parent, T resourceMapping) {
-		super(parent, resourceMapping);
-	}
-	
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmAttributeMapping(this);
-	}
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.TRANSFORMATION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public void addToResourceModel(org.eclipse.jpt.core.resource.orm.Attributes resourceAttributes) {
-		((Attributes) resourceAttributes).getTransformations().add(this.resourceAttributeMapping);
-	}
-	
-	public void removeFromResourceModel(org.eclipse.jpt.core.resource.orm.Attributes resourceAttributes) {
-		((Attributes) resourceAttributes).getTransformations().remove(this.resourceAttributeMapping);
-	}
-
-	
-	public int getXmlSequence() {
-		return 85;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmTransformationMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmTransformationMappingProvider.java
deleted file mode 100644
index c70751bc6c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmTransformationMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaTransformationMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation;
-
-public class OrmTransformationMappingProvider
-	implements OrmAttributeMappingProvider
-{
-
-	// singleton
-	private static final OrmTransformationMappingProvider INSTANCE = new OrmTransformationMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private OrmTransformationMappingProvider() {
-		super();
-	}
-	
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return EclipseLinkMappingKeys.TRANSFORMATION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlTransformationImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildOrmTransformationMapping(parent, (XmlTransformation) resourceMapping);
-	}
-	
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildVirtualXmlTransformation(ormTypeMapping, (JavaTransformationMapping) javaAttributeMapping);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmVariableOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmVariableOneToOneMapping.java
deleted file mode 100644
index ac8cb8dca0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmVariableOneToOneMapping.java
+++ /dev/null
@@ -1,47 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.orm.AbstractOrmAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.context.VariableOneToOneMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.Attributes;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOne;
-
-public class OrmVariableOneToOneMapping<T extends XmlVariableOneToOne>
-	extends AbstractOrmAttributeMapping<T> 
-	implements VariableOneToOneMapping
-{
-	public OrmVariableOneToOneMapping(OrmPersistentAttribute parent, T resourceMapping) {
-		super(parent, resourceMapping);
-	}
-	
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmAttributeMapping(this);
-	}
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.VARIABLE_ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public void addToResourceModel(org.eclipse.jpt.core.resource.orm.Attributes resourceAttributes) {
-		((Attributes) resourceAttributes).getVariableOneToOnes().add(this.resourceAttributeMapping);
-	}
-	
-	public void removeFromResourceModel(org.eclipse.jpt.core.resource.orm.Attributes resourceAttributes) {
-		((Attributes) resourceAttributes).getVariableOneToOnes().remove(this.resourceAttributeMapping);
-	}
-
-	public int getXmlSequence() {
-		return 65;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmVariableOneToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmVariableOneToOneMappingProvider.java
deleted file mode 100644
index 7b6cb22d31..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmVariableOneToOneMappingProvider.java
+++ /dev/null
@@ -1,67 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaVariableOneToOneMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOne;
-
-public class OrmVariableOneToOneMappingProvider
-	implements OrmAttributeMappingProvider
-{
-
-	// singleton
-	private static final OrmVariableOneToOneMappingProvider INSTANCE = new OrmVariableOneToOneMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private OrmVariableOneToOneMappingProvider() {
-		super();
-	}
-	
-	public IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-
-	public String getKey() {
-		return EclipseLinkMappingKeys.VARIABLE_ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlVariableOneToOneImpl();
-	}
-
-	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildOrmVariableOneToOneMapping(parent, (XmlVariableOneToOne) resourceMapping);
-	}
-	
-	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildVirtualXmlVariableOneToOne(ormTypeMapping, (JavaVariableOneToOneMapping) javaAttributeMapping);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/VirtualXmlBasicCollection.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/VirtualXmlBasicCollection.java
deleted file mode 100644
index b1b69457d5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/VirtualXmlBasicCollection.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.orm.VirtualXmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaBasicCollectionMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class VirtualXmlBasicCollection extends VirtualXmlAttributeMapping<JavaBasicCollectionMapping> implements XmlBasicCollection
-{
-
-	public VirtualXmlBasicCollection(OrmTypeMapping ormTypeMapping, JavaBasicCollectionMapping javaBasicCollectionMapping) {
-		super(ormTypeMapping, javaBasicCollectionMapping);
-	}
-	
-	public XmlAccessMethods getAccessMethods() {
-		return null;
-	}
-	
-	public void setAccessMethods(XmlAccessMethods value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$		
-	}
-	
-	
-	public EList<XmlProperty> getProperties() {
-		// TODO get from java annotations
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/VirtualXmlBasicMap.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/VirtualXmlBasicMap.java
deleted file mode 100644
index 657af71eef..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/VirtualXmlBasicMap.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.orm.VirtualXmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaBasicMapMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class VirtualXmlBasicMap extends VirtualXmlAttributeMapping<JavaBasicMapMapping> implements XmlBasicMap
-{
-
-	public VirtualXmlBasicMap(OrmTypeMapping ormTypeMapping, JavaBasicMapMapping javaBasicMapMappingg) {
-		super(ormTypeMapping, javaBasicMapMappingg);
-	}
-	
-	public XmlAccessMethods getAccessMethods() {
-		return null;
-	}
-	
-	public void setAccessMethods(XmlAccessMethods value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$		
-	}
-	
-	
-	public EList<XmlProperty> getProperties() {
-		// TODO get from java annotations
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/VirtualXmlTransformation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/VirtualXmlTransformation.java
deleted file mode 100644
index 3460a801b3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/VirtualXmlTransformation.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.orm.VirtualXmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaTransformationMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class VirtualXmlTransformation extends VirtualXmlAttributeMapping<JavaTransformationMapping> implements XmlTransformation
-{
-
-	public VirtualXmlTransformation(OrmTypeMapping ormTypeMapping, JavaTransformationMapping javaTransformationMapping) {
-		super(ormTypeMapping, javaTransformationMapping);
-	}
-	
-	public XmlAccessMethods getAccessMethods() {
-		return null;
-	}
-	
-	public void setAccessMethods(XmlAccessMethods value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$		
-	}
-	
-	
-	public EList<XmlProperty> getProperties() {
-		// TODO get from java annotations
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/VirtualXmlVariableOneToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/VirtualXmlVariableOneToOne.java
deleted file mode 100644
index 48487a9c5b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/VirtualXmlVariableOneToOne.java
+++ /dev/null
@@ -1,45 +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.eclipselink.core.internal.context.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.internal.context.orm.VirtualXmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaVariableOneToOneMapping;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOne;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class VirtualXmlVariableOneToOne extends VirtualXmlAttributeMapping<JavaVariableOneToOneMapping> implements XmlVariableOneToOne
-{
-
-	public VirtualXmlVariableOneToOne(OrmTypeMapping ormTypeMapping, JavaVariableOneToOneMapping javaVariableOneToOneMapping) {
-		super(ormTypeMapping, javaVariableOneToOneMapping);
-	}
-	
-	public XmlAccessMethods getAccessMethods() {
-		return null;
-	}
-	
-	public void setAccessMethods(XmlAccessMethods value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$		
-	}
-	
-	
-	public EList<XmlProperty> getProperties() {
-		// TODO get from java annotations
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java
deleted file mode 100644
index 05ba4141a0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java
+++ /dev/null
@@ -1,332 +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.eclipselink.core.internal.context.persistence;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Set;
-import org.eclipse.jpt.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.core.context.persistence.Persistence;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.core.internal.context.persistence.AbstractPersistenceUnit;
-import org.eclipse.jpt.core.internal.context.persistence.ImpliedMappingFileRef;
-import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkJpaProject;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.EclipseLinkCaching;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.EclipseLinkConnection;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.EclipseLinkCustomization;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.general.EclipseLinkGeneralProperties;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.general.GeneralProperties;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.EclipseLinkLogging;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.Logging;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.EclipseLinkOptions;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.Options;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.EclipseLinkSchemaGeneration;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.SchemaGeneration;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-import org.eclipse.jpt.utility.internal.iterators.ReadOnlyCompositeListIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-import org.eclipse.jpt.utility.internal.model.value.ItemPropertyListValueModelAdapter;
-import org.eclipse.jpt.utility.internal.model.value.ListAspectAdapter;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * EclipseLink persistence unit
- */
-public class EclipseLinkPersistenceUnit
-	extends AbstractPersistenceUnit
-{
-	protected MappingFileRef impliedEclipseLinkMappingFileRef;
-
-	private GeneralProperties generalProperties;
-	private Connection connection;
-	private Customization customization;
-	private Caching caching;
-	private Logging logging;
-	private Options options;
-	private SchemaGeneration schemaGeneration;
-
-	/* global converter definitions, defined elsewhere in model */
-	protected final List<EclipseLinkConverter> converters = new ArrayList<EclipseLinkConverter>();
-
-
-	public EclipseLinkPersistenceUnit(Persistence parent, XmlPersistenceUnit xmlPersistenceUnit) {
-		super(parent, xmlPersistenceUnit);
-	}
-
-	@Override
-	protected void initializeProperties() {
-		super.initializeProperties();
-		ListValueModel<Property> propertyListAdapter = this.buildPropertyListAdapter();
-
-		this.generalProperties = new EclipseLinkGeneralProperties(this, propertyListAdapter);
-		this.connection = new EclipseLinkConnection(this, propertyListAdapter);
-		this.customization = new EclipseLinkCustomization(this, propertyListAdapter);
-		this.caching = new EclipseLinkCaching(this, propertyListAdapter);
-		this.logging = new EclipseLinkLogging(this, propertyListAdapter);
-		this.options = new EclipseLinkOptions(this, propertyListAdapter);
-		this.schemaGeneration = new EclipseLinkSchemaGeneration(this, propertyListAdapter);
-	}
-
-	private ListValueModel<Property> buildPropertyListAdapter() {
-		return new ItemPropertyListValueModelAdapter<Property>(this.buildPropertiesAdapter(), Property.VALUE_PROPERTY);
-	}
-
-	private ListValueModel<Property> buildPropertiesAdapter() {
-		return new ListAspectAdapter<PersistenceUnit, Property>(PROPERTIES_LIST, this) {
-			@Override
-			protected ListIterator<Property> listIterator_() {
-				return this.subject.properties();
-			}
-			@Override
-			protected int size_() {
-				return this.subject.propertiesSize();
-			}
-		};
-	}
-
-	@Override
-	protected void addNonUpdateAspectNamesTo(Set<String> nonUpdateAspectNames) {
-		super.addNonUpdateAspectNamesTo(nonUpdateAspectNames);
-		nonUpdateAspectNames.add(CONVERTERS_LIST);
-	}
-
-
-	// **************** mapping file refs **************************************
-
-	@Override
-	public ListIterator<MappingFileRef> mappingFileRefs() {
-		if (this.impliedEclipseLinkMappingFileRef == null) {
-			return super.mappingFileRefs();
-		}
-		return new ReadOnlyCompositeListIterator<MappingFileRef>(
-			super.mappingFileRefs(), this.impliedEclipseLinkMappingFileRef);
-	}
-
-	@Override
-	public int mappingFileRefsSize() {
-		if (this.impliedEclipseLinkMappingFileRef == null) {
-			return super.mappingFileRefsSize();
-		}
-		return 1 + super.mappingFileRefsSize();
-	}
-
-
-	// **************** implied eclipselink mapping file ref *******************
-
-	/**
-	 * String constant associated with changes to the implied eclipselink mapping file ref
-	 */
-	public final static String IMPLIED_ECLIPSELINK_MAPPING_FILE_REF_PROPERTY = "impliedEclipseLinkMappingFileRef"; //$NON-NLS-1$
-
-
-	public MappingFileRef getImpliedEclipseLinkMappingFileRef() {
-		return this.impliedEclipseLinkMappingFileRef;
-	}
-
-	protected MappingFileRef setImpliedEclipseLinkMappingFileRef() {
-		if (this.impliedEclipseLinkMappingFileRef != null) {
-			throw new IllegalStateException("The implied eclipselink mapping file ref is already set."); //$NON-NLS-1$
-		}
-		MappingFileRef mappingFileRef = buildEclipseLinkImpliedMappingFileRef();
-		this.impliedEclipseLinkMappingFileRef = mappingFileRef;
-		firePropertyChanged(IMPLIED_ECLIPSELINK_MAPPING_FILE_REF_PROPERTY, null, mappingFileRef);
-		return mappingFileRef;
-	}
-
-	protected void unsetImpliedEclipseLinkMappingFileRef() {
-		if (this.impliedEclipseLinkMappingFileRef == null) {
-			throw new IllegalStateException("The implied eclipselink mapping file ref is already unset."); //$NON-NLS-1$
-		}
-		MappingFileRef mappingFileRef = this.impliedEclipseLinkMappingFileRef;
-		this.impliedEclipseLinkMappingFileRef.dispose();
-		this.impliedEclipseLinkMappingFileRef = null;
-		firePropertyChanged(IMPLIED_ECLIPSELINK_MAPPING_FILE_REF_PROPERTY, mappingFileRef, null);
-	}
-
-
-	// **************** properties *********************************************
-
-	public GeneralProperties getGeneralProperties() {
-		return this.generalProperties;
-	}
-
-	public Connection getConnection() {
-		return this.connection;
-	}
-
-	public Customization getCustomization() {
-		return this.customization;
-	}
-
-	public Caching getCaching() {
-		return this.caching;
-	}
-
-	public Logging getLogging() {
-		return this.logging;
-	}
-
-	public Options getOptions() {
-		return this.options;
-	}
-
-	public SchemaGeneration getSchemaGeneration() {
-		return this.schemaGeneration;
-	}
-
-
-	// **************** converters *********************************************
-
-	/**
-	 * Identifier for changes to the list of global converter definitions.
-	 * Note that there are no granular changes to this list.  There is only
-	 * notification that the entire list has changed.
-	 */
-	public static final String CONVERTERS_LIST = "converters"; //$NON-NLS-1$
-
-	/**
-	 * Add the converter definition (defined elsewhere) to the list of converters
-	 * defined within this persistence unit.
-	 * Note that this should only be called during the process of updating the
-	 * local converter definition.
-	 * No change notification accompanies this action specifically.
-	 */
-	public void addConverter(EclipseLinkConverter converter) {
-		this.converters.add(converter);
-	}
-
-	/**
-	 * Return an iterator on all converters defined within this persistence unit,
-	 * included duplicately named converters definitions.
-	 */
-	public ListIterator<EclipseLinkConverter> allConverters() {
-		return new CloneListIterator<EclipseLinkConverter>(this.converters);
-	}
-
-	/**
-	 * Return an array of the names of the converters defined in the persistence
-	 * unit, with duplicates removed.
-	 */
-	public String[] uniqueConverterNames() {
-		HashSet<String> names = CollectionTools.set(this.allNonNullConverterNames());
-		return names.toArray(new String[names.size()]);
-	}
-
-	protected Iterator<String> allNonNullConverterNames() {
-		return new FilteringIterator<String, String>(this.allConverterNames()) {
-			@Override
-			protected boolean accept(String converterName) {
-				return converterName != null;
-			}
-		};
-	}
-
-	protected Iterator<String> allConverterNames() {
-		return new TransformationIterator<EclipseLinkConverter, String>(this.allConverters()) {
-			@Override
-			protected String transform(EclipseLinkConverter converter) {
-				return converter.getName();
-			}
-		};
-	}
-
-
-	// **************** updating ***********************************************
-
-	@Override
-	public void update(XmlPersistenceUnit persistenceUnit) {
-		this.converters.clear();
-		super.update(persistenceUnit);
-		convertersUpdated();
-	}
-
-	@Override
-	protected void initializeMappingFileRefs() {
-		super.initializeMappingFileRefs();
-
-		// use implied mapping file if 
-		// a) properties does not exclude it
-		// b) it isn't otherwise specified
-		// c) the file actually exists
-		if (! impliedEclipseLinkMappingFileIsExcluded()
-				&& ! impliedEclipseLinkMappingFileIsSpecified()
-				&& impliedEclipseLinkMappingFileExists()) {
-
-			this.impliedEclipseLinkMappingFileRef = buildEclipseLinkImpliedMappingFileRef();
-		}
-	}
-
-	private ImpliedMappingFileRef buildEclipseLinkImpliedMappingFileRef() {
-		return new ImpliedMappingFileRef(this, JptEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_FILE_PATH);
-	}
-
-	@Override
-	protected void updateMappingFileRefs() {
-		super.updateMappingFileRefs();
-
-		// use implied mapping file if 
-		// a) properties does not exclude it
-		// b) it isn't otherwise specified
-		// c) the file actually exists
-		if (! impliedEclipseLinkMappingFileIsExcluded()
-				&& ! impliedEclipseLinkMappingFileIsSpecified()
-				&& impliedEclipseLinkMappingFileExists()) {
-
-			if (this.impliedEclipseLinkMappingFileRef == null) {
-				setImpliedEclipseLinkMappingFileRef();
-			}
-			getImpliedEclipseLinkMappingFileRef().update(null);
-		}
-		else if (this.impliedEclipseLinkMappingFileRef != null) {
-			unsetImpliedEclipseLinkMappingFileRef();
-		}
-	}
-
-	protected boolean impliedEclipseLinkMappingFileIsExcluded() {
-		return getGeneralProperties().getExcludeEclipselinkOrm() == Boolean.TRUE;
-	}
-
-	protected boolean impliedEclipseLinkMappingFileIsSpecified() {
-		String impliedMappingFile = JptEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_FILE_PATH;
-		for (Iterator<MappingFileRef> stream = specifiedMappingFileRefs(); stream.hasNext(); ) {
-			if (impliedMappingFile.equals(stream.next().getFileName())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public EclipseLinkJpaProject getJpaProject() {
-		return (EclipseLinkJpaProject) super.getJpaProject();
-	}
-	
-	protected boolean impliedEclipseLinkMappingFileExists() {
-		return getJpaProject().getDefaultEclipseLinkOrmXmlResource() != null;
-	}
-
-	// This is called after the persistence unit has been updated to ensure
-	// we catch all added converters
-	protected void convertersUpdated() {
-		fireListChanged(CONVERTERS_LIST);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnitProperties.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnitProperties.java
deleted file mode 100644
index 567bfc888c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnitProperties.java
+++ /dev/null
@@ -1,424 +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.eclipselink.core.internal.context.persistence;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.utility.internal.ClassTools;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * EclipseLinkPersistenceUnitProperties
- * 
- * Listens to the propertyListAdapter
- */
-public abstract class EclipseLinkPersistenceUnitProperties extends AbstractModel 
-				implements PersistenceUnitProperties
-{
-	private PersistenceUnit persistenceUnit;
-
-	private PersistenceUnitPropertyListListener propertyListListener;
-
-	// key = EclipseLink property key; value = property id
-	private Map<String, String> propertyNames;
-
-	private static final long serialVersionUID = 1L;
-	
-	// ********** constructors / initialization **********
-	protected EclipseLinkPersistenceUnitProperties(
-			PersistenceUnit parent, 
-			ListValueModel<PersistenceUnit.Property> propertyListAdapter) {
-		super();
-		this.initialize(parent, propertyListAdapter);
-	}
-
-	protected void initialize(
-			PersistenceUnit parent, 
-			ListValueModel<PersistenceUnit.Property> propertyListAdapter) {
-		this.persistenceUnit = parent;
-		
-		this.propertyListListener = new PersistenceUnitPropertyListListener(this);
-		propertyListAdapter.addListChangeListener(ListValueModel.LIST_VALUES, this.propertyListListener);
-		
-		this.initializePropertyNames();
-		this.initializeProperties();
-	}
-
-	protected void initializePropertyNames() {
-		this.propertyNames = new HashMap<String, String>();
-		this.addPropertyNames(this.propertyNames);
-	}
-
-	/**
-	 * Initializes properties with values from the persistence unit.
-	 */
-	protected abstract void initializeProperties();
-
-	// ********** behavior **********
-	public PersistenceUnit getPersistenceUnit() {
-		return this.persistenceUnit;
-	}
-	
-	public JpaProject getJpaProject() {
-		return this.persistenceUnit.getJpaProject();
-	}
-
-	public PersistenceUnitPropertyListListener propertyListListener() {
-		return this.propertyListListener;
-	}
-
-	private Map<String, String> propertyNames() {
-		return this.propertyNames;
-	}
-
-	/**
-	 * Adds property names key/value pairs, used by the methods: itemIsProperty
-	 * and propertyIdFor.
-	 * 
-	 * key = EclipseLink property key; value = property id
-	 */
-	protected abstract void addPropertyNames(Map<String, String> pNames);
-
-	/**
-	 * Method used for identifying the given property.
-	 */
-	public boolean itemIsProperty(PersistenceUnit.Property item) {
-		if (item == null) {
-			throw new NullPointerException();
-		}
-		return this.propertyNames().keySet().contains(item.getName());
-	}
-
-	/**
-	 * Returns the property name used for change notification of the given
-	 * property.
-	 */
-	public String propertyIdFor(PersistenceUnit.Property property) {
-		String propertyId = this.propertyNames().get(property.getName());
-		if (propertyId == null) {
-			throw new IllegalArgumentException("Illegal property: " + property); //$NON-NLS-1$
-		}
-		return propertyId;
-	}
-
-	protected String eclipseLinkKeyFor(String propertyId) {
-		for (String eclipseLinkKey : this.propertyNames().keySet()) {
-			if (this.propertyNames().get(eclipseLinkKey).equals(propertyId)) {
-				return eclipseLinkKey;
-			}
-		}
-		throw new IllegalArgumentException("Illegal property ID: " + propertyId); //$NON-NLS-1$
-	}
-
-	// ****** get/set String convenience methods *******
-	/**
-	 * Returns the String value of the given Property from the PersistenceXml.
-	 */
-	// TOREVIEW - handle incorrect String in persistence.xml
-	protected String getStringValue(String elKey) {
-		PersistenceUnit.Property p = this.getPersistenceUnit().getProperty(elKey);
-		return (p == null) ? null : p.getValue();
-	}
-
-	protected String getStringValue(String key, String keySuffix) {
-		return this.getStringValue((keySuffix == null) ? key : key + keySuffix);
-	}
-
-	/**
-	 * Put the given String value into the PersistenceXml.
-	 * @param key -
-	 *            EclipseLink Key
-	 * @param newValue
-	 *            value to be associated with the key
-	 */
-	protected void putStringValue(String key, String newValue) {
-		this.putStringValue(key, null, newValue, false);
-	}
-
-	/**
-	 * Put the given String value into the PersistenceXml.
-	 * @param key
-	 *            EclipseLink Key
-	 * @param newValue
-	 *            value to be associated with the key
-	 * @param allowDuplicate
-	 */
-	protected void putStringValue(String key, String newValue, boolean allowDuplicate) {
-		this.putStringValue(key, null, newValue, allowDuplicate);
-	}
-
-	/**
-	 * Put the given String value into the PersistenceXml.
-	 * @param key
-	 *            EclipseLink Key
-	 * @param keySuffix
-	 *            e.g. entity name
-	 * @param newValue
-	 *            value to be associated with the key
-	 * @param allowDuplicate
-	 */
-	protected void putStringValue(String key, String keySuffix, String newValue, boolean allowDuplicate) {
-		String elKey = (keySuffix == null) ? key : key + keySuffix;
-		this.getPersistenceUnit().setProperty(elKey, newValue, allowDuplicate);
-	}
-
-	// ****** Integer convenience methods *******
-	/**
-	 * Returns the Integer value of the given Property from the PersistenceXml.
-	 */
-	// TOREVIEW - handle incorrect eclipseLinkValue String in
-	// persistence.xml
-	protected Integer getIntegerValue(String elKey) {
-		PersistenceUnit.Property p = this.getPersistenceUnit().getProperty(elKey);
-		return (p == null) ? null : getIntegerValueOf(p.getValue());
-	}
-
-	protected Integer getIntegerValue(String key, String keySuffix) {
-		return this.getIntegerValue((keySuffix == null) ? key : key + keySuffix);
-	}
-
-	/**
-	 * Put the given Integer value into the PersistenceXml.
-	 * @param key -
-	 *            EclipseLink Key
-	 * @param newValue
-	 *            value to be associated with the key
-	 */
-	protected void putIntegerValue(String key, Integer newValue) {
-		this.putIntegerValue(key, null, newValue, false);
-	}
-
-	/**
-	 * Put the given Integer value into the PersistenceXml.
-	 * @param key
-	 *            EclipseLink Key
-	 * @param newValue
-	 *            value to be associated with the key
-	 * @param allowDuplicate
-	 */
-	protected void putIntegerValue(String key, Integer newValue, boolean allowDuplicate) {
-		this.putIntegerValue(key, null, newValue, allowDuplicate);
-	}
-
-	/**
-	 * Put the given Integer value into the PersistenceXml.
-	 * @param key
-	 *            EclipseLink Key
-	 * @param keySuffix
-	 *            e.g. entity name
-	 * @param newValue
-	 *            value to be associated with the key
-	 * @param allowDuplicate
-	 */
-	protected void putIntegerValue(String key, String keySuffix, Integer newValue, boolean allowDuplicate) {
-		String elKey = (keySuffix == null) ? key : key + keySuffix;
-		String elValue = (newValue == null) ? null : newValue.toString();
-		this.getPersistenceUnit().setProperty(elKey, elValue, allowDuplicate);
-	}
-
-	// ****** Boolean convenience methods ******* 
-	/**
-	 * Returns the Boolean value of the given Property from the PersistenceXml.
-	 */
-	// TOREVIEW - handle incorrect eclipseLinkValue String in
-	// persistence.xml
-	protected Boolean getBooleanValue(String elKey) {
-		PersistenceUnit.Property p = this.getPersistenceUnit().getProperty(elKey);
-		return (p == null) ? null : getBooleanValueOf(p.getValue());
-	}
-
-	protected Boolean getBooleanValue(String key, String keySuffix) {
-		return this.getBooleanValue((keySuffix == null) ? key : key + keySuffix);
-	}
-
-	/**
-	 * Put the given Boolean value into the PersistenceXml.
-	 * @param key
-	 *            EclipseLink Key
-	 * @param newValue
-	 *            value to be associated with the key
-	 */
-	protected void putBooleanValue(String key, Boolean newValue) {
-		this.putBooleanValue(key, null, newValue, false);
-	}
-
-	/**
-	 * Put the given Boolean value into the PersistenceXml.
-	 * @param key
-	 *            EclipseLink Key
-	 * @param newValue
-	 *            value to be associated with the key
-	 * @param allowDuplicate
-	 */
-	protected void putBooleanValue(String key, Boolean newValue, boolean allowDuplicate) {
-		this.putBooleanValue(key, null, newValue, allowDuplicate);
-	}
-
-	/**
-	 * Put the given Boolean value into the PersistenceXml.
-	 * @param key
-	 *            EclipseLink Key
-	 * @param keySuffix
-	 *            e.g. entity name
-	 * @param newValue
-	 *            value to be associated with the key
-	 * @param allowDuplicate
-	 */
-	protected void putBooleanValue(String key, String keySuffix, Boolean newValue, boolean allowDuplicate) {
-		String elKey = (keySuffix == null) ? key : key + keySuffix;
-		String elValue = (newValue == null) ? null : newValue.toString();
-		this.getPersistenceUnit().setProperty(elKey, elValue, allowDuplicate);
-	}
-
-	// ****** Enum convenience methods ******* 
-	/**
-	 * Returns the Enum value of the given Property from the PersistenceXml.
-	 */
-	// TOREVIEW - handle incorrect eclipseLinkValue String in persistence.xml
-	protected <T extends Enum<T>> T getEnumValue(String elKey, T[] enumValues) {
-		PersistenceUnit.Property p = this.getPersistenceUnit().getProperty(elKey);
-		return (p == null) ? null : getEnumValueOf(p.getValue(), enumValues);
-	}
-
-	protected <T extends Enum<T>> T getEnumValue(String key, String keySuffix, T[] enumValues) {
-		return this.getEnumValue((keySuffix == null) ? key : key + keySuffix, enumValues);
-	}
-
-	/**
-	 * Put the given Enum value into the PersistenceXml.
-	 * 
-	 * @param key -
-	 *            EclipseLink Key
-	 */
-	protected <T extends Enum<T>> void putEnumValue(String key, T newValue) {
-		this.putEnumValue(key, null, newValue, false);
-	}
-
-	protected <T extends Enum<T>> void putEnumValue(String key, T newValue, boolean allowDuplicate) {
-		this.putEnumValue(key, null, newValue, allowDuplicate);
-	}
-
-	protected <T extends Enum<T>> void putEnumValue(String key, String keySuffix, T newValue, boolean allowDuplicate) {
-		String elKey = (keySuffix == null) ? key : key + keySuffix;
-		this.getPersistenceUnit().setProperty(elKey, getEclipseLinkStringValueOf(newValue), allowDuplicate);
-	}
-
-	// ******** Convenience methods ********
-	/**
-	 * Put into persistenceUnit properties.
-	 * 
-	 * @param key -
-	 *            property name
-	 * @param value -
-	 *            property value
-	 */
-	protected void putProperty(String key, Object value) {
-		putProperty(key, value, false);
-	}
-	
-	@SuppressWarnings("unchecked")
-	protected void putProperty(String key, Object value, boolean allowDuplicates) {
-		String elKey = this.eclipseLinkKeyFor(key);
-		if ((value != null) && value.getClass().isEnum()) {
-			this.putEnumValue(elKey, (Enum) value, allowDuplicates);
-		} else {
-			this.putEclipseLinkProperty(elKey, value, allowDuplicates);
-		}
-	}
-
-	private void putEclipseLinkProperty(String key, Object value, boolean allowDuplicates) {
-		String string = (value == null) ? null : value.toString();
-		this.getPersistenceUnit().setProperty(key, string, allowDuplicates);
-	}
-
-	/**
-	 * Removes a persistenceUnit property.
-	 * 
-	 * @param key -
-	 *            property name
-	 * @param value -
-	 *            property value
-	 */
-	protected void removeProperty(String key, String value) {
-		String elKey = this.eclipseLinkKeyFor(key);
-		
-		this.getPersistenceUnit().removeProperty(elKey, value);
-	}
-
-	protected Set<PersistenceUnit.Property> getPropertiesSetWithPrefix(String keyPrefix) {
-		return CollectionTools.set(this.getPersistenceUnit().propertiesWithNamePrefix(keyPrefix));
-	}
-
-	/**
-	 * Extracts the entityName of the specified property name. If the property name
-	 * has no suffix, return an empty string.
-	 */
-	protected String getEntityName(PersistenceUnit.Property property) {
-		return getEntityName(property.getName());
-	}
-
-	/**
-	 * Extracts the entityName of the specified string. If the string
-	 * has no suffix, return an empty string.
-	 */
-	protected String getEntityName(String propertyName) {
-		int index = propertyName.lastIndexOf('.');
-		if (index == -1) {
-			return ""; //$NON-NLS-1$
-		}
-		return propertyName.substring(index + 1);
-	}
-
-	// ****** Static methods ******* 
-	/**
-	 * Returns the EclipseLink string value for the given property value.
-	 */
-	public static String getEclipseLinkStringValueOf(Object value) {
-		if (value == null) {
-			return null;
-		}
-		if (value.getClass().isEnum()) {
-			return (String) ClassTools.staticFieldValue(value.getClass(), value.toString().toUpperCase());
-		}
-		return value.toString();
-	}
-
-	/**
-	 * Returns the enum constant of the specified enum type with the specified
-	 * EclipseLink value string.
-	 */
-	public static <T extends Enum<T>> T getEnumValueOf(String elStringValue, T[] enumValues) {
-		for (T enumValue : enumValues) {
-			if (getEclipseLinkStringValueOf(enumValue).equals(elStringValue)) {
-				return enumValue;
-			}
-		}
-		return null;
-	}
-
-	public static Boolean getBooleanValueOf(String elStringValue) {
-		if (elStringValue == null) {
-			return null;
-		}
-		return Boolean.valueOf(elStringValue);
-	}
-
-	public static Integer getIntegerValueOf(String elStringValue) {
-		if (elStringValue == null) {
-			return null;
-		}
-		return Integer.valueOf(elStringValue);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/PersistenceUnitProperties.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/PersistenceUnitProperties.java
deleted file mode 100644
index 91da757676..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/PersistenceUnitProperties.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2007, 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.eclipselink.core.internal.context.persistence;
-
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-
-/**
- * PersistenceUnitProperties
- */
-public interface PersistenceUnitProperties extends Model, PropertyChangeListener
-{
-	/**
-	 * Method used for identifying the given property.
-	 */
-	boolean itemIsProperty(PersistenceUnit.Property item);
-
-	/**
-	 * Returns the property name used for change notification of the given property.
-	 */
-	String propertyIdFor(PersistenceUnit.Property property);
-	
-	/**
-	 * Return the PersistenceUnit of this Properties.
-	 */
-	PersistenceUnit getPersistenceUnit();
-	
-	/**
-	 * Return the JPA project the PersistenceUnit belongs to.
-	 */
-	JpaProject getJpaProject();
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/PersistenceUnitPropertyListListener.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/PersistenceUnitPropertyListListener.java
deleted file mode 100644
index d59816b5d1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/PersistenceUnitPropertyListListener.java
+++ /dev/null
@@ -1,112 +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.eclipselink.core.internal.context.persistence;
-
-import java.util.Iterator;
-
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-
-/**
- * PersistenceUnitPropertyListListener Notifies the given parent when a change
- * occured in JPT PersistenceUnit properties
- */
-public class PersistenceUnitPropertyListListener implements ListChangeListener
-{
-	private PersistenceUnitProperties parent;
-
-	// ********** constructors / initialization **********
-	public PersistenceUnitPropertyListListener(PersistenceUnitProperties parent) {
-		this.parent = parent;
-	}
-
-	// ********** Behavior **********
-	protected boolean add(PersistenceUnit.Property newItem, Model source) {
-		if (this.model().itemIsProperty(newItem)) {
-			String propertyName = this.model().propertyIdFor(newItem);
-			this.model().propertyChanged(
-				new PropertyChangeEvent(source, propertyName, null, newItem));
-			return true;
-		}
-		return false;
-	}
-
-	protected boolean remove(PersistenceUnit.Property item, Model source) {
-		if (this.model().itemIsProperty(item)) {
-			String propertyName = this.model().propertyIdFor(item);
-			this.model().propertyChanged(
-				new PropertyChangeEvent(source, propertyName, item, null)); // oldItem is the removed property
-			return true;
-		}
-		return false;
-	}
-
-	// replace
-	protected PersistenceUnit.Property set(PersistenceUnit.Property newItem, Model source) {
-		if (this.model().itemIsProperty(newItem)) {
-			String propertyName = this.model().propertyIdFor(newItem);
-			this.model().propertyChanged(
-				new PropertyChangeEvent(source, propertyName, null, newItem)); // oldItem unknown
-			return newItem;
-		}
-		return null;
-	}
-
-	// ********** ListChangeListener implementation **********
-	public void itemsAdded(ListChangeEvent e) {
-		for (Iterator<PersistenceUnit.Property> stream = this.items(e); stream.hasNext();) {
-			this.add(stream.next(), e.getSource());
-		}
-	}
-
-	public void itemsRemoved(ListChangeEvent e) {
-		for (Iterator<PersistenceUnit.Property> stream = this.items(e); stream.hasNext();) {
-			this.remove(stream.next(), e.getSource());
-		}
-	}
-
-	public void itemsReplaced(ListChangeEvent e) {
-		// ItemAspectListValueModelAdapter(270) does not provide old value
-		for (Iterator<PersistenceUnit.Property> newStream = this.items(e); newStream.hasNext();) {
-			this.set(newStream.next(), e.getSource());
-		}
-	}
-
-	public void itemsMoved(ListChangeEvent e) {
-		throw new UnsupportedOperationException("source: " + e.getSource() + " - aspect: " + e.getAspectName());
-	}
-
-	public void listCleared(ListChangeEvent e) {
-		throw new UnsupportedOperationException("source: " + e.getSource() + " - aspect: " + e.getAspectName());
-	}
-
-	public void listChanged(ListChangeEvent e) {
-		throw new UnsupportedOperationException("source: " + e.getSource() + " - aspect: " + e.getAspectName());
-	}
-
-	// ********** standard methods **********
-	@Override
-	public String toString() {
-		return this.getClass().getSimpleName() + "( " + this.model().getClass().getSimpleName() + ")";
-	}
-
-	// ********** internal methods **********
-	private PersistenceUnitProperties model() {
-		return this.parent;
-	}
-
-	@SuppressWarnings("unchecked")
-	private Iterator<PersistenceUnit.Property> items(ListChangeEvent event) {
-		return (Iterator<PersistenceUnit.Property>) event.items();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/caching/CacheProperties.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/caching/CacheProperties.java
deleted file mode 100644
index c06dec92e8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/caching/CacheProperties.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching;
-
-import java.io.Serializable;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * CacheProperties
- */
-public class CacheProperties implements Cloneable, Serializable
-{
-	private String entityName;
-
-	// ********** EclipseLink properties **********
-	private CacheType type;
-	private Integer size;
-	private Boolean isShared;
-
-	private static final long serialVersionUID = 1L;
-
-	// ********** constructors **********
-	public CacheProperties(String entityName) {
-		this.entityName = entityName;
-	}
-
-	// ********** behaviors **********
-	@Override
-	public boolean equals(Object o) {
-		if(o == null) {
-			return false;
-		}
-		CacheProperties cache = (CacheProperties) o;
-		return (
-			(this.type == null ?
-				cache.type == null : this.type.equals(cache.type)) &&
-			(this.isShared == null ?
-				cache.isShared == null : this.isShared.equals(cache.isShared)) &&
-			(this.size == null ?
-				cache.size == null : this.size.equals(cache.size)));
-	}
-	
-	 @Override
-	 public synchronized CacheProperties clone() {
-		 try {
-			 return (CacheProperties)super.clone();
-		 }
-		 catch (CloneNotSupportedException ex) {
-			 throw new InternalError();
-		 }
-	 }
-
-	public boolean isEmpty() {
-		return (this.type == null) &&
-					(this.size == null) &&
-					(this.isShared == null);
-	}
-
-	// ********** getter/setter **********
-	public String getEntityName() {
-		return entityName;
-	}
-
-	public CacheType getType() {
-		return this.type;
-	}
-
-	public void setType(CacheType cacheType) {
-		this.type = cacheType;
-	}
-
-	public Integer getSize() {
-		return this.size;
-	}
-
-	public void setSize(Integer cacheSize) {
-		this.size = cacheSize;
-	}
-
-	public Boolean isShared() {
-		return this.isShared;
-	}
-
-	public void setShared(Boolean isShared) {
-		this.isShared = isShared;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		StringTools.buildSimpleToStringOn(this, sb);
-		sb.append(" (");
-		this.toString(sb);
-		sb.append(')');
-		return sb.toString();
-	}
-
-	public void toString(StringBuilder sb) {
-		sb.append("type: ");
-		sb.append(this.type);
-		sb.append(", size: ");
-		sb.append(this.size);
-		sb.append(", isShared: ");
-		sb.append(this.isShared);
-		sb.append(", entityName: ");
-		sb.append(this.entityName);
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/caching/CacheType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/caching/CacheType.java
deleted file mode 100644
index 0c66da4968..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/caching/CacheType.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/caching/Caching.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/caching/Caching.java
deleted file mode 100644
index 820a530938..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/caching/Caching.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.eclipselink.core.internal.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 getCacheType(String entityName);
-	void setCacheType(CacheType cacheType, String entityName);
-		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 getCacheSize(String entityName);
-	void setCacheSize(Integer cacheSize, String entityName);
-		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 getSharedCache(String entityName);
-	void setSharedCache(Boolean sharedCache, String entityName);
-		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;
-
-
-	ListIterator<String> entities();
-	int entitiesSize();
-	boolean entityExists(String entity);
-	String addEntity(String entity);
-	void removeEntity(String entity);
-		String ENTITIES_LIST_PROPERTY = "entities"; //$NON-NLS-1$
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/caching/EclipseLinkCaching.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/caching/EclipseLinkCaching.java
deleted file mode 100644
index c1fd79a847..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/caching/EclipseLinkCaching.java
+++ /dev/null
@@ -1,523 +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.eclipselink.core.internal.context.persistence.caching;
-
-import java.util.HashMap;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Set;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnitProperties;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * 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;
-
-	// key = Entity name ; value = Cache properties
-	private Map<String, CacheProperties> entitiesCacheProperties;
-	
-	// ********** constructors **********
-	public EclipseLinkCaching(PersistenceUnit parent, ListValueModel<PersistenceUnit.Property> propertyListAdapter) {
-		super(parent, propertyListAdapter);
-	}
-
-	// ********** initialization **********
-	/**
-	 * Initializes properties with values from the persistence unit.
-	 */
-	@Override
-	protected void initializeProperties() {
-		// TOREVIEW - handle incorrect String in persistence.xml
-		this.entitiesCacheProperties = 
-			new HashMap<String, CacheProperties>();
-		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> properties) {
-		for (PersistenceUnit.Property property : properties) {
-			String entityName = this.getEntityName(property);
-			CacheType cacheType = getEnumValueOf(property.getValue(), CacheType.values());
-			this.setCacheType_(cacheType, entityName);
-		}
-	}
-
-	private void initializeEntitiesCacheSize(Set<PersistenceUnit.Property> properties) {
-		for (PersistenceUnit.Property property : properties) {
-			String entityName = this.getEntityName(property);
-			this.setCacheSize_(property, entityName);
-		}
-	}
-
-	private void initializeEntitiesSharedCache(Set<PersistenceUnit.Property> properties) {
-		for (PersistenceUnit.Property property : properties) {
-			String entityName = this.getEntityName(property);
-			this.setSharedCache_(property, entityName);
-		}
-	}
-
-	// ********** behavior **********
-	/**
-	 * 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 propertyIdFor(PersistenceUnit.Property property) {
-		try {
-			return super.propertyIdFor(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());
-	}
-
-	public void propertyChanged(PropertyChangeEvent event) {
-		String aspectName = event.getAspectName();
-		if (aspectName.equals(CACHE_TYPE_DEFAULT_PROPERTY)) {
-			this.cacheTypeDefaultChanged(event);
-		}
-		else if (aspectName.equals(CACHE_SIZE_DEFAULT_PROPERTY)) {
-			this.cacheSizeDefaultChanged(event);
-		}
-		else if (aspectName.equals(SHARED_CACHE_DEFAULT_PROPERTY)) {
-			this.sharedCacheDefaultChanged(event);
-		}
-		else if (aspectName.equals(CACHE_TYPE_PROPERTY)) {
-			this.cacheTypeChanged(event);
-		}
-		else if (aspectName.equals(CACHE_SIZE_PROPERTY)) {
-			this.cacheSizeChanged(event);
-		}
-		else if (aspectName.equals(SHARED_CACHE_PROPERTY)) {
-			this.sharedCacheChanged(event);
-		}
-		else if (aspectName.equals(FLUSH_CLEAR_CACHE_PROPERTY)) {
-			this.flushClearCacheChanged(event);
-		}
-		else {
-			throw new IllegalArgumentException("Illegal event received - property not applicable: " + aspectName);
-		}
-		return;
-	}
-
-	// ********** CacheType **********
-	public CacheType getCacheType(String entityName) {
-		CacheProperties cache = this.cachePropertiesOf(entityName);
-		return (cache == null) ? null : cache.getType();
-	}
-
-	public void setCacheType(CacheType newCacheType, String entityName) {
-		CacheProperties old = this.setCacheType_(newCacheType, entityName);
-		this.putEnumValue(ECLIPSELINK_CACHE_TYPE, entityName, newCacheType, false);
-		this.firePropertyChanged(CACHE_TYPE_PROPERTY, old, this.cachePropertiesOf(entityName));
-	}
-
-	private void cacheTypeChanged(PropertyChangeEvent event) {
-		PersistenceUnit.Property property = (PersistenceUnit.Property) event.getNewValue();
-		// property == null when removed
-		String entityName = (property == null) ? this.getEntityName((PersistenceUnit.Property) event.getOldValue()) : this.getEntityName(property);
-		CacheProperties old = this.setCacheType_(property, entityName);
-		this.firePropertyChanged(event.getAspectName(), old, this.cachePropertiesOf(entityName));
-	}
-
-	public CacheType getDefaultCacheType() {
-		return (this.cacheTypeDefault == null) ? DEFAULT_CACHE_TYPE : this.cacheTypeDefault;
-	}
-
-	// ********** CacheSize **********
-	public Integer getCacheSize(String entityName) {
-		CacheProperties cache = this.cachePropertiesOf(entityName);
-		return (cache == null) ? null : cache.getSize();
-	}
-
-	public void setCacheSize(Integer newCacheSize, String entityName) {
-		CacheProperties old = this.setCacheSize_(newCacheSize, entityName);
-		this.putIntegerValue(ECLIPSELINK_CACHE_SIZE + entityName, newCacheSize);
-		this.firePropertyChanged(CACHE_SIZE_PROPERTY, old, this.cachePropertiesOf(entityName));
-	}
-
-	private void cacheSizeChanged(PropertyChangeEvent event) {
-		PersistenceUnit.Property property = (PersistenceUnit.Property) event.getNewValue();
-		// property == null when removed
-		String entityName = (property == null) ? this.getEntityName((PersistenceUnit.Property) event.getOldValue()) : this.getEntityName(property);
-		CacheProperties old = this.setCacheSize_(property, entityName);
-		this.firePropertyChanged(event.getAspectName(), old, this.cachePropertiesOf(entityName));
-	}
-
-	public Integer getDefaultCacheSize() {
-		return (this.cacheSizeDefault == null) ? DEFAULT_CACHE_SIZE : this.cacheSizeDefault;
-	}
-
-	// ********** SharedCache **********
-	public Boolean getSharedCache(String entityName) {
-		CacheProperties cache = this.cachePropertiesOf(entityName);
-		return (cache == null) ? null : cache.isShared();
-	}
-
-	public void setSharedCache(Boolean newSharedCache, String entityName) {
-		CacheProperties old = this.setSharedCache_(newSharedCache, entityName);
-		this.putBooleanValue(ECLIPSELINK_SHARED_CACHE, entityName, newSharedCache, false);
-		this.firePropertyChanged(SHARED_CACHE_PROPERTY, old, this.cachePropertiesOf(entityName));
-	}
-
-	private void sharedCacheChanged(PropertyChangeEvent event) {
-		String entityName;
-		PersistenceUnit.Property newProperty = (PersistenceUnit.Property) event.getNewValue();
-		// property == null when removed
-		entityName = (newProperty == null) ? 
-			this.getEntityName((PersistenceUnit.Property) event.getOldValue()) : this.getEntityName(newProperty);
-		CacheProperties old = this.setSharedCache_(newProperty, entityName);
-		this.firePropertyChanged(event.getAspectName(), old, this.cachePropertiesOf(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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		CacheType newValue = getEnumValueOf(stringValue, CacheType.values());
-		CacheType old = this.cacheTypeDefault;
-		this.cacheTypeDefault = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Integer newValue = getIntegerValueOf(stringValue);
-		Integer old = this.cacheSizeDefault;
-		this.cacheSizeDefault = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.sharedCacheDefault;
-		this.sharedCacheDefault = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		FlushClearCache newValue = getEnumValueOf(stringValue, FlushClearCache.values());
-		FlushClearCache old = this.flushClearCache;
-		this.flushClearCache = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-	
-	public FlushClearCache getDefaultFlushClearCache() {
-		return DEFAULT_FLUSH_CLEAR_CACHE;
-	}
-
-	// ****** CacheProperties *******
-	/**
-	 * Convenience method to update the CacheType in entitiesCache map. Returns
-	 * the old value of CacheProperties
-	 */
-	private CacheProperties setCacheType_(PersistenceUnit.Property newProperty, String entityName) {
-		String stringValue = (newProperty == null) ? null : newProperty.getValue();
-		CacheType newValue = getEnumValueOf(stringValue, CacheType.values());
-		return this.setCacheType_(newValue, entityName);
-	}
-
-	private CacheProperties setCacheType_(CacheType newValue, String entityName) {
-		CacheProperties properties = this.cachePropertiesOf(entityName);
-		CacheProperties old = properties.clone();
-		properties.setType(newValue);
-		this.putEntityCacheProperties(entityName, properties);
-		return old;
-	}
-
-	/**
-	 * Convenience method to update the CacheSize in entitiesCache map. Returns
-	 * the old value of CacheProperties
-	 */
-	private CacheProperties setCacheSize_(PersistenceUnit.Property newProperty, String entityName) {
-		String stringValue = (newProperty == null) ? null : newProperty.getValue();
-		Integer newValue = getIntegerValueOf(stringValue);
-		return this.setCacheSize_(newValue, entityName);
-	}
-
-	private CacheProperties setCacheSize_(Integer newValue, String entityName) {
-		CacheProperties properties = this.cachePropertiesOf(entityName);
-		CacheProperties old = properties.clone();
-		properties.setSize(newValue);
-		this.putEntityCacheProperties(entityName, properties);
-		return old;
-	}
-
-	/**
-	 * Convenience method to update the SharedCache in entitiesCacheProperties map.
-	 * Returns the old value of CacheProperties
-	 */
-	private CacheProperties setSharedCache_(PersistenceUnit.Property newProperty, String entityName) {
-		String newValue = (newProperty == null) ? null : newProperty.getValue();
-		return this.setSharedCache_(newValue, entityName);
-	}
-
-	private CacheProperties setSharedCache_(String newString, String entityName) {
-		Boolean newValue = getBooleanValueOf(newString);
-		return setSharedCache_(newValue, entityName);
-	}
-
-	private CacheProperties setSharedCache_(Boolean newValue, String entityName) {
-		CacheProperties properties = this.cachePropertiesOf(entityName);
-		CacheProperties old = properties.clone();
-		properties.setShared(newValue);
-		this.putEntityCacheProperties(entityName, properties);
-		return old;
-	}
-
-	/**
-	 * Returns the CacheProperties of the Entity with the given name.
-	 */
-	private CacheProperties cachePropertiesOf(String entityName) {
-		CacheProperties properties = this.entitiesCacheProperties.get(entityName);
-		if (properties == null) {
-			properties = new CacheProperties(entityName);
-		}
-		return properties;
-	}
-
-	/**
-	 * Set all CacheProperties to default.
-	 */
-	private void clearCacheProperties(String entityName) {
-		this.setCacheType(null, entityName);
-		this.setCacheSize(null, entityName);
-		this.setSharedCache(null, entityName);
-	}
-
-	// ****** convenience methods *******
-
-	/**
-	 * Put the given Entity CacheProperties in this entitiesCacheProperties map.
-	 * @param entityName - Entity name. The entity may be a new or an existing entity.
-	 * @param properties - Entity CacheProperties
-	 */
-	private void putEntityCacheProperties(String entityName, CacheProperties properties) {
-		this.addOrReplacePropertiesForEntity(entityName, properties);
-	}
-
-	// ****** entities list *******
-
-	public ListIterator<String> entities() {
-		return CollectionTools.list(this.entitiesCacheProperties.keySet()).listIterator();
-	}
-
-	public int entitiesSize() {
-		return this.entitiesCacheProperties.size();
-	}
-
-	/* 
-	 * Verifies if this entitiesCacheProperties map contains the given Entity. 
-	 */
-	public boolean entityExists(String entity) {
-		return this.entitiesCacheProperties.containsKey(entity);
-	}
-
-	public String addEntity(String entity) {
-		if (entityExists(entity)) {
-			throw new IllegalStateException("Entity " + entity + " already exist.");
-		}
-		return this.addOrReplacePropertiesForEntity(entity, new CacheProperties(entity));
-	}
-
-	/**
-	 * Adds or replaces the given Entity CacheProperties in this
-	 * entitiesCacheProperties map. 
-	 * If the specified Entity exists and the given CacheProperties is empty 
-	 * (i.e. all properties are null) the mapping will be removed from the map.
-	 * 
-	 * @param entity - Entity name
-	 * @param properties - Entity CacheProperties
-	 * @return Entity name added
-	 */
-	private String addOrReplacePropertiesForEntity(String entity, CacheProperties properties) {
-		if (this.entityExists(entity)) {
-			this.replaceEntity_(entity, properties);
-			return null;
-		}
-		this.entitiesCacheProperties.put(entity, properties);
-		this.fireListChanged(ENTITIES_LIST_PROPERTY);
-		return entity;
-	}
-
-	/**
-	 * Replaces the given Entity CacheProperties in this
-	 * entitiesCacheProperties map.
-	 * If the given Entity CacheProperties is empty (i.e. all properties are null) the 
-	 * mapping will be removed from the map.
-	 * @param entity - Entity name
-	 * @param properties - Entity CacheProperties
-	 * @return Entity name replaced
-	 */
-	private CacheProperties replaceEntity_(String entity, CacheProperties properties) {
-		CacheProperties old = this.entitiesCacheProperties.get(entity);
-		if (properties.isEmpty()) {
-			this.entitiesCacheProperties.remove(entity);
-			this.fireListChanged(ENTITIES_LIST_PROPERTY);
-		}
-		else {
-			this.entitiesCacheProperties.put(entity, properties);
-		}
-		return old;
-	}
-
-	public void removeEntity(String entity) {
-		if ( ! this.entityExists(entity)) {
-			return;
-		}
-		this.clearCacheProperties(entity);
-		this.entitiesCacheProperties.remove(entity);
-		this.fireListChanged(ENTITIES_LIST_PROPERTY);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/caching/FlushClearCache.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/caching/FlushClearCache.java
deleted file mode 100644
index c29a27f718..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/caching/FlushClearCache.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/connection/BatchWriting.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/connection/BatchWriting.java
deleted file mode 100644
index 5494a1a31f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/connection/BatchWriting.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/connection/Connection.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/connection/Connection.java
deleted file mode 100644
index 22de7dacab..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/connection/Connection.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection;
-
-import org.eclipse.jpt.core.context.persistence.PersistenceUnitTransactionType;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.PersistenceUnitProperties;
-
-/**
- *  Connection
- */
-public interface Connection extends PersistenceUnitProperties
-{
-	PersistenceUnitTransactionType getDefaultTransactionType();
-	PersistenceUnitTransactionType getTransactionType();
-	void setTransactionType(PersistenceUnitTransactionType newTransactionType);
-		// PersistenceUnit property
-		static final String TRANSACTION_TYPE_PROPERTY = "transactionType"; //$NON-NLS-1$
-		static final PersistenceUnitTransactionType DEFAULT_TRANSACTION_TYPE = PersistenceUnitTransactionType.JTA;
-
-	String getDefaultJtaDataSource();
-	String getJtaDataSource();
-	void setJtaDataSource(String newJtaDataSource);
-		// PersistenceUnit property
-		static final String JTA_DATA_SOURCE_PROPERTY = "jtaDataSource"; //$NON-NLS-1$
-		static final String DEFAULT_JTA_DATA_SOURCE = ""; //$NON-NLS-1$
-
-	String getDefaultNonJtaDataSource();
-	String getNonJtaDataSource();
-	void setNonJtaDataSource(String newNonJtaDataSource);
-		// PersistenceUnit property
-		static final String NON_JTA_DATA_SOURCE_PROPERTY = "nonJtaDataSource"; //$NON-NLS-1$
-		static final String DEFAULT_NON_JTA_DATA_SOURCE = ""; //$NON-NLS-1$
-
-	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);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/connection/EclipseLinkConnection.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/connection/EclipseLinkConnection.java
deleted file mode 100644
index bbe7b49c0a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/connection/EclipseLinkConnection.java
+++ /dev/null
@@ -1,654 +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.eclipselink.core.internal.context.persistence.connection;
-
-import java.util.Map;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnitTransactionType;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnitProperties;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- *  EclipseLinkConnection
- */
-public class EclipseLinkConnection extends EclipseLinkPersistenceUnitProperties
-	implements Connection
-{
-	// ********** PersistenceUnit properties **********
-	private PersistenceUnitTransactionType transactionType;
-	private String jtaDataSource;
-	private String nonJtaDataSource;
-	
-	// ********** EclipseLink properties **********
-	private BatchWriting batchWriting;
-	private Boolean nativeSql;
-	private Boolean cacheStatements;
-	private Integer cacheStatementsSize;
-	private String driver;
-	private String url;
-	private String user;
-	private String password;
-	private Boolean bindParameters;
-	private Boolean readConnectionsShared;
-	private Integer readConnectionsMin;
-	private Integer readConnectionsMax;
-	private Integer writeConnectionsMin;
-	private Integer writeConnectionsMax;
-	
-
-	// ********** constructors **********
-	public EclipseLinkConnection(PersistenceUnit parent, ListValueModel<PersistenceUnit.Property> propertyListAdapter) {
-		super(parent, propertyListAdapter);
-	}
-
-	// ********** initialization **********
-	/**
-	 * Initializes properties with values from the persistence unit.
-	 */
-	@Override
-	protected void initializeProperties() {
-		// TOREVIEW - handle incorrect String in persistence.xml
-		this.transactionType = 
-			this.getPersistenceUnit().getSpecifiedTransactionType();
-		this.jtaDataSource = 
-			this.getPersistenceUnit().getJtaDataSource();
-		this.nonJtaDataSource = 
-			this.getPersistenceUnit().getNonJtaDataSource();
-		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.driver = 
-			this.getStringValue(ECLIPSELINK_DRIVER);
-		this.url = 
-			this.getStringValue(ECLIPSELINK_URL);
-		this.user = 
-			this.getStringValue(ECLIPSELINK_USER);
-		this.password = 
-			this.getStringValue(ECLIPSELINK_PASSWORD);
-		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);
-		
-	}
-
-	/**
-	 * Initialize and add listeners to the persistence unit.
-	 */
-	@Override
-	protected void initialize(PersistenceUnit parent, ListValueModel<PersistenceUnit.Property> propertyListAdapter) {
-		super.initialize(parent, propertyListAdapter);
-
-		this.getPersistenceUnit().addPropertyChangeListener(
-			PersistenceUnit.SPECIFIED_TRANSACTION_TYPE_PROPERTY, 
-			this.buildTransactionTypeChangeListener());
-		this.getPersistenceUnit().addPropertyChangeListener(
-			PersistenceUnit.JTA_DATA_SOURCE_PROPERTY,
-			this.buildJtaDataSourceChangeListener());
-		this.getPersistenceUnit().addPropertyChangeListener(
-			PersistenceUnit.NON_JTA_DATA_SOURCE_PROPERTY,
-			this.buildNonJtaDataSourceChangeListener());
-	}
-
-	// ********** behavior **********
-	/**
-	 * 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_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_DRIVER,
-			DRIVER_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_URL,
-			URL_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_USER,
-			USER_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_PASSWORD,
-			PASSWORD_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);
-	}
-
-	public void propertyChanged(PropertyChangeEvent event) {
-		String aspectName = event.getAspectName();
-		if (aspectName.equals(NATIVE_SQL_PROPERTY)) {
-			this.nativeSqlChanged(event);
-		}
-		 else if (aspectName.equals(BATCH_WRITING_PROPERTY)) {
-			this.batchWritingChanged(event);
-		}
-		 else if (aspectName.equals(CACHE_STATEMENTS_PROPERTY)) {
-			 this.cacheStatementsChanged(event);
-		 }
-		 else if (aspectName.equals(DRIVER_PROPERTY)) {
-			 this.driverChanged(event);
-		 }
-		 else if (aspectName.equals(URL_PROPERTY)) {
-			 this.urlChanged(event);
-		 }
-		 else if (aspectName.equals(USER_PROPERTY)) {
-			 this.userChanged(event);
-		 }
-		 else if (aspectName.equals(PASSWORD_PROPERTY)) {
-			 this.passwordChanged(event);
-		 }
-		 else if (aspectName.equals(BIND_PARAMETERS_PROPERTY)) {
-			 this.bindParametersChanged(event);
-		 }
-		 else if (aspectName.equals(READ_CONNECTIONS_SHARED_PROPERTY)) {
-			 this.readConnectionsSharedChanged(event);
-		 }
-		 else if (aspectName.equals(CACHE_STATEMENTS_SIZE_PROPERTY)) {
-			 this.cacheStatementsSizeChanged(event);
-		 }
-		 else if (aspectName.equals(READ_CONNECTIONS_MIN_PROPERTY)) {
-			 this.readConnectionsMinChanged(event);
-		 }
-		 else if (aspectName.equals(READ_CONNECTIONS_MAX_PROPERTY)) {
-			 this.readConnectionsMaxChanged(event);
-		 }
-		 else if (aspectName.equals(WRITE_CONNECTIONS_MIN_PROPERTY)) {
-			 this.writeConnectionsMinChanged(event);
-		 }
-		 else if (aspectName.equals(WRITE_CONNECTIONS_MAX_PROPERTY)) {
-			 this.writeConnectionsMaxChanged(event);
-		 }
-	}
-
-	// ********** TransactionType **********
-	
-	public PersistenceUnitTransactionType getTransactionType() {
-		return this.transactionType;
-	}
-	
-	public void setTransactionType(PersistenceUnitTransactionType newTransactionType) {
-		PersistenceUnitTransactionType old = this.transactionType;
-		this.transactionType = newTransactionType;
-		
-		this.getPersistenceUnit().setSpecifiedTransactionType( newTransactionType);
-		this.firePropertyChanged(TRANSACTION_TYPE_PROPERTY, old, newTransactionType);
-	}
-
-	private void transactionTypeChanged(PropertyChangeEvent event) {
-		PersistenceUnitTransactionType newValue = (PersistenceUnitTransactionType) event.getNewValue();
-		PersistenceUnitTransactionType old = this.transactionType;
-		this.transactionType = newValue;
-		this.firePropertyChanged(TRANSACTION_TYPE_PROPERTY, old, newValue);
-	}
-	
-	public PersistenceUnitTransactionType getDefaultTransactionType() {
-		return DEFAULT_TRANSACTION_TYPE;
-	}
-
-	protected PropertyChangeListener buildTransactionTypeChangeListener() {
-		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent event) {
-				EclipseLinkConnection.this.transactionTypeChanged(event);
-			}
-		};
-	}
-
-	// ********** JtaDataSource **********
-	
-	public String getJtaDataSource() {
-		return this.jtaDataSource;
-	}
-	
-	public void setJtaDataSource(String newJtaDataSource) {
-		String old = this.jtaDataSource;
-		this.jtaDataSource = newJtaDataSource;
-		
-		this.getPersistenceUnit().setJtaDataSource( newJtaDataSource);
-		this.firePropertyChanged(JTA_DATA_SOURCE_PROPERTY, old, newJtaDataSource);
-	}
-
-	private void jtaDataSourceChanged(PropertyChangeEvent event) {
-		String newValue = (String) event.getNewValue();
-		String old = this.jtaDataSource;
-		this.jtaDataSource = newValue;
-		this.firePropertyChanged(JTA_DATA_SOURCE_PROPERTY, old, newValue);
-	}
-	
-	public String getDefaultJtaDataSource() {
-		return DEFAULT_JTA_DATA_SOURCE;
-	}
-
-	protected PropertyChangeListener buildJtaDataSourceChangeListener() {
-		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent event) {
-				EclipseLinkConnection.this.jtaDataSourceChanged(event);
-			}
-		};
-	}
-
-	// ********** NonJtaDataSource **********
-	
-	public String getNonJtaDataSource() {
-		return this.nonJtaDataSource;
-	}
-	
-	public void setNonJtaDataSource(String newNonJtaDataSource) {
-		String old = this.nonJtaDataSource;
-		this.nonJtaDataSource = newNonJtaDataSource;
-		
-		this.getPersistenceUnit().setNonJtaDataSource( newNonJtaDataSource);
-		this.firePropertyChanged(NON_JTA_DATA_SOURCE_PROPERTY, old, newNonJtaDataSource);
-	}
-
-	private void nonJtaDataSourceChanged(PropertyChangeEvent event) {
-		String newValue = (String) event.getNewValue();
-		String old = this.nonJtaDataSource;
-		this.nonJtaDataSource = newValue;
-		this.firePropertyChanged(NON_JTA_DATA_SOURCE_PROPERTY, old, newValue);
-	}
-	
-	public String getDefaultNonJtaDataSource() {
-		return DEFAULT_NON_JTA_DATA_SOURCE;
-	}
-
-	protected PropertyChangeListener buildNonJtaDataSourceChangeListener() {
-		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent event) {
-				EclipseLinkConnection.this.nonJtaDataSourceChanged(event);
-			}
-		};
-	}
-
-	// ********** NativeSql **********
-	public Boolean getNativeSql() {
-		return this.nativeSql;
-	}
-
-	public void setNativeSql(Boolean newNativeSql) {
-		Boolean old = this.nativeSql;
-		this.nativeSql = newNativeSql;
-		this.putProperty(NATIVE_SQL_PROPERTY, newNativeSql);
-		this.firePropertyChanged(NATIVE_SQL_PROPERTY, old, newNativeSql);
-	}
-
-	private void nativeSqlChanged(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.nativeSql;
-		this.nativeSql = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public Boolean getDefaultNativeSql() {
-		return DEFAULT_NATIVE_SQL;
-	}
-
-	// ********** BatchWriting **********
-	
-	public BatchWriting getBatchWriting() {
-		return this.batchWriting;
-	}
-	
-	public void setBatchWriting(BatchWriting newBatchWriting) {
-		BatchWriting old = this.batchWriting;
-		this.batchWriting = newBatchWriting;
-		this.putProperty(BATCH_WRITING_PROPERTY, newBatchWriting);
-		this.firePropertyChanged(BATCH_WRITING_PROPERTY, old, newBatchWriting);
-	}
-
-	private void batchWritingChanged(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		BatchWriting newValue = getEnumValueOf(stringValue, BatchWriting.values());
-		BatchWriting old = this.batchWriting;
-		this.batchWriting = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-	
-	public BatchWriting getDefaultBatchWriting() {
-		return DEFAULT_BATCH_WRITING;
-	}
-
-	// ********** CacheStatements **********
-	public Boolean getCacheStatements() {
-		return this.cacheStatements;
-	}
-
-	public void setCacheStatements(Boolean newCacheStatements) {
-		Boolean old = this.cacheStatements;
-		this.cacheStatements = newCacheStatements;
-		this.putProperty(CACHE_STATEMENTS_PROPERTY, newCacheStatements);
-		this.firePropertyChanged(CACHE_STATEMENTS_PROPERTY, old, newCacheStatements);
-	}
-
-	private void cacheStatementsChanged(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.cacheStatements;
-		this.cacheStatements = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public Boolean getDefaultCacheStatements() {
-		return DEFAULT_CACHE_STATEMENTS;
-	}
-
-	// ********** CacheStatementsSize **********
-	public Integer getCacheStatementsSize() {
-		return this.cacheStatementsSize;
-	}
-
-	public void setCacheStatementsSize(Integer newCacheStatementsSize) {
-		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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Integer newValue = getIntegerValueOf(stringValue);
-		
-		Integer old = this.cacheStatementsSize;
-		this.cacheStatementsSize = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public Integer getDefaultCacheStatementsSize() {
-		return DEFAULT_CACHE_STATEMENTS_SIZE;
-	}
-
-	// ********** Driver **********
-	public String getDriver() {
-		return this.driver;
-	}
-
-	public void setDriver(String newDriver) {
-		String old = this.driver;
-		this.driver = newDriver;
-		this.putProperty(DRIVER_PROPERTY, newDriver);
-		this.firePropertyChanged(DRIVER_PROPERTY, old, newDriver);
-	}
-
-	private void driverChanged(PropertyChangeEvent event) {
-		String newValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		String old = this.driver;
-		this.driver = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public String getDefaultDriver() {
-		return DEFAULT_DRIVER;
-	}
-
-	// ********** URL **********
-	public String getUrl() {
-		return this.url;
-	}
-
-	public void setUrl(String newUrl) {
-		String old = this.url;
-		this.url = newUrl;
-		this.putProperty(URL_PROPERTY, newUrl);
-		this.firePropertyChanged(URL_PROPERTY, old, newUrl);
-	}
-
-	private void urlChanged(PropertyChangeEvent event) {
-		String newValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		String old = this.url;
-		this.url = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public String getDefaultUrl() {
-		return DEFAULT_URL;
-	}
-
-	// ********** User **********
-	public String getUser() {
-		return this.user;
-	}
-
-	public void setUser(String newUser) {
-		String old = this.user;
-		this.user = newUser;
-		this.putProperty(USER_PROPERTY, newUser);
-		this.firePropertyChanged(USER_PROPERTY, old, newUser);
-	}
-
-	private void userChanged(PropertyChangeEvent event) {
-		String newValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		String old = this.user;
-		this.user = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public String getDefaultUser() {
-		return DEFAULT_USER;
-	}
-
-	// ********** Password **********
-	public String getPassword() {
-		return this.password;
-	}
-
-	public void setPassword(String newPassword) {
-		String old = this.password;
-		this.password = newPassword;
-		this.putProperty(PASSWORD_PROPERTY, newPassword);
-		this.firePropertyChanged(PASSWORD_PROPERTY, old, newPassword);
-	}
-
-	private void passwordChanged(PropertyChangeEvent event) {
-		String newValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		String old = this.password;
-		this.password = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public String getDefaultPassword() {
-		return DEFAULT_PASSWORD;
-	}
-
-	// ********** BindParameters **********
-	public Boolean getBindParameters() {
-		return this.bindParameters;
-	}
-
-	public void setBindParameters(Boolean newBindParameters) {
-		Boolean old = this.bindParameters;
-		this.bindParameters = newBindParameters;
-		this.putProperty(BIND_PARAMETERS_PROPERTY, newBindParameters);
-		this.firePropertyChanged(BIND_PARAMETERS_PROPERTY, old, newBindParameters);
-	}
-
-	private void bindParametersChanged(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.bindParameters;
-		this.bindParameters = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public Boolean getDefaultBindParameters() {
-		return DEFAULT_BIND_PARAMETERS;
-	}
-
-	// ********** ReadConnectionsShared **********
-	public Boolean getReadConnectionsShared() {
-		return this.readConnectionsShared;
-	}
-
-	public void setReadConnectionsShared(Boolean newReadConnectionsShared) {
-		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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.readConnectionsShared;
-		this.readConnectionsShared = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public Boolean getDefaultReadConnectionsShared() {
-		return DEFAULT_READ_CONNECTIONS_SHARED;
-	}
-
-	// ********** ReadConnectionsMin **********
-	public Integer getReadConnectionsMin() {
-		return this.readConnectionsMin;
-	}
-
-	public void setReadConnectionsMin(Integer newReadConnectionsMin) {
-		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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Integer newValue = getIntegerValueOf(stringValue);
-		
-		Integer old = this.readConnectionsMin;
-		this.readConnectionsMin = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public Integer getDefaultReadConnectionsMin() {
-		return DEFAULT_READ_CONNECTIONS_MIN;
-	}
-
-	// ********** ReadConnectionsMax **********
-	public Integer getReadConnectionsMax() {
-		return this.readConnectionsMax;
-	}
-
-	public void setReadConnectionsMax(Integer newReadConnectionsMax) {
-		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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Integer newValue = getIntegerValueOf(stringValue);
-		
-		Integer old = this.readConnectionsMax;
-		this.readConnectionsMax = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public Integer getDefaultReadConnectionsMax() {
-		return DEFAULT_READ_CONNECTIONS_MAX;
-	}
-
-	// ********** WriteConnectionsMin **********
-	public Integer getWriteConnectionsMin() {
-		return this.writeConnectionsMin;
-	}
-
-	public void setWriteConnectionsMin(Integer newWriteConnectionsMin) {
-		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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Integer newValue = getIntegerValueOf(stringValue);
-		
-		Integer old = this.writeConnectionsMin;
-		this.writeConnectionsMin = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public Integer getDefaultWriteConnectionsMin() {
-		return DEFAULT_WRITE_CONNECTIONS_MIN;
-	}
-
-	// ********** WriteConnectionsMax **********
-	public Integer getWriteConnectionsMax() {
-		return this.writeConnectionsMax;
-	}
-
-	public void setWriteConnectionsMax(Integer newWriteConnectionsMax) {
-		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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Integer newValue = getIntegerValueOf(stringValue);
-		
-		Integer old = this.writeConnectionsMax;
-		this.writeConnectionsMax = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public Integer getDefaultWriteConnectionsMax() {
-		return DEFAULT_WRITE_CONNECTIONS_MAX;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/Customization.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/Customization.java
deleted file mode 100644
index 9b16b72172..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/Customization.java
+++ /dev/null
@@ -1,131 +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.eclipselink.core.internal.context.persistence.customization;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnitProperties;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.PersistenceUnitProperties;
-
-/**
- *  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 getDescriptorCustomizer(String entityName);
-	void setDescriptorCustomizer(String newDescriptorCustomizer, String entityName);
-		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
-
-	ListIterator<String> sessionCustomizers();
-	int sessionCustomizersSize();
-	boolean sessionCustomizerExists(String sessionCustomizerClassName);
-	String addSessionCustomizer(String newSessionCustomizerClassName);
-	void removeSessionCustomizer(String sessionCustomizerClassName);
-		static final String SESSION_CUSTOMIZER_LIST_PROPERTY = "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$
-
-	ListIterator<String> entities();
-	int entitiesSize();
-	boolean entityExists(String entity);
-	String addEntity(String entity);
-	void removeEntity(String entity);
-		static final String ENTITIES_LIST_PROPERTY = "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 = 
-			EclipseLinkPersistenceUnitProperties.getEclipseLinkStringValueOf(Profiler.no_profiler);
-		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$
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/CustomizerProperties.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/CustomizerProperties.java
deleted file mode 100644
index def82d949d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/CustomizerProperties.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization;
-
-import java.io.Serializable;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * CustomizerProperties
- */
-public class CustomizerProperties implements Cloneable, Serializable
-{
-	private String entityName;
-
-	// ********** EclipseLink properties **********
-	private String className;
-
-	private static final long serialVersionUID = 1L;
-
-	// ********** constructors **********
-	public CustomizerProperties(String entityName) {
-		this.entityName = entityName;
-	}
-
-	// ********** behaviors **********
-	@Override
-	public boolean equals(Object o) {
-		if(o == null) {
-			return false;
-		}
-		CustomizerProperties customizer = (CustomizerProperties) o;
-		return (
-			(this.className == null ?
-				customizer.className == null : this.className.equals(customizer.className)));
-	}
-	
-	 @Override
-	 public synchronized CustomizerProperties clone() {
-		 try {
-			 return (CustomizerProperties)super.clone();
-		 }
-		 catch (CloneNotSupportedException ex) {
-			 throw new InternalError();
-		 }
-	 }
-
-	public boolean isEmpty() {
-		return this.className == null;
-	}
-
-	// ********** getter/setter **********
-	public String getEntityName() {
-		return this.entityName;
-	}
-
-	public String getClassName() {
-		return this.className;
-	}
-
-	public void setClassName(String newClassName) {
-		this.className = newClassName;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		StringTools.buildSimpleToStringOn(this, sb);
-		sb.append(" (");
-		this.toString(sb);
-		sb.append(')');
-		return sb.toString();
-	}
-
-	public void toString(StringBuilder sb) {
-		sb.append(" class: ");
-		sb.append(this.className);
-		sb.append(", entityName: ");
-		sb.append(this.entityName);
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/EclipseLinkCustomization.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/EclipseLinkCustomization.java
deleted file mode 100644
index a3949376ef..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/EclipseLinkCustomization.java
+++ /dev/null
@@ -1,736 +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.eclipselink.core.internal.context.persistence.customization;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Set;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnitProperties;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- *  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 ArrayList<String> sessionCustomizers;
-	private String profiler; // storing EclipseLinkStringValue since value can be Profiler or custom class
-	private String exceptionHandler;
-
-	// key = Entity name ; value = Customizer properties
-	private Map<String, CustomizerProperties> entitiesCustomizerProperties;
-	
-	// ********** constructors **********
-	public EclipseLinkCustomization(PersistenceUnit parent, ListValueModel<PersistenceUnit.Property> propertyListAdapter) {
-		super(parent, propertyListAdapter);
-	}
-
-	// ********** initialization **********
-	/**
-	 * Initializes properties with values from the persistence unit.
-	 */
-	@Override
-	protected void initializeProperties() {
-		// TOREVIEW - handle incorrect String in persistence.xml
-		this.entitiesCustomizerProperties = 
-			new HashMap<String, CustomizerProperties>();
-
-		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.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() {
-		Set<PersistenceUnit.Property> properties = 
-			this.getPropertiesSetWithPrefix(ECLIPSELINK_SESSION_CUSTOMIZER);
-		
-		this.sessionCustomizers = new ArrayList<String>(properties.size());
-		this.initializeSessionCustomizersWith(properties);
-	}
-
-	private void initializeSessionCustomizersWith(Set<PersistenceUnit.Property> properties) {
-		for (PersistenceUnit.Property property : properties) {
-			this.sessionCustomizers.add(property.getValue());
-		}
-	}
-
-	private void initializeEntitiesCustomizerClass(Set<PersistenceUnit.Property> properties) {
-		for (PersistenceUnit.Property property : properties) {
-			String entityName = this.getEntityName(property);
-			this.setCustomizerClass_(property, entityName);
-		}
-	}
-
-	/**
-	 * 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 : getEclipseLinkStringValueOf(standardProfiler);
-	}
-
-	// ********** behavior **********
-	/**
-	 * 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_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 propertyIdFor(PersistenceUnit.Property property) {
-		try {
-			return super.propertyIdFor(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 void propertyChanged(PropertyChangeEvent event) {
-		String aspectName = event.getAspectName();
-		if (aspectName.equals(THROW_EXCEPTIONS_PROPERTY)) {
-			this.throwExceptionsChanged(event);
-		}
-		else if (aspectName.equals(WEAVING_PROPERTY)) {
-			this.weavingChanged(event);
-		}
-		else if (aspectName.equals(WEAVING_LAZY_PROPERTY)) {
-			this.weavingLazyChanged(event);
-		}
-		else if (aspectName.equals(WEAVING_CHANGE_TRACKING_PROPERTY)) {
-			this.weavingChangeTrackingChanged(event);
-		}
-		else if (aspectName.equals(WEAVING_FETCH_GROUPS_PROPERTY)) {
-			this.weavingFetchGroupsChanged(event);
-		}
-		else if (aspectName.equals(WEAVING_INTERNAL_PROPERTY)) {
-			this.weavingInternalChanged(event);
-		}
-		else if (aspectName.equals(WEAVING_EAGER_PROPERTY)) {
-			this.weavingEagerChanged(event);
-		}
-		else if (aspectName.equals(VALIDATION_ONLY_PROPERTY)) {
-			this.validationOnlyChanged(event);
-		}
-		else if (aspectName.equals(SESSION_CUSTOMIZER_PROPERTY)) {
-			this.sessionCustomizersChanged(event);
-		}
-		else if (aspectName.equals(DESCRIPTOR_CUSTOMIZER_PROPERTY)) {
-			this.descriptorCustomizerChanged(event);
-		}
-		else if (aspectName.equals(PROFILER_PROPERTY)) {
-			this.profilerChanged(event);
-		}
-		else if (aspectName.equals(EXCEPTION_HANDLER_PROPERTY)) {
-			this.exceptionHandlerChanged(event);
-		}
-		else {
-			throw new IllegalArgumentException("Illegal event received - property not applicable: " + aspectName); //$NON-NLS-1$
-		}
-		return;
-	}
-
-	
-	// ********** 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.throwExceptions;
-		this.throwExceptions = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.weavingLazy;
-		this.weavingLazy = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.weavingChangeTracking;
-		this.weavingChangeTracking = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.weavingFetchGroups;
-		this.weavingFetchGroups = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.weavingInternal;
-		this.weavingInternal = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.weavingEager;
-		this.weavingEager = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.validationOnly;
-		this.validationOnly = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public Boolean getDefaultValidationOnly() {
-		return DEFAULT_VALIDATION_ONLY;
-	}
-
-	// ********** SessionCustomizers **********
-	public ListIterator<String> sessionCustomizers(){
-		return new CloneListIterator<String>(this.sessionCustomizers);
-	}
-	
-	public int sessionCustomizersSize(){
-		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.sessionCustomizers.add(newSessionCustomizerClassName);
-			this.putProperty(SESSION_CUSTOMIZER_PROPERTY, newSessionCustomizerClassName, true);
-			this.fireListChanged(SESSION_CUSTOMIZER_LIST_PROPERTY);
-			return newSessionCustomizerClassName;
-		}
-		return null;
-	}
-	
-	public void removeSessionCustomizer(String className){
-
-		if(this.removeSessionCustomizer_(className) != null) {
-			this.removeProperty(SESSION_CUSTOMIZER_PROPERTY, className);
-			this.fireListChanged(SESSION_CUSTOMIZER_LIST_PROPERTY);
-		}
-	}
-	
-	private String removeSessionCustomizer_(String className){
-
-		for ( ListIterator<String> i = this.sessionCustomizers(); i.hasNext();) {
-			String sessionCustomizer = i.next();
-			if(sessionCustomizer.equals(className)) {
-				this.sessionCustomizers.remove(sessionCustomizer);
-				return sessionCustomizer;
-			}
-		}
-		return null;
-	}
-
-	private void sessionCustomizersChanged(@SuppressWarnings("unused") PropertyChangeEvent event) {
-
-		this.initializeSessionCustomizersFromPersistenceUnit();
-		this.fireListChanged(SESSION_CUSTOMIZER_LIST_PROPERTY);
-	}
-
-	// ********** 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Weaving newValue = getEnumValueOf(stringValue, Weaving.values());
-		Weaving old = this.weaving;
-		this.weaving = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String newValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		String old = this.exceptionHandler;
-		this.exceptionHandler = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public String getDefaultExceptionHandler() {
-		return DEFAULT_EXCEPTION_HANDLER;
-	}
-
-	// ********** DescriptorCustomizer **********
-	
-	public String getDescriptorCustomizer(String entityName) {
-		CustomizerProperties customizer = this.customizerPropertiesOf(entityName);
-		return (customizer == null) ? null : customizer.getClassName();
-	}
-	
-	public void setDescriptorCustomizer(String newDescriptorCustomizer, String entityName) {
-		CustomizerProperties old = this.setCustomizerClass_(newDescriptorCustomizer, entityName);
-		this.putStringValue(ECLIPSELINK_DESCRIPTOR_CUSTOMIZER, entityName, newDescriptorCustomizer, false);
-		this.firePropertyChanged(DESCRIPTOR_CUSTOMIZER_PROPERTY, old, this.customizerPropertiesOf(entityName));
-	}
-
-	private void descriptorCustomizerChanged(PropertyChangeEvent event) {
-		String entityName;
-		PersistenceUnit.Property newProperty = (PersistenceUnit.Property) event.getNewValue();
-		// property == null when removed
-		entityName = (newProperty == null) ? 
-			this.getEntityName((PersistenceUnit.Property) event.getOldValue()) : this.getEntityName(newProperty);
-		CustomizerProperties old = this.setCustomizerClass_(newProperty, entityName);
-		this.firePropertyChanged(event.getAspectName(), old, this.customizerPropertiesOf(entityName));
-	}
-	
-	public String getDefaultDescriptorCustomizer() {
-		return DEFAULT_DESCRIPTOR_CUSTOMIZER;
-	}
-
-
-	// ****** CustomizerProperties *******
-
-	/**
-	 * Convenience method to update the CustomizerClass in entitiesCustomizerProperties map.
-	 * Returns the old value of CustomizerProperties
-	 */
-	private CustomizerProperties setCustomizerClass_(PersistenceUnit.Property newProperty, String entityName) {
-		String newValue = (newProperty == null) ? null : newProperty.getValue();
-		return this.setCustomizerClass_(newValue, entityName);
-	}
-
-	private CustomizerProperties setCustomizerClass_(String newValue, String entityName) {
-		CustomizerProperties properties = this.customizerPropertiesOf(entityName);
-		CustomizerProperties old = properties.clone();
-		properties.setClassName(newValue);
-		this.putEntityCustomizerProperties(entityName, properties);
-		return old;
-	}
-
-	/**
-	 * Returns the CustomizerProperties of the Entity with the given name.
-	 */
-	private CustomizerProperties customizerPropertiesOf(String entityName) {
-		CustomizerProperties properties = this.entitiesCustomizerProperties.get(entityName);
-		if (properties == null) {
-			properties = new CustomizerProperties(entityName);
-		}
-		return properties;
-	}
-
-	/**
-	 * Set all CustomizerProperties to default.
-	 */
-	private void clearCustomizerProperties(String entityName) {
-		this.setDescriptorCustomizer(null, entityName);
-	}
-
-	// ****** convenience methods *******
-	/**
-	 * Put the given Entity CustomizerProperties in this entitiesCustomizerProperties map.
-	 * @param entityName - Entity name. The entity may be a new or an existing entity.
-	 * @param properties - Entity CustomizerProperties
-	 */
-	private void putEntityCustomizerProperties(String entityName, CustomizerProperties properties) {
-		this.addOrReplacePropertiesForEntity(entityName, properties);
-	}
-	
-
-
-	// ****** entities list *******
-	
-	public ListIterator<String> entities() {
-		return CollectionTools.list(this.entitiesCustomizerProperties.keySet()).listIterator();
-	}
-
-	public int entitiesSize() {
-		return this.entitiesCustomizerProperties.size();
-	}
-
-	/* 
-	 * Verifies if this entitiesCacheProperties map contains the given Entity. 
-	 */
-	public boolean entityExists(String entity) {
-		return this.entitiesCustomizerProperties.containsKey(entity);
-	}
-
-	public String addEntity(String entity) {
-		if (entityExists(entity)) {
-			throw new IllegalStateException("Entity already exists: " + entity); //$NON-NLS-1$
-		}
-		return this.addOrReplacePropertiesForEntity(entity, new CustomizerProperties(entity));
-	}
-
-	/**
-	 * Adds or Replaces the given Entity CustomizerProperties in 
-	 * this entitiesCustomizerProperties map.
-	 * If the specified Entity exists and the given CustomizerProperties is empty 
-	 * (i.e. all properties are null) the mapping will be removed from the map.
-	 * @param entity - Entity name
-	 * @param properties - Entity CustomizerProperties
-	 * @return
-	 */
-	private String addOrReplacePropertiesForEntity(String entity, CustomizerProperties properties) {
-		if (entityExists(entity)) {
-			this.replaceEntity_(entity, properties);
-			return null;
-		}
-		this.entitiesCustomizerProperties.put(entity, properties);
-		this.fireListChanged(ENTITIES_LIST_PROPERTY);
-		return entity;
-	}
-
-	/**
-	 * Replaces the given Entity CustomizerProperties in this
-	 * entitiesCustomizerProperties map.
-	 * If the Entity CustomizerProperties is empty (i.e. all properties is null) the 
-	 * mapping will be removed from the map.
-	 * @param entity - Entity name
-	 * @param properties - Entity CustomizerProperties
-	 * @return
-	 */
-	private CustomizerProperties replaceEntity_(String entity, CustomizerProperties properties) {
-		CustomizerProperties old = this.entitiesCustomizerProperties.get(entity);
-		if (properties.isEmpty()) {
-			this.entitiesCustomizerProperties.remove(entity);
-			this.fireListChanged(ENTITIES_LIST_PROPERTY);
-		}
-		else {
-			this.entitiesCustomizerProperties.put(entity, properties);
-		}
-		return old;
-	}
-
-	public void removeEntity(String entity) {
-		if ( ! entityExists(entity)) {
-			return;
-		}
-		this.clearCustomizerProperties(entity);
-		this.entitiesCustomizerProperties.remove(entity);
-		this.fireListChanged(ENTITIES_LIST_PROPERTY);
-	}
-
-	// ********** 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_(getEclipseLinkStringValueOf(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(PropertyChangeEvent event) {
-		String newValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		String old = this.profiler;
-		this.profiler = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public String getDefaultProfiler() {
-		return DEFAULT_PROFILER;
-	}
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/Profiler.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/Profiler.java
deleted file mode 100644
index 903b09ac97..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/Profiler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/Weaving.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/Weaving.java
deleted file mode 100644
index 0ecfedfdd2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/Weaving.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/general/EclipseLinkGeneralProperties.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/general/EclipseLinkGeneralProperties.java
deleted file mode 100644
index dbcf4bfb3a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/general/EclipseLinkGeneralProperties.java
+++ /dev/null
@@ -1,95 +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.eclipselink.core.internal.context.persistence.general;
-
-import java.util.Map;
-
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnitProperties;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- *  EclipseLinkGeneralProperties
- */
-public class EclipseLinkGeneralProperties extends EclipseLinkPersistenceUnitProperties
-	implements GeneralProperties
-{
-	// ********** EclipseLink properties **********
-	private Boolean excludeEclipselinkOrm;
-
-	// ********** constructors **********
-	public EclipseLinkGeneralProperties(PersistenceUnit parent, ListValueModel<PersistenceUnit.Property> propertyListAdapter) {
-		super(parent, propertyListAdapter);
-	}
-
-	// ********** initialization **********
-	/**
-	 * Initializes properties with values from the persistence unit.
-	 */
-	@Override
-	protected void initializeProperties() {
-		
-		this.excludeEclipselinkOrm = 
-			this.getBooleanValue(ECLIPSELINK_EXCLUDE_ECLIPSELINK_ORM);
-	}
-
-
-	// ********** behavior **********
-	/**
-	 * 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);
-	}
-
-	public void propertyChanged(PropertyChangeEvent event) {
-		String aspectName = event.getAspectName();
-		if (aspectName.equals(EXCLUDE_ECLIPSELINK_ORM_PROPERTY)) {
-			this.excludeEclipselinkOrmChanged(event);
-		}
-		else {
-			throw new IllegalArgumentException("Illegal event received - property not applicable: " + aspectName); //$NON-NLS-1$
-		}
-		return;
-	}
-
-	
-	// ********** 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.excludeEclipselinkOrm;
-		this.excludeEclipselinkOrm = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public Boolean getDefaultExcludeEclipselinkOrm() {
-		return DEFAULT_EXCLUDE_ECLIPSELINK_ORM;
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/general/GeneralProperties.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/general/GeneralProperties.java
deleted file mode 100644
index ebc2927942..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/general/GeneralProperties.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.persistence.general;
-
-import org.eclipse.jpt.eclipselink.core.internal.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/logging/EclipseLinkLogging.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/logging/EclipseLinkLogging.java
deleted file mode 100644
index 3a3cf744e8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/logging/EclipseLinkLogging.java
+++ /dev/null
@@ -1,344 +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.eclipselink.core.internal.context.persistence.logging;
-
-import java.util.Map;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnitProperties;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- *  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, ListValueModel<PersistenceUnit.Property> propertyListAdapter) {
-		super(parent, propertyListAdapter);
-	}
-
-	// ********** 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 : getEclipseLinkStringValueOf(standardLogger);
-	}
-
-	// ********** behavior **********
-	/**
-	 * 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);
-	}
-
-	public void propertyChanged(PropertyChangeEvent event) {
-		String aspectName = event.getAspectName();
-		if (aspectName.equals(LEVEL_PROPERTY)) {
-			this.levelChanged(event);
-		}
-		else if (aspectName.equals(TIMESTAMP_PROPERTY)) {
-			this.timestampChanged(event);
-		}
-		else if (aspectName.equals(THREAD_PROPERTY)) {
-			this.threadChanged(event);
-		}
-		else if (aspectName.equals(SESSION_PROPERTY)) {
-			this.sessionChanged(event);
-		}
-		else if (aspectName.equals(EXCEPTIONS_PROPERTY)) {
-			this.exceptionsChanged(event);
-		}
-		else if (aspectName.equals(LOG_FILE_LOCATION_PROPERTY)) {
-			this.logFileLocationChanged(event);
-		}
-		else if (aspectName.equals(LOGGER_PROPERTY)) {
-			this.loggerChanged(event);
-		}
-		else {
-			throw new IllegalArgumentException("Illegal event received - property not applicable: " + aspectName); //$NON-NLS-1$
-		}
-		return;
-	}
-
-	// ********** 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		LoggingLevel newValue = getEnumValueOf(stringValue, LoggingLevel.values());
-		LoggingLevel old = this.level;
-		this.level = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.timestamp;
-		this.timestamp = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.thread;
-		this.thread = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.session;
-		this.session = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.exceptions;
-		this.exceptions = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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 = newLogFileLocation;
-		this.putProperty(LOG_FILE_LOCATION_PROPERTY, newLogFileLocation);
-		this.firePropertyChanged(LOG_FILE_LOCATION_PROPERTY, old, newLogFileLocation);
-	}
-
-	private void logFileLocationChanged(PropertyChangeEvent event) {
-		String newValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		String old = this.logFileLocation;
-		this.logFileLocation = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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_(getEclipseLinkStringValueOf(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(PropertyChangeEvent event) {
-		String newValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		String old = this.logger;
-		this.logger = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public String getDefaultLogger() {
-		return DEFAULT_LOGGER;
-	}
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/logging/Logger.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/logging/Logger.java
deleted file mode 100644
index 63b2c6065e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/logging/Logger.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/logging/Logging.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/logging/Logging.java
deleted file mode 100644
index 45084c8826..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/logging/Logging.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging;
-
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnitProperties;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.PersistenceUnitProperties;
-
-/**
- * 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 = 
-			EclipseLinkPersistenceUnitProperties.getEclipseLinkStringValueOf(Logger.default_logger);
-		String ECLIPSELINK_LOGGER_CLASS_NAME = "org.eclipse.persistence.logging.SessionLog"; //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/logging/LoggingLevel.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/logging/LoggingLevel.java
deleted file mode 100644
index 015885836b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/logging/LoggingLevel.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/EclipseLinkOptions.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/EclipseLinkOptions.java
deleted file mode 100644
index 2a805c6103..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/EclipseLinkOptions.java
+++ /dev/null
@@ -1,384 +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.eclipselink.core.internal.context.persistence.options;
-
-import java.util.Map;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnitProperties;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- *  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, ListValueModel<PersistenceUnit.Property> propertyListAdapter) {
-		super(parent, propertyListAdapter);
-	}
-
-	// ********** 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 : getEclipseLinkStringValueOf(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 : getEclipseLinkStringValueOf(standardTargetServer);
-	}
-
-	// ********** behavior **********
-	/**
-	 * 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);
-	}
-
-	public void propertyChanged(PropertyChangeEvent event) {
-		String aspectName = event.getAspectName();
-		if (aspectName.equals(SESSION_NAME_PROPERTY)) {
-			this.sessionNameChanged(event);
-		}
-		else if (aspectName.equals(SESSIONS_XML_PROPERTY)) {
-			this.sessionsXmlChanged(event);
-		}
-		else if (aspectName.equals(TARGET_DATABASE_PROPERTY)) {
-			this.targetDatabaseChanged(event);
-		}
-		else if (aspectName.equals(TARGET_SERVER_PROPERTY)) {
-			this.targetServerChanged(event);
-		}
-		else if (aspectName.equals(SESSION_INCLUDE_DESCRIPTOR_QUERIES_PROPERTY)) {
-			this.includeDescriptorQueriesChanged(event);
-		}
-		else if (aspectName.equals(SESSION_EVENT_LISTENER_PROPERTY)) {
-			this.eventListenerChanged(event);
-		}
-		else if (aspectName.equals(TEMPORAL_MUTABLE_PROPERTY)) {
-			this.temporalMutableChanged(event);
-		}
-		else {
-			throw new IllegalArgumentException("Illegal event received - property not applicable: " + aspectName); //$NON-NLS-1$
-		}
-		return;
-	}
-
-	// ********** 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(PropertyChangeEvent event) {
-		String newValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		String old = this.sessionName;
-		this.sessionName = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-			String newValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-			String old = this.sessionsXml;
-			this.sessionsXml = newValue;
-			this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.includeDescriptorQueries;
-		this.includeDescriptorQueries = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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_(getEclipseLinkStringValueOf(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(PropertyChangeEvent event) {
-		String newValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		String old = this.targetDatabase;
-		this.targetDatabase = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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_(getEclipseLinkStringValueOf(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(PropertyChangeEvent event) {
-		String newValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		String old = this.targetServer;
-		this.targetServer = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String newValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		String old = this.eventListener;
-		this.eventListener = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.temporalMutable;
-		this.temporalMutable = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-	
-	public Boolean getDefaultTemporalMutable() {
-		return DEFAULT_TEMPORAL_MUTABLE;
-	}
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/Options.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/Options.java
deleted file mode 100644
index 3b74a255af..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/Options.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.persistence.options;
-
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnitProperties;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.PersistenceUnitProperties;
-
-/**
- *  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 = 
-			EclipseLinkPersistenceUnitProperties.getEclipseLinkStringValueOf(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 = 
-			EclipseLinkPersistenceUnitProperties.getEclipseLinkStringValueOf(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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/TargetDatabase.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/TargetDatabase.java
deleted file mode 100644
index 9b7c64ee73..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/TargetDatabase.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/TargetServer.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/TargetServer.java
deleted file mode 100644
index e0ea2a033d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/TargetServer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/schema/generation/DdlGenerationType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/schema/generation/DdlGenerationType.java
deleted file mode 100644
index 6abdfc3f83..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/schema/generation/DdlGenerationType.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/schema/generation/EclipseLinkSchemaGeneration.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/schema/generation/EclipseLinkSchemaGeneration.java
deleted file mode 100644
index 24d4ef042f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/schema/generation/EclipseLinkSchemaGeneration.java
+++ /dev/null
@@ -1,220 +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.eclipselink.core.internal.context.persistence.schema.generation;
-
-import java.util.Map;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnitProperties;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * 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, ListValueModel<PersistenceUnit.Property> propertyListAdapter) {
-		super(parent, propertyListAdapter);
-	}
-
-	/**
-	 * 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 propertyChanged(PropertyChangeEvent event) {
-		String aspectName = event.getAspectName();
-		
-		if (aspectName.equals(OUTPUT_MODE_PROPERTY)) {
-			this.outputModeChanged(event);
-		}
-		else if (aspectName.equals(DDL_GENERATION_TYPE_PROPERTY)) {
-			this.ddlGenerationTypeChanged(event);
-		}
-		else if (aspectName.equals(CREATE_FILE_NAME_PROPERTY)) {
-			this.createFileNameChanged(event);
-		}
-		else if (aspectName.equals(DROP_FILE_NAME_PROPERTY)) {
-			this.dropFileNameChanged(event);
-		}
-		else if (aspectName.equals(APPLICATION_LOCATION_PROPERTY)) {
-			this.applicationLocationChanged(event);
-		}
-		else {
-			throw new IllegalArgumentException("Illegal event received - property not applicable: " + aspectName);
-		}
-		return;
-	}
-
-	// ********** 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		DdlGenerationType newValue = getEnumValueOf(stringValue, DdlGenerationType.values());
-		DdlGenerationType old = this.ddlGenerationType;
-		this.ddlGenerationType = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String stringValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		OutputMode newValue = getEnumValueOf(stringValue, OutputMode.values());
-		OutputMode old = this.outputMode;
-		this.outputMode = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String newValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		String old = this.createFileName;
-		this.createFileName = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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(PropertyChangeEvent event) {
-		String newValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		String old = this.dropFileName;
-		this.dropFileName = newValue;
-		this.firePropertyChanged(event.getAspectName(), 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 = newApplicationLocation;
-		this.putProperty(APPLICATION_LOCATION_PROPERTY, newApplicationLocation);
-		this.firePropertyChanged(APPLICATION_LOCATION_PROPERTY, old, newApplicationLocation);
-	}
-
-	private void applicationLocationChanged(PropertyChangeEvent event) {
-		String newValue = (event.getNewValue() == null) ? null : ((PersistenceUnit.Property) event.getNewValue()).getValue();
-		String old = this.applicationLocation;
-		this.applicationLocation = newValue;
-		this.firePropertyChanged(event.getAspectName(), old, newValue);
-	}
-
-	public String getDefaultApplicationLocation() {
-		return DEFAULT_SCHEMA_GENERATION_APPLICATION_LOCATION;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/schema/generation/OutputMode.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/schema/generation/OutputMode.java
deleted file mode 100644
index a8617da839..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/schema/generation/OutputMode.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/schema/generation/SchemaGeneration.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/schema/generation/SchemaGeneration.java
deleted file mode 100644
index 71604ba7e9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/schema/generation/SchemaGeneration.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation;
-
-import org.eclipse.jpt.eclipselink.core.internal.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.jdbc"; //$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.jdbc"; //$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 = "."; //$NON-NLS-1$
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/ddlgen/EclipseLinkDDLGenerator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/ddlgen/EclipseLinkDDLGenerator.java
deleted file mode 100644
index ddd011dd1f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/ddlgen/EclipseLinkDDLGenerator.java
+++ /dev/null
@@ -1,640 +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.eclipselink.core.internal.ddlgen;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-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.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.ILaunchesListener2;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jpt.core.JpaPlatform;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.internal.JptCoreMessages;
-import org.eclipse.jpt.db.ConnectionProfile;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.Logging;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.LoggingLevel;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.DdlGenerationType;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.OutputMode;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.SchemaGeneration;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.osgi.util.ManifestElement;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-/**
- *  EclipseLinkDLLGenerator launches the EclipseLink DDL generator in a separate VM.
- *  For this it will create a Java Configuration named "EclipseLink" 
- *  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.eclipselink.core.ddlgen.jar in ECLIPSE_HOME/plugins
- */
-public class EclipseLinkDDLGenerator
-{
-	static public String ECLIPSELINK_DDL_GEN_JAR_VERSION = "1.0.100";	//$NON-NLS-1$
-	static public String LAUNCH_CONFIG_NAME = "EclipseLink";   //$NON-NLS-1$
-	static public String DDL_GEN_PACKAGE_NAME = "org.eclipse.jpt.eclipselink.core.ddlgen";   //$NON-NLS-1$
-	static public String ECLIPSELINK_DDL_GEN_CLASS = DDL_GEN_PACKAGE_NAME + ".Main";	  //$NON-NLS-1$
-	static public String ECLIPSELINK_DDL_GEN_JAR = DDL_GEN_PACKAGE_NAME + "_";	//$NON-NLS-1$
-	static public String BUNDLE_CLASSPATH = "Bundle-ClassPath";	  //$NON-NLS-1$
-	static public String PROPERTIES_FILE_NAME = "login.properties";	  //$NON-NLS-1$
-	static public String PLUGINS_DIR = "plugins/";	  //$NON-NLS-1$
-	private IVMInstall jre;
-	private ILaunchConfigurationWorkingCopy launchConfig;
-	private ILaunch launch;
-	
-	private String puName;
-	private JpaProject jpaProject;
-	private String projectLocation;
-	private boolean isDebug = false;
-	
-	// ********** constructors **********
-	
-	public static void generate(String puName, JpaProject project, String projectLocation, IProgressMonitor monitor) {
-		if (puName == null || puName.length() == 0 || project == null) {
-			throw new NullPointerException();
-		}
-		new EclipseLinkDDLGenerator(puName, project, projectLocation, monitor).generate();
-	}
-
-	private EclipseLinkDDLGenerator(String puName, JpaProject jpaProject, String projectLocation, @SuppressWarnings("unused") IProgressMonitor monitor) {
-		super();
-		this.puName = puName;
-		this.jpaProject = jpaProject;
-		this.projectLocation = projectLocation;
-		this.initialize();
-	}
-
-	// ********** behavior **********
-	
-	protected void initialize() {
-		try {
-			this.jre = this.getProjectJRE();
-			if (this.jre == null) {
-				String message = "Could not identify the VM.";
-				throw new RuntimeException(message);
-			}
-			this.launchConfig = this.buildLaunchConfiguration();
-		} 
-		catch (CoreException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	protected void generate() {
-		this.preGenerate();
-		String propertiesFile  = this.projectLocation + "/" + PROPERTIES_FILE_NAME;
-		
-		this.initializeLaunchConfiguration(this.projectLocation, propertiesFile);
-
-		this.saveLoginProperties(this.projectLocation, propertiesFile);
-
-		this.addLaunchListener();
-		this.launch = this.saveAndLaunchConfig();
-	}
-	
-	private void initializeLaunchConfiguration(String projectLocation, String propertiesFile) {
-
-		this.specifyJRE(this.jre.getName(), this.jre.getVMInstallType().getId());
-		
-		this.specifyProject(this.jpaProject.getProject().getName()); 
-		this.specifyMainType(ECLIPSELINK_DDL_GEN_CLASS);	
-		
-		this.specifyProgramArguments(this.puName, propertiesFile);  // -pu & -p
-		this.specifyWorkingDir(projectLocation); 
-
-		this.specifyClasspathProperties(this.jpaProject, this.buildJdbcJarPath(), this.buildBootstrapJarPath());
-	}
-	
-	private void addLaunchListener() {
-
-		this.getLaunchManager().addLaunchListener(this.buildLaunchListener());
-	}
-	
-	protected void preGenerate() {
-		//disconnect since the runtime provider will need to connect to generate the tables
-		ConnectionProfile cp = this.jpaProject.getConnectionProfile();
-		if (cp != null) {
-			cp.disconnect();
-		}
-	}
-	
-	protected void postGenerate() {
-		try {
-			if ( ! this.isDebug) {
-				this.removeLaunchConfiguration(LAUNCH_CONFIG_NAME);
-			}
-		}
-		catch ( CoreException e) {
-			throw new RuntimeException(e);
-		}
-		//reconnect since we disconnected in preGenerate(), 
-		ConnectionProfile cp = this.jpaProject.getConnectionProfile();
-		if (cp != null) {
-			cp.connect();
-		}
-		
-		this.validateProject();
-	}
-
-	protected void validateProject() {
-		IProject project = this.jpaProject.getProject();
-		ValidateJob job = new ValidateJob(project);
-		job.setRule(project);
-		job.schedule();
-	}
-
-	/**
-	 * 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.jpaProject.getConnectionProfile();
-		return (cp == null) ? "" : cp.getDriverJarList(); //$NON-NLS-1$
-	}
-	
-	private IPath buildBootstrapJarPath() {
-		try {
-			File jarInstallDir = this.getBundleParentDir(JptEclipseLinkCorePlugin.PLUGIN_ID);
-
-			List<File> result = new ArrayList<File>();
-			this.findFile(ECLIPSELINK_DDL_GEN_JAR, jarInstallDir, result);
-			if (result.isEmpty()) {
-				throw new RuntimeException("Could not find: " + DDL_GEN_PACKAGE_NAME + ".jar in: " + jarInstallDir);
-			}
-			File ddlGenJarFile = result.get(0);
-			String ddlGenJarPath = ddlGenJarFile.getCanonicalPath();
-			return new Path(ddlGenJarPath);
-		}
-		catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private void findFile(String fileName, File directory, List<? super File> list) {
-		if(directory.listFiles() == null) {
-			throw new RuntimeException("Could not find directory: " + directory);
-		}
-		for (File file : directory.listFiles()) {
-			if (file.getName().startsWith(fileName)) {
-				list.add(file);
-			}
-			if (file.isDirectory()) {
-				this.findFile(fileName, file, list);
-			}
-		}
-	} 
-	
-	private File getBundleParentDir(String bundleName) throws IOException {
-
-		if (Platform.inDevelopmentMode()) {
-			Location eclipseHomeLoc = Platform.getInstallLocation();
-			String eclipseHome = eclipseHomeLoc.getURL().getPath();
-			if ( ! eclipseHome.endsWith(PLUGINS_DIR)) {
-				eclipseHome += PLUGINS_DIR;
-			}
-			return new File(eclipseHome);
-		}
-		Bundle bundle = Platform.getBundle(bundleName);
-		return FileLocator.getBundleFile(bundle).getParentFile();
-	}
-
-	private ILaunchesListener2 buildLaunchListener() {
-		return new ILaunchesListener2() {
-			
-			public void launchesTerminated(ILaunch[] launches) {
-				for (int i = 0; i < launches.length; i++) {
-					ILaunch launch = launches[i];
-					if (launch.equals(EclipseLinkDDLGenerator.this.getLaunch())) {
-
-						EclipseLinkDDLGenerator.this.postGenerate();
-						return;
-					}
-				}
-			}
-
-			public void launchesAdded(ILaunch[] launches) {
-				// not interested to this event
-			}
-
-			public void launchesChanged(ILaunch[] launches) {
-				// not interested to this event
-			}
-
-			public void launchesRemoved(ILaunch[] launches) {
-				// not interested to this event
-			}
-		};
-	}
-
-	// ********** Setting Launch Configuration **********
-	
-	private void specifyJRE(String jreName, String vmId) {
-
-		this.launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, jreName);
-		this.launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, vmId);
-	}
-	
-	private void specifyProject(String projectName) {
-
-		this.launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, projectName);
-	}
-	
-	private void specifyMainType(String mainType) {
-
-		this.launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, mainType);
-	}
-	
-	private void specifyProgramArguments(String puName, String propertiesPath) {
-
-		StringBuffer programArguments = new StringBuffer();
-		programArguments.append(this.buildPuNameArgument(puName));
-		programArguments.append(this.buildPropertiesFileArgument(propertiesPath));
-		programArguments.append(this.buildDebugArgument());
-		
-		this.launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, programArguments.toString());
-	}
-
-	private void specifyClasspathProperties(JpaProject project, IPath jdbcJar, IPath bootstrapJar)  {
-		List<String> classpath = new ArrayList<String>();
-		try {
-			// DDL_GEN jar
-			classpath.add(this.getArchiveClasspathEntry(bootstrapJar).getMemento());
-			// Default Project classpath
-			classpath.add(this.getDefaultProjectClasspathEntry(project.getJavaProject()).getMemento());
-			// Osgi Bundles
-			classpath.addAll(this.getPersistenceOsgiBundlesMemento());
-			// JDBC jar
-			classpath.add(this.getArchiveClasspathEntry(jdbcJar).getMemento());
-			// System Library  
-			classpath.add(this.getSystemLibraryClasspathEntry().getMemento());
-		}
-		catch (CoreException e) {
-			throw new RuntimeException("An error occurs generating a memento", e);
-		}
-		this.launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, classpath);
-		this.launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
-	}
-	
-	private void specifyWorkingDir(String projectLocation) {
-		
-		File workingDir = new Path(projectLocation).toFile();
-		this.launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, workingDir.getAbsolutePath());
-	}
-
-	// ********** ClasspathEntry **********
-	
-	private IRuntimeClasspathEntry getSystemLibraryClasspathEntry() throws CoreException {
-
-		IPath systemLibsPath = new Path(JavaRuntime.JRE_CONTAINER);
-		return JavaRuntime.newRuntimeContainerClasspathEntry(systemLibsPath, IRuntimeClasspathEntry.STANDARD_CLASSES);
-	}
-	
-	private IRuntimeClasspathEntry getDefaultProjectClasspathEntry(IJavaProject project) {
-
-		IRuntimeClasspathEntry projectEntry = JavaRuntime.newDefaultProjectClasspathEntry(project);
-		projectEntry.setClasspathProperty(IRuntimeClasspathEntry.USER_CLASSES);
-		
-		return projectEntry;
-	}
-	
-	private IRuntimeClasspathEntry getArchiveClasspathEntry(IPath archivePath) {
-
-		IRuntimeClasspathEntry archiveEntry = JavaRuntime.newArchiveRuntimeClasspathEntry(archivePath);
-		archiveEntry.setClasspathProperty(IRuntimeClasspathEntry.USER_CLASSES);
-		
-		return archiveEntry;
-	}
-	
-	private IRuntimeClasspathEntry getBundleClasspathEntry(String bundleId) {
-
-		IPath persistClasspath = this.getBundleClasspath(bundleId);
-		IRuntimeClasspathEntry bundleEntry = this.getArchiveClasspathEntry(persistClasspath);
-		
-		return bundleEntry;
-	}
-
-	// ********** LaunchConfig **********
-	
-	private ILaunch saveAndLaunchConfig() {
-		ILaunchConfiguration configuration = null;
-		ILaunch result = null;
-		try {
-			configuration = this.launchConfig.doSave();
-		}
-		catch (CoreException saveException) {
-			throw new RuntimeException("Could not save LaunchConfig", saveException);
-		}
-		 try {
-			result = configuration.launch(ILaunchManager.RUN_MODE, new NullProgressMonitor());
-		}
-		catch (CoreException lauchException) {
-			throw new RuntimeException("An error occured during launch", lauchException);
-		}
-		return result;
-	}
-
-	private ILaunchConfigurationWorkingCopy buildLaunchConfiguration() throws CoreException {
-		ILaunchConfigurationWorkingCopy launchConfig = null;
-		this.removeLaunchConfiguration( LAUNCH_CONFIG_NAME);
-
-		ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
-		ILaunchConfigurationType type = manager.getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-
-		launchConfig = type.newInstance(null, LAUNCH_CONFIG_NAME);
-		return launchConfig;
-	}
-
-	private void removeLaunchConfiguration(String launchConfigurationName) throws CoreException {
-
-		ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
-		ILaunchConfigurationType type = manager.getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-	
-		ILaunchConfiguration[] configurations = manager.getLaunchConfigurations(type);
-				for (int i = 0; i < configurations.length; i++) {
-			ILaunchConfiguration configuration = configurations[i];
-			if (configuration.getName().equals(launchConfigurationName)) {
-				configuration.delete();
-				break;
-			}
-		}
-	}
-
-	// ********** EclipseLink properties **********
-	
-	private void buildProjectLocationProperty(Properties properties, String location) {
-		this.putProperty(properties, 
-			SchemaGeneration.ECLIPSELINK_APPLICATION_LOCATION,
-			location);
-	}
-	
-	private void buildDDLModeProperties(Properties properties) {
-		this.putProperty(properties,  
-			SchemaGeneration.ECLIPSELINK_DDL_GENERATION_TYPE,
-			DdlGenerationType.DROP_AND_CREATE_TABLES);
-		this.putProperty(properties,  
-			SchemaGeneration.ECLIPSELINK_DDL_GENERATION_OUTPUT_MODE,
-			OutputMode.DATABASE);
-	}
-	
-	private void buildConnectionProperties(Properties properties) {
-		ConnectionProfile cp = this.jpaProject.getConnectionProfile();
-
-		this.putProperty(properties,  
-			Connection.ECLIPSELINK_BIND_PARAMETERS,
-			"false");
-		this.putProperty(properties, 
-			Connection.ECLIPSELINK_DRIVER,
-			(cp == null) ? "" : cp.getDriverClassName());
-		this.putProperty(properties,
-			Connection.ECLIPSELINK_URL,
-			(cp == null) ? "" : cp.getURL());
-		this.putProperty(properties,
-			Connection.ECLIPSELINK_USER,
-			(cp == null) ? "" : cp.getUserName());
-		this.putProperty(properties,
-			Connection.ECLIPSELINK_PASSWORD,
-			(cp == null) ? "" : cp.getUserPassword());
-	}
-	
-	private void buildConnectionPoolingProperties(Properties properties) {
-		this.putProperty(properties,
-			Connection.ECLIPSELINK_READ_CONNECTIONS_SHARED,
-			"true");
-	}
-	
-	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");
-	}
-	
-	private void buildCustomizationProperties(Properties properties) {
-		this.putProperty(properties,
-			Customization.ECLIPSELINK_THROW_EXCEPTIONS,
-			"true");
-	}
-	
-	private void putProperty(Properties properties, String key, String value) {
-		properties.put(key, (value == null) ? "" : value);
-	}
-	
-	private void saveLoginProperties(String projectLocation, String propertiesFile) {
-		Properties elProperties = new Properties();
-		
-		this.buildConnectionProperties(elProperties);
-		
-		this.buildConnectionPoolingProperties(elProperties);
-		
-		this.buildLoggingProperties(elProperties);
-		
-		this.buildCustomizationProperties(elProperties);
-		
-		this.buildDDLModeProperties(elProperties);
-
-		this.buildProjectLocationProperty(elProperties, projectLocation);
-	    try {
-	        File file = new File(propertiesFile);
-	        file.createNewFile();
-	        FileOutputStream stream = new FileOutputStream(file);
-	        elProperties.store(stream, null);
-		    stream.close();
-	    }
-	    catch (Exception e) {
-	    	String message = "Error saving: " + propertiesFile;
-			throw new RuntimeException(message, e);
-		}
-	}
-
-	// ********** Main arguments **********
-
-	private String buildPuNameArgument(String puName) {
-		return " -pu \"" + puName + "\"";
-	}
-	
-	private String buildPropertiesFileArgument(String propertiesFile) {
-		return " -p \"" + propertiesFile + "\"";
-	}
-	
-	private String buildDebugArgument() {
-		return (this.isDebug) ? " -debug" : "";
-	}
-	
-	// ********** Queries **********
-	
-	protected JpaPlatform getPlatform() {
-		return this.jpaProject.getJpaPlatform();
-	}
-	
-	protected ILaunch getLaunch() {
-		return this.launch;
-	}
-	
-	protected ILaunchManager getLaunchManager() {
-		return DebugPlugin.getDefault().getLaunchManager();
-	}
-	
-	private IVMInstall getProjectJRE() throws CoreException {
-		return JavaRuntime.getVMInstall(this.jpaProject.getJavaProject());
-	}
-
-	// ********** 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");
-		}
-		return this.getClassPath(bundle);
-	}
-
-	private IPath getClassPath(Bundle bundle) {
-		String path = (String) bundle.getHeaders().get(BUNDLE_CLASSPATH);
-		if (path == null) {
-			path = ".";
-		}
-		ManifestElement[] elements = null;
-		try {
-			elements = ManifestElement.parseHeader(BUNDLE_CLASSPATH, path);
-		}
-		catch (BundleException e) {
-			throw new RuntimeException("Error parsing bundle header: " + bundle, e);
-		}
-		if (elements != null) {
-			for (int i = 0; i < elements.length; ++i) {
-				ManifestElement element = elements[i];
-				String value = element.getValue();
-				if (".".equals(value)) {
-					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);
-					}
-				}
-			}
-		}
-		return null;
-	}
-	
-	private boolean javaxPersistenceBundleExists() {
-		return Platform.getBundle(JAVAX_PERSISTENCE_BUNDLE) != null;
-	}
-
-	// ********** constants **********
-
-	String JAVAX_PERSISTENCE_BUNDLE = "javax.persistence";					//$NON-NLS-1$
-	String ORG_ECLIPSE_PERSISTENCE_CORE_BUNDLE = "org.eclipse.persistence.core";	//$NON-NLS-1$
-	String ORG_ECLIPSE_PERSISTENCE_ASM_BUNDLE = "org.eclipse.persistence.asm";	//$NON-NLS-1$
-	String ORG_ECLIPSE_PERSISTENCE_ANTLR_BUNDLE = "org.eclipse.persistence.antlr";	//$NON-NLS-1$
-	String ORG_ECLIPSE_PERSISTENCE_JPA_BUNDLE = "org.eclipse.persistence.jpa";	//$NON-NLS-1$
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLink1_1OrmFileCreationDataModelProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLink1_1OrmFileCreationDataModelProvider.java
deleted file mode 100644
index 753e07395c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLink1_1OrmFileCreationDataModelProvider.java
+++ /dev/null
@@ -1,46 +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.eclipselink.core.internal.operations;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jpt.core.internal.operations.OrmFileCreationDataModelProvider;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaPlatformProvider;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class EclipseLink1_1OrmFileCreationDataModelProvider extends OrmFileCreationDataModelProvider
-{
-	/**
-	 * required default constructor
-	 */
-	public EclipseLink1_1OrmFileCreationDataModelProvider() {
-		super();
-	}
-	
-	
-	@Override
-	public IDataModelOperation getDefaultOperation() {
-		return new EclipseLink1_1OrmFileCreationOperation(getDataModel());
-	}
-	
-	@Override
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(FILE_PATH)) {
-			return new Path(JptEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_FILE_PATH).toPortableString();
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-	
-	@Override
-	protected boolean isSupportedPlatformId(String id) {
-		return id.equals(EclipseLink1_1JpaPlatformProvider.ID);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLink1_1OrmFileCreationOperation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLink1_1OrmFileCreationOperation.java
deleted file mode 100644
index 9c855faa1d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLink1_1OrmFileCreationOperation.java
+++ /dev/null
@@ -1,28 +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.eclipselink.core.internal.operations;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jpt.core.internal.operations.OrmFileCreationOperation;
-import org.eclipse.jpt.core.resource.AbstractXmlResourceProvider;
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.EclipseLink1_1OrmXmlResourceProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class EclipseLink1_1OrmFileCreationOperation extends OrmFileCreationOperation
-{
-	public EclipseLink1_1OrmFileCreationOperation(IDataModel dataModel) {
-		super(dataModel);
-	}
-	
-	@Override
-	protected AbstractXmlResourceProvider getXmlResourceProvider(IFile file) {
-		return EclipseLink1_1OrmXmlResourceProvider.getXmlResourceProvider(file);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationDataModelProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationDataModelProvider.java
deleted file mode 100644
index 2a23df46ca..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationDataModelProvider.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.eclipselink.core.internal.operations;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jpt.core.internal.operations.OrmFileCreationDataModelProvider;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLink1_1JpaPlatformProvider;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaPlatformProvider;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-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
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(FILE_PATH)) {
-			return new Path(JptEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_FILE_PATH).toPortableString();
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-	
-	
-	@Override
-	protected boolean isSupportedPlatformId(String id) {
-		return id.equals(EclipseLinkJpaPlatformProvider.ID) || id.equals(EclipseLink1_1JpaPlatformProvider.ID);
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationOperation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationOperation.java
deleted file mode 100644
index ae73c0ded9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationOperation.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.eclipselink.core.internal.operations;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jpt.core.internal.operations.OrmFileCreationOperation;
-import org.eclipse.jpt.core.resource.AbstractXmlResourceProvider;
-import org.eclipse.jpt.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/BasicCollectionImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/BasicCollectionImpl.java
deleted file mode 100644
index 7c1b219557..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/BasicCollectionImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.jdt.Attribute;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.eclipselink.core.resource.java.BasicCollectionAnnotation;
-
-
-public class BasicCollectionImpl extends AbstractResourceAnnotation<Attribute> implements BasicCollectionAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	
-	protected BasicCollectionImpl(JavaResourcePersistentAttribute parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void update(CompilationUnit astRoot) {
-	}
-	
-	public static class BasicCollectionAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final BasicCollectionAnnotationDefinition INSTANCE = new BasicCollectionAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static BasicCollectionAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private BasicCollectionAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new BasicCollectionImpl((JavaResourcePersistentAttribute) parent, (Attribute) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/BasicMapImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/BasicMapImpl.java
deleted file mode 100644
index 3fd7d631ea..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/BasicMapImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.jdt.Attribute;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.eclipselink.core.resource.java.BasicMapAnnotation;
-
-
-public class BasicMapImpl extends AbstractResourceAnnotation<Attribute> implements BasicMapAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	
-	protected BasicMapImpl(JavaResourcePersistentAttribute parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void update(CompilationUnit astRoot) {
-	}
-	
-	public static class BasicMapAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final BasicMapAnnotationDefinition INSTANCE = new BasicMapAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static BasicMapAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private BasicMapAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new BasicMapImpl((JavaResourcePersistentAttribute) parent, (Attribute) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/CacheImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/CacheImpl.java
deleted file mode 100644
index 9347356538..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/CacheImpl.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.BooleanExpressionConverter;
-import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.EnumDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.MemberAnnotationAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.NestedDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.NumberIntegerExpressionConverter;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.core.utility.jdt.Type;
-import org.eclipse.jpt.eclipselink.core.resource.java.CacheAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.CacheCoordinationType;
-import org.eclipse.jpt.eclipselink.core.resource.java.CacheType;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-import org.eclipse.jpt.eclipselink.core.resource.java.TimeOfDayAnnotation;
-
-
-public class CacheImpl extends AbstractResourceAnnotation<Type> implements CacheAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final AnnotationElementAdapter<String> typeAdapter;
-	private final AnnotationElementAdapter<Integer> sizeAdapter;
-	private final AnnotationElementAdapter<Boolean> sharedAdapter;
-	private final AnnotationElementAdapter<Integer> expiryAdapter;
-	private final AnnotationElementAdapter<Boolean> alwaysRefreshAdapter;
-	private final AnnotationElementAdapter<Boolean> refreshOnlyIfNewerAdapter;
-	private final AnnotationElementAdapter<Boolean> disableHitsAdapter;
-	private final AnnotationElementAdapter<String> coordinationTypeAdapter;
-	private final MemberAnnotationAdapter expiryTimeOfDayAdapter;
-	
-	private static final DeclarationAnnotationElementAdapter<String> TYPE_ADAPTER = buildTypeAdapter();
-	private static final DeclarationAnnotationElementAdapter<Integer> SIZE_ADAPTER = buildSizeAdapter();
-	private static final DeclarationAnnotationElementAdapter<Boolean> SHARED_ADAPTER = buildSharedAdapter();
-	private static final DeclarationAnnotationElementAdapter<Integer> EXPIRY_ADAPTER = buildExpiryAdapter();
-	private static final DeclarationAnnotationElementAdapter<Boolean> ALWAYS_REFRESH_ADAPTER = buildAlwaysRefreshAdapter();
-	private static final DeclarationAnnotationElementAdapter<Boolean> REFRESH_ONLY_IF_NEWER_ADAPTER = buildRefreshOnlyIfNewerAdapter();
-	private static final DeclarationAnnotationElementAdapter<Boolean> DISABLE_HITS_ADAPTER = buildDisableHitsAdapter();
-	private static final DeclarationAnnotationElementAdapter<String> COORDINATION_TYPE_ADAPTER = buildCoordinationTypeAdapter();
-	private static final NestedDeclarationAnnotationAdapter EXPIRY_TIME_OF_DAY_ADAPTER = buildExpiryTimeOfDayAnnotationAdapter();
-	
-	
-	private CacheType type;
-	private Integer size;
-	private Boolean shared;
-	private Integer expiry;
-	private TimeOfDayAnnotation expiryTimeOfDay;
-	private Boolean alwaysRefresh;
-	private Boolean refreshOnlyIfNewer;
-	private Boolean disableHits;
-	private CacheCoordinationType coordinationType;
-	
-	protected CacheImpl(JavaResourcePersistentType parent, Type type) {
-		super(parent, type, DECLARATION_ANNOTATION_ADAPTER);
-		this.typeAdapter = new ShortCircuitAnnotationElementAdapter<String>(type, TYPE_ADAPTER);
-		this.sizeAdapter = new ShortCircuitAnnotationElementAdapter<Integer>(type, SIZE_ADAPTER);
-		this.sharedAdapter = new ShortCircuitAnnotationElementAdapter<Boolean>(type, SHARED_ADAPTER);
-		this.expiryAdapter = new ShortCircuitAnnotationElementAdapter<Integer>(type, EXPIRY_ADAPTER);
-		this.alwaysRefreshAdapter = new ShortCircuitAnnotationElementAdapter<Boolean>(type, ALWAYS_REFRESH_ADAPTER);
-		this.refreshOnlyIfNewerAdapter = new ShortCircuitAnnotationElementAdapter<Boolean>(type, REFRESH_ONLY_IF_NEWER_ADAPTER);
-		this.disableHitsAdapter = new ShortCircuitAnnotationElementAdapter<Boolean>(type, DISABLE_HITS_ADAPTER);
-		this.coordinationTypeAdapter = new ShortCircuitAnnotationElementAdapter<String>(type, COORDINATION_TYPE_ADAPTER);
-		this.expiryTimeOfDayAdapter = new MemberAnnotationAdapter(type, EXPIRY_TIME_OF_DAY_ADAPTER);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	//*************** CacheAnnotation implementation ****************
-
-	public CacheType getType() {
-		return this.type;
-	}
-	
-	public void setType(CacheType newType) {
-		if (attributeValueHasNotChanged(this.type, newType)) {
-			return;
-		}
-		CacheType oldType = this.type;
-		this.type = newType;
-		this.typeAdapter.setValue(CacheType.toJavaAnnotationValue(newType));
-		firePropertyChanged(TYPE_PROPERTY, oldType, newType);
-	}
-	
-	public Integer getSize() {
-		return this.size;
-	}
-
-	public void setSize(Integer newSize) {
-		if (attributeValueHasNotChanged(this.size, newSize)) {
-			return;
-		}
-		Integer oldSize = this.size;
-		this.size = newSize;
-		this.sizeAdapter.setValue(newSize);
-		firePropertyChanged(SIZE_PROPERTY, oldSize, newSize);
-	}
-
-	public Boolean getShared() {
-		return this.shared;
-	}
-	
-	public void setShared(Boolean newShared) {
-		if (attributeValueHasNotChanged(this.shared, newShared)) {
-			return;
-		}
-		Boolean oldShared = this.shared;
-		this.shared = newShared;
-		this.sharedAdapter.setValue(newShared);
-		firePropertyChanged(SHARED_PROPERTY, oldShared, newShared);
-	}
-	
-	public Integer getExpiry() {
-		return this.expiry;
-	}
-
-	public void setExpiry(Integer newExpiry) {
-		if (attributeValueHasNotChanged(this.expiry, newExpiry)) {
-			return;
-		}
-		Integer oldExpiry = this.expiry;
-		this.expiry = newExpiry;
-		this.expiryAdapter.setValue(newExpiry);
-		firePropertyChanged(EXPIRY_PROPERTY, oldExpiry, newExpiry);
-	}
-	
-	public TimeOfDayAnnotation getExpiryTimeOfDay() {
-		return this.expiryTimeOfDay;
-	}
-	
-	public TimeOfDayAnnotation addExpiryTimeOfDay() {
-		if (this.expiryTimeOfDay != null) {
-			throw new IllegalStateException("ExpiryTimeOfDay element already exists"); //$NON-NLS-1$
-		}
-		this.expiryTimeOfDay = createTimeOfDayAnnotation();
-		this.expiryTimeOfDayAdapter.newMarkerAnnotation();
-		firePropertyChanged(EXPIRY_TIME_OF_DAY_PROPERTY, null, this.expiryTimeOfDay);
-		return this.expiryTimeOfDay;
-	}
-	
-	public void removeExpiryTimeOfDay() {
-		if (this.expiryTimeOfDay == null) {
-			throw new IllegalStateException("No expiryTimeOfDay element exists"); //$NON-NLS-1$
-		}
-		this.expiryTimeOfDay = null;
-		this.expiryTimeOfDayAdapter.removeAnnotation();
-		firePropertyChanged(EXPIRY_TIME_OF_DAY_PROPERTY, this.expiryTimeOfDay, null);
-	}
-	
-	protected void setExpiryTimeOfDay(TimeOfDayAnnotation newExpiryTimeOfDay) {
-		TimeOfDayAnnotation oldExpiryTimeOfDay = this.expiryTimeOfDay;
-		this.expiryTimeOfDay = newExpiryTimeOfDay;
-		firePropertyChanged(EXPIRY_TIME_OF_DAY_PROPERTY, oldExpiryTimeOfDay, newExpiryTimeOfDay);
-	}
-	
-	public Boolean getAlwaysRefresh() {
-		return this.alwaysRefresh;
-	}
-	
-	public void setAlwaysRefresh(Boolean newAlwaysRefresh) {
-		if (attributeValueHasNotChanged(this.alwaysRefresh, newAlwaysRefresh)) {
-			return;
-		}
-		Boolean oldAlwaysRefresh = this.alwaysRefresh;
-		this.alwaysRefresh = newAlwaysRefresh;
-		this.alwaysRefreshAdapter.setValue(newAlwaysRefresh);
-		firePropertyChanged(ALWAYS_REFRESH_PROPERTY, oldAlwaysRefresh, newAlwaysRefresh);
-	}
-	
-	public Boolean getRefreshOnlyIfNewer() {
-		return this.refreshOnlyIfNewer;
-	}
-	
-	public void setRefreshOnlyIfNewer(Boolean newRefreshOnlyIfNewer) {
-		if (attributeValueHasNotChanged(this.refreshOnlyIfNewer, newRefreshOnlyIfNewer)) {
-			return;
-		}
-		Boolean oldRefreshOnlyIfNewer = this.refreshOnlyIfNewer;
-		this.refreshOnlyIfNewer = newRefreshOnlyIfNewer;
-		this.refreshOnlyIfNewerAdapter.setValue(newRefreshOnlyIfNewer);
-		firePropertyChanged(REFRESH_ONLY_IF_NEWER_PROPERTY, oldRefreshOnlyIfNewer, newRefreshOnlyIfNewer);
-	}
-	
-	public Boolean getDisableHits() {
-		return this.disableHits;
-	}
-	
-	public void setDisableHits(Boolean newDisableHits) {
-		if (attributeValueHasNotChanged(this.disableHits, newDisableHits)) {
-			return;
-		}
-		Boolean oldDisableHits = this.disableHits;
-		this.disableHits = newDisableHits;
-		this.disableHitsAdapter.setValue(newDisableHits);
-		firePropertyChanged(DISABLE_HITS_PROPERTY, oldDisableHits, newDisableHits);
-	}
-	
-	public CacheCoordinationType getCoordinationType() {
-		return this.coordinationType;
-	}
-	
-	public void setCoordinationType(CacheCoordinationType newCoordinationType) {
-		if (attributeValueHasNotChanged(this.coordinationType, newCoordinationType)) {
-			return;
-		}
-		CacheCoordinationType oldCoordinationType = this.coordinationType;
-		this.coordinationType = newCoordinationType;
-		this.coordinationTypeAdapter.setValue(CacheCoordinationType.toJavaAnnotationValue(newCoordinationType));
-		firePropertyChanged(TYPE_PROPERTY, oldCoordinationType, newCoordinationType);
-	}
-	
-	public TextRange getTypeTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(TYPE_ADAPTER, astRoot);
-	}
-	
-	public TextRange getSizeTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(SIZE_ADAPTER, astRoot);
-	}
-	
-	public TextRange getSharedTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(SHARED_ADAPTER, astRoot);
-	}
-	
-	public TextRange getExpiryTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(EXPIRY_ADAPTER, astRoot);
-	}
-	
-	public TextRange getExpiryTimeOfDayTextRange(CompilationUnit astRoot) {
-		return null;//TODO return this.getElementTextRange(EXPIRY_TIME_OF_DAY_ADAPTER, astRoot);
-	}
-	
-	public TextRange getAlwaysRefreshTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(ALWAYS_REFRESH_ADAPTER, astRoot);
-	}
-	
-	public TextRange getRefreshOnlyIfNewerTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(REFRESH_ONLY_IF_NEWER_ADAPTER, astRoot);
-	}
-	
-	public TextRange getDisablesHitsTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(DISABLE_HITS_ADAPTER, astRoot);
-	}
-	
-	public TextRange getCoordinationTypeTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(COORDINATION_TYPE_ADAPTER, astRoot);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.type = this.type(astRoot);
-		this.size = this.size(astRoot);
-		this.shared = this.shared(astRoot);
-		this.expiry = this.expiry(astRoot);
-		this.initializeExpiryTimeOfDay(astRoot);
-		this.alwaysRefresh = this.alwaysRefresh(astRoot);
-		this.refreshOnlyIfNewer = this.refreshOnlyIfNewer(astRoot);
-		this.disableHits = this.disableHits(astRoot);
-		this.coordinationType = this.coordinationType(astRoot);
-	}
-
-	protected void initializeExpiryTimeOfDay(CompilationUnit astRoot) {
-		if (this.expiryTimeOfDayAdapter.getAnnotation(astRoot) != null) {
-			this.expiryTimeOfDay = createTimeOfDayAnnotation();
-			this.expiryTimeOfDay.initialize(astRoot);
-		}
-	}
-
-	public void update(CompilationUnit astRoot) {
-		this.setType(this.type(astRoot));
-		this.setSize(this.size(astRoot));
-		this.setShared(this.shared(astRoot));
-		this.setExpiry(this.expiry(astRoot));
-		this.updateExpiryTimeOfDay(astRoot);
-		this.setAlwaysRefresh(this.alwaysRefresh(astRoot));
-		this.setRefreshOnlyIfNewer(this.refreshOnlyIfNewer(astRoot));
-		this.setDisableHits(this.disableHits(astRoot));
-		this.setCoordinationType(this.coordinationType(astRoot));
-	}
-	
-	protected void updateExpiryTimeOfDay(CompilationUnit astRoot) {
-		if (this.expiryTimeOfDayAdapter.getAnnotation(astRoot) == null) {
-			this.setExpiryTimeOfDay(null);
-		}
-		else {
-			if (getExpiryTimeOfDay() != null) {
-				getExpiryTimeOfDay().update(astRoot);
-			}
-			else {
-				TimeOfDayAnnotation expiryTimeOfDay = createTimeOfDayAnnotation();
-				expiryTimeOfDay.initialize(astRoot);
-				setExpiryTimeOfDay(expiryTimeOfDay);
-			}
-		}
-	}
-	
-	protected CacheType type(CompilationUnit astRoot) {
-		return CacheType.fromJavaAnnotationValue(this.typeAdapter.getValue(astRoot));
-	}
-	
-	protected Integer size(CompilationUnit astRoot) {
-		return this.sizeAdapter.getValue(astRoot);
-	}
-	
-	protected Boolean shared(CompilationUnit astRoot) {
-		return this.sharedAdapter.getValue(astRoot);
-	}
-	
-	protected Integer expiry(CompilationUnit astRoot) {
-		return this.expiryAdapter.getValue(astRoot);
-	}
-	
-	protected TimeOfDayAnnotation createTimeOfDayAnnotation() {
-		return new TimeOfDayImpl(this, getMember(), EXPIRY_TIME_OF_DAY_ADAPTER);
-	}
-
-	protected Boolean alwaysRefresh(CompilationUnit astRoot) {
-		return this.alwaysRefreshAdapter.getValue(astRoot);
-	}
-	
-	protected Boolean refreshOnlyIfNewer(CompilationUnit astRoot) {
-		return this.refreshOnlyIfNewerAdapter.getValue(astRoot);
-	}
-	
-	protected Boolean disableHits(CompilationUnit astRoot) {
-		return this.disableHitsAdapter.getValue(astRoot);
-	}
-	
-	protected CacheCoordinationType coordinationType(CompilationUnit astRoot) {
-		return CacheCoordinationType.fromJavaAnnotationValue(this.coordinationTypeAdapter.getValue(astRoot));
-	}
-	
-	// ********** static methods **********
-
-	private static DeclarationAnnotationElementAdapter<String> buildTypeAdapter() {
-		return new EnumDeclarationAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.CACHE__TYPE);
-	}
-	
-	private static DeclarationAnnotationElementAdapter<Integer> buildSizeAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<Integer>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.CACHE__SIZE, NumberIntegerExpressionConverter.instance());
-	}
-	
-	private static DeclarationAnnotationElementAdapter<Boolean> buildSharedAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.CACHE__SHARED, BooleanExpressionConverter.instance());
-	}
-	
-	private static DeclarationAnnotationElementAdapter<Integer> buildExpiryAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<Integer>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.CACHE__EXPIRY, NumberIntegerExpressionConverter.instance());
-	}
-	
-	private static DeclarationAnnotationElementAdapter<Boolean> buildAlwaysRefreshAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.CACHE__ALWAYS_REFRESH, BooleanExpressionConverter.instance());
-	}
-	
-	private static DeclarationAnnotationElementAdapter<Boolean> buildRefreshOnlyIfNewerAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.CACHE__REFRESH_ONLY_IF_NEWER, BooleanExpressionConverter.instance());
-	}
-	
-	private static DeclarationAnnotationElementAdapter<Boolean> buildDisableHitsAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.CACHE__DISABLE_HITS, BooleanExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<String> buildCoordinationTypeAdapter() {
-		return new EnumDeclarationAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.CACHE__COORDINATION_TYPE);
-	}
-
-	private static NestedDeclarationAnnotationAdapter buildExpiryTimeOfDayAnnotationAdapter() {
-		return new NestedDeclarationAnnotationAdapter(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.CACHE__EXPIRY_TIME_OF_DAY, EclipseLinkJPA.TIME_OF_DAY);
-	}
-	
-	public static class CacheAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final CacheAnnotationDefinition INSTANCE = new CacheAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static CacheAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private CacheAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new CacheImpl((JavaResourcePersistentType) parent, (Type) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new NullCacheAnnotation((JavaResourcePersistentType) parent);
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ChangeTrackingImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ChangeTrackingImpl.java
deleted file mode 100644
index 8a17d8eed4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ChangeTrackingImpl.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.EnumDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.core.utility.jdt.Type;
-import org.eclipse.jpt.eclipselink.core.resource.java.ChangeTrackingAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.ChangeTrackingType;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-
-
-public class ChangeTrackingImpl extends AbstractResourceAnnotation<Type> implements ChangeTrackingAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final AnnotationElementAdapter<String> valueAdapter;
-	
-	private static final DeclarationAnnotationElementAdapter<String> VALUE_ADAPTER = buildValueAdapter();
-	
-	
-	private ChangeTrackingType value;
-	
-	protected ChangeTrackingImpl(JavaResourcePersistentType parent, Type type) {
-		super(parent, type, DECLARATION_ANNOTATION_ADAPTER);
-		this.valueAdapter = new ShortCircuitAnnotationElementAdapter<String>(type, VALUE_ADAPTER);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	//*************** CacheAnnotation implementation ****************
-
-	public ChangeTrackingType getValue() {
-		return this.value;
-	}
-	
-	public void setValue(ChangeTrackingType newValue) {
-		if (attributeValueHasNotChanged(this.value, newValue)) {
-			return;
-		}
-		ChangeTrackingType oldValue = this.value;
-		this.value = newValue;
-		this.valueAdapter.setValue(ChangeTrackingType.toJavaAnnotationValue(newValue));
-		firePropertyChanged(VALUE_PROPERTY, oldValue, newValue);
-	}
-
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.value = this.value(astRoot);
-	}
-	
-	public void update(CompilationUnit astRoot) {
-		this.setValue(this.value(astRoot));
-	}
-	
-	protected ChangeTrackingType value(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, EclipseLinkJPA.CHANGE_TRACKING__VALUE, false);
-	}	
-	
-	public static class ChangeTrackingAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final ChangeTrackingAnnotationDefinition INSTANCE = new ChangeTrackingAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static ChangeTrackingAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private ChangeTrackingAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new ChangeTrackingImpl((JavaResourcePersistentType) parent, (Type) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ConversionValueImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ConversionValueImpl.java
deleted file mode 100644
index fb09fb8f15..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ConversionValueImpl.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.MemberIndexedAnnotationAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.NestedIndexedDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.IndexedAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.IndexedDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.eclipselink.core.resource.java.ConversionValueAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-import org.eclipse.jpt.eclipselink.core.resource.java.NestableConversionValue;
-import org.eclipse.jpt.eclipselink.core.resource.java.ObjectTypeConverterAnnotation;
-
-
-public class ConversionValueImpl extends AbstractResourceAnnotation<Member> implements ConversionValueAnnotation, NestableConversionValue
-{
-	// hold this so we can get the 'dataValue' text range
-	private final DeclarationAnnotationElementAdapter<String> dataValueDeclarationAdapter;
-	// hold this so we can get the 'objectValue' text range
-	private final DeclarationAnnotationElementAdapter<String> objectValueDeclarationAdapter;
-	
-	private final AnnotationElementAdapter<String> dataValueAdapter;
-	private final AnnotationElementAdapter<String> objectValueAdapter;
-
-	
-	private String dataValue;
-	private String objectValue;
-	
-	public ConversionValueImpl(ObjectTypeConverterAnnotation parent, Member member, IndexedDeclarationAnnotationAdapter idaa) {
-		super(parent, member, idaa, new MemberIndexedAnnotationAdapter(member, idaa));
-		this.dataValueDeclarationAdapter = this.dataValueAdapter(idaa);
-		this.dataValueAdapter = this.buildAdapter(this.dataValueDeclarationAdapter);
-		this.objectValueDeclarationAdapter = this.objectValueAdapter(idaa);
-		this.objectValueAdapter = this.buildAdapter(this.objectValueDeclarationAdapter);
-	}
-	
-	// ********** initialization **********
-	protected AnnotationElementAdapter<String> buildAdapter(DeclarationAnnotationElementAdapter<String> daea) {
-		return new ShortCircuitAnnotationElementAdapter<String>(getMember(), daea);
-	}
-
-	protected DeclarationAnnotationElementAdapter<String> dataValueAdapter(DeclarationAnnotationAdapter daa) {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(daa, EclipseLinkJPA.CONVERSION_VALUE__DATA_VALUE, false);
-	}
-
-	protected DeclarationAnnotationElementAdapter<String> objectValueAdapter(DeclarationAnnotationAdapter daa) {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(daa, EclipseLinkJPA.CONVERSION_VALUE__OBJECT_VALUE, false);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.dataValue = this.dataValue(astRoot);
-		this.objectValue = this.objectValue(astRoot);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	@Override
-	public IndexedAnnotationAdapter getAnnotationAdapter() {
-		return (IndexedAnnotationAdapter) super.getAnnotationAdapter();
-	}
-
-	//*************** ConversionValue implementation ****************
-	public String getDataValue() {
-		return this.dataValue;
-	}
-	
-	public void setDataValue(String newDataValue) {
-		if (attributeValueHasNotChanged(this.dataValue, newDataValue)) {
-			return;
-		}
-		String oldDataValue = this.dataValue;
-		this.dataValue = newDataValue;
-		this.dataValueAdapter.setValue(newDataValue);
-		firePropertyChanged(DATA_VALUE_PROPERTY, oldDataValue, newDataValue);
-	}
-	
-	public String getObjectValue() {
-		return this.objectValue;
-	}
-	
-	public void setObjectValue(String newObjectValue) {
-		if (attributeValueHasNotChanged(this.objectValue, newObjectValue)) {
-			return;
-		}
-		String oldObjectValue = this.objectValue;
-		this.objectValue = newObjectValue;
-		this.objectValueAdapter.setValue(newObjectValue);
-		firePropertyChanged(OBJECT_VALUE_PROPERTY, oldObjectValue, newObjectValue);
-	}
-	
-	public TextRange getDataValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.dataValueDeclarationAdapter, astRoot);
-	}
-
-	public TextRange getObjectValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.objectValueDeclarationAdapter, astRoot);
-	}
-
-	public void update(CompilationUnit astRoot) {
-		this.setDataValue(this.dataValue(astRoot));
-		this.setObjectValue(this.objectValue(astRoot));
-	}
-	
-	protected String dataValue(CompilationUnit astRoot) {
-		return this.dataValueAdapter.getValue(astRoot);
-	}
-	
-	protected String objectValue(CompilationUnit astRoot) {
-		return this.objectValueAdapter.getValue(astRoot);
-	}
-	
-	//************ NestableAnnotation implementation
-	public void moveAnnotation(int newIndex) {
-		getAnnotationAdapter().moveAnnotation(newIndex);
-	}
-
-	public void initializeFrom(NestableAnnotation oldAnnotation) {
-		ConversionValueAnnotation oldConversionValue = (ConversionValueAnnotation) oldAnnotation;
-		setDataValue(oldConversionValue.getDataValue());
-		setObjectValue(oldConversionValue.getObjectValue());
-	}
-
-	// ********** static methods **********	
-	
-	static ConversionValueImpl createConversionValue(ObjectTypeConverterAnnotation parent, Member member, DeclarationAnnotationAdapter daa, int index) {
-		return new ConversionValueImpl(parent, member, buildConversionValueAnnotationAdapter(daa, index));
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildConversionValueAnnotationAdapter(DeclarationAnnotationAdapter daa, int index) {
-		return new NestedIndexedDeclarationAnnotationAdapter(daa, EclipseLinkJPA.OBJECT_TYPE_CONVERTER__CONVERSION_VALUES, index, EclipseLinkJPA.CONVERSION_VALUE, false);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ConvertImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ConvertImpl.java
deleted file mode 100644
index 0d146c8486..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ConvertImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.StringExpressionConverter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Attribute;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.eclipselink.core.resource.java.ConvertAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-
-
-public class ConvertImpl extends AbstractResourceAnnotation<Attribute> implements ConvertAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final AnnotationElementAdapter<String> valueAdapter;
-
-	private static final DeclarationAnnotationElementAdapter<String> VALUE_ADAPTER = buildValueAdapter();
-
-	
-	private String value;
-	
-	protected ConvertImpl(JavaResourcePersistentAttribute parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-		this.valueAdapter = new ShortCircuitAnnotationElementAdapter<String>(attribute, VALUE_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.value = this.value(astRoot);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	//*************** Convert implementation ****************
-	public String getValue() {
-		return this.value;
-	}
-	
-	public void setValue(String newValue) {
-		if (attributeValueHasNotChanged(this.value, newValue)) {
-			return;
-		}
-		String oldValue = this.value;
-		this.value = newValue;
-		this.valueAdapter.setValue(newValue);
-		firePropertyChanged(VALUE_PROPERTY, oldValue, newValue);
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(VALUE_ADAPTER, astRoot);
-	}
-
-	public void update(CompilationUnit astRoot) {
-		this.setValue(this.value(astRoot));
-	}
-	
-	protected String value(CompilationUnit astRoot) {
-		return this.valueAdapter.getValue(astRoot);
-	}
-	
-	// ********** static methods **********
-	private static DeclarationAnnotationElementAdapter<String> buildValueAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.CONVERT__VALUE, false, StringExpressionConverter.instance());
-	}
-
-	
-	public static class ConvertAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final ConvertAnnotationDefinition INSTANCE = new ConvertAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static ConvertAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private ConvertAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new ConvertImpl((JavaResourcePersistentAttribute) parent, (Attribute) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ConverterImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ConverterImpl.java
deleted file mode 100644
index b5dfe5a822..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ConverterImpl.java
+++ /dev/null
@@ -1,163 +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.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.JDTTools;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleTypeStringExpressionConverter;
-import org.eclipse.jpt.core.internal.utility.jdt.StringExpressionConverter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.eclipselink.core.resource.java.ConverterAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-
-
-public class ConverterImpl extends AbstractResourceAnnotation<Member> implements ConverterAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final AnnotationElementAdapter<String> nameAdapter;
-	private final AnnotationElementAdapter<String> converterClassAdapter;
-
-	private static final DeclarationAnnotationElementAdapter<String> NAME_ADAPTER = buildNameAdapter();
-	private static final DeclarationAnnotationElementAdapter<String> CONVERTER_CLASS_ADAPTER = buildConverterClassAdapter();
-
-	
-	private String name;
-	private String converterClass;
-	
-	protected ConverterImpl(JavaResourcePersistentMember parent, Member member) {
-		super(parent, member, DECLARATION_ANNOTATION_ADAPTER);
-		this.nameAdapter = new ShortCircuitAnnotationElementAdapter<String>(member, NAME_ADAPTER);
-		this.converterClassAdapter = new ShortCircuitAnnotationElementAdapter<String>(member, CONVERTER_CLASS_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.name = this.name(astRoot);
-		this.converterClass = this.converterClass(astRoot);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	//*************** ConverterAnnotation implementation ****************
-	
-	public boolean converterClassImplementsInterface(String interfaceName, CompilationUnit astRoot) {
-		return (this.converterClass != null)
-				&& JDTTools.typeIsSubTypeOf(this.converterClassAdapter.getExpression(astRoot), interfaceName);
-	}
-	
-	public String getName() {
-		return this.name;
-	}
-	
-	public void setName(String newName) {
-		if (attributeValueHasNotChanged(this.name, newName)) {
-			return;
-		}
-		String oldName = this.name;
-		this.name = newName;
-		this.nameAdapter.setValue(newName);
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
-	}
-
-	public String getConverterClass() {
-		return this.converterClass;
-	}
-	
-	public void setConverterClass(String newConverterClass) {
-		if (attributeValueHasNotChanged(this.converterClass, newConverterClass)) {
-			return;
-		}
-		String oldConverterClass = this.converterClass;
-		this.converterClass = newConverterClass;
-		this.converterClassAdapter.setValue(newConverterClass);
-		firePropertyChanged(CONVERTER_CLASS_PROPERTY, oldConverterClass, newConverterClass);
-	}
-
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(NAME_ADAPTER, astRoot);
-	}
-
-	public TextRange getConverterClassTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(CONVERTER_CLASS_ADAPTER, astRoot);
-	}
-	
-	public void update(CompilationUnit astRoot) {
-		this.setName(this.name(astRoot));
-		this.setConverterClass(this.converterClass(astRoot));
-	}
-	
-	protected String name(CompilationUnit astRoot) {
-		return this.nameAdapter.getValue(astRoot);
-	}
-	
-	protected String converterClass(CompilationUnit astRoot) {
-		return this.converterClassAdapter.getValue(astRoot);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.name);
-	}
-	
-	// ********** static methods **********
-	private static DeclarationAnnotationElementAdapter<String> buildNameAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.CONVERTER__NAME, false, StringExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<String> buildConverterClassAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.CONVERTER__CONVERTER_CLASS, false, SimpleTypeStringExpressionConverter.instance());
-	}
-	
-	public static class ConverterAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final ConverterAnnotationDefinition INSTANCE = new ConverterAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static ConverterAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private ConverterAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new ConverterImpl(parent, member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/CustomizerImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/CustomizerImpl.java
deleted file mode 100644
index e1de3df005..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/CustomizerImpl.java
+++ /dev/null
@@ -1,127 +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.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.JDTTools;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleTypeStringExpressionConverter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.core.utility.jdt.Type;
-import org.eclipse.jpt.eclipselink.core.resource.java.CustomizerAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-
-
-public class CustomizerImpl extends AbstractResourceAnnotation<Type> implements CustomizerAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final AnnotationElementAdapter<String> valueAdapter;
-
-	private static final DeclarationAnnotationElementAdapter<String> VALUE_ADAPTER = buildValueAdapter();
-
-	
-	private String value;
-	
-	protected CustomizerImpl(JavaResourcePersistentMember parent, Type type) {
-		super(parent, type, DECLARATION_ANNOTATION_ADAPTER);
-		this.valueAdapter = new ShortCircuitAnnotationElementAdapter<String>(type, VALUE_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.value = this.value(astRoot);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	//*************** CustomizerAnnotation implementation ****************
-	
-	public boolean customizerClassImplementsInterface(String interfaceName, CompilationUnit astRoot) {
-		return (this.value != null)
-				&& JDTTools.typeIsSubTypeOf(this.valueAdapter.getExpression(astRoot), interfaceName);
-	}
-
-	public String getValue() {
-		return this.value;
-	}
-	
-	public void setValue(String newValue) {
-		if (attributeValueHasNotChanged(this.value, newValue)) {
-			return;
-		}
-		String oldValue = this.value;
-		this.value = newValue;
-		this.valueAdapter.setValue(newValue);
-		firePropertyChanged(VALUE_PROPERTY, oldValue, newValue);
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(VALUE_ADAPTER, astRoot);
-	}
-	
-	public void update(CompilationUnit astRoot) {
-		this.setValue(this.value(astRoot));
-	}
-	
-	protected String value(CompilationUnit astRoot) {
-		return this.valueAdapter.getValue(astRoot);
-	}
-	
-	// ********** static methods **********
-
-	private static DeclarationAnnotationElementAdapter<String> buildValueAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.CUSTOMIZER__VALUE, false, SimpleTypeStringExpressionConverter.instance());
-	}
-	
-	public static class CustomizerAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final CustomizerAnnotationDefinition INSTANCE = new CustomizerAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static CustomizerAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private CustomizerAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new CustomizerImpl(parent, (Type) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ExistenceCheckingImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ExistenceCheckingImpl.java
deleted file mode 100644
index 546e54b400..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ExistenceCheckingImpl.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.EnumDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.core.utility.jdt.Type;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-import org.eclipse.jpt.eclipselink.core.resource.java.ExistenceCheckingAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.ExistenceType;
-
-
-public class ExistenceCheckingImpl extends AbstractResourceAnnotation<Type> implements ExistenceCheckingAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final AnnotationElementAdapter<String> valueAdapter;
-	
-	private static final DeclarationAnnotationElementAdapter<String> VALUE_ADAPTER = buildValueAdapter();
-	
-	
-	private ExistenceType value;
-	
-	protected ExistenceCheckingImpl(JavaResourcePersistentType parent, Type type) {
-		super(parent, type, DECLARATION_ANNOTATION_ADAPTER);
-		this.valueAdapter = new ShortCircuitAnnotationElementAdapter<String>(type, VALUE_ADAPTER);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	//*************** CacheAnnotation implementation ****************
-
-	public ExistenceType getValue() {
-		return this.value;
-	}
-	
-	public void setValue(ExistenceType newValue) {
-		if (attributeValueHasNotChanged(this.value, newValue)) {
-			return;
-		}
-		ExistenceType oldValue = this.value;
-		this.value = newValue;
-		this.valueAdapter.setValue(ExistenceType.toJavaAnnotationValue(newValue));
-		firePropertyChanged(VALUE_PROPERTY, oldValue, newValue);
-	}
-
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.value = this.value(astRoot);
-	}
-	
-	public void update(CompilationUnit astRoot) {
-		this.setValue(this.value(astRoot));
-	}
-	
-	protected ExistenceType value(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, EclipseLinkJPA.EXISTENCE_CHECKING__VALUE, false);
-	}	
-	
-	public static class ExistenceCheckingAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final ExistenceCheckingAnnotationDefinition INSTANCE = new ExistenceCheckingAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static ExistenceCheckingAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private ExistenceCheckingAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new ExistenceCheckingImpl((JavaResourcePersistentType) parent, (Type) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/JoinFetchImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/JoinFetchImpl.java
deleted file mode 100644
index eb1f2d5f79..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/JoinFetchImpl.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.EnumDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Attribute;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-import org.eclipse.jpt.eclipselink.core.resource.java.JoinFetchAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.JoinFetchType;
-
-
-public class JoinFetchImpl extends AbstractResourceAnnotation<Attribute> implements JoinFetchAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final AnnotationElementAdapter<String> valueAdapter;
-	
-	private static final DeclarationAnnotationElementAdapter<String> VALUE_ADAPTER = buildValueAdapter();
-	
-	
-	private JoinFetchType value;
-	
-	protected JoinFetchImpl(JavaResourcePersistentAttribute parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-		this.valueAdapter = new ShortCircuitAnnotationElementAdapter<String>(attribute, VALUE_ADAPTER);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	//*************** CacheAnnotation implementation ****************
-
-	public JoinFetchType getValue() {
-		return this.value;
-	}
-	
-	public void setValue(JoinFetchType newValue) {
-		if (attributeValueHasNotChanged(this.value, newValue)) {
-			return;
-		}
-		JoinFetchType oldValue = this.value;
-		this.value = newValue;
-		this.valueAdapter.setValue(JoinFetchType.toJavaAnnotationValue(newValue));
-		firePropertyChanged(VALUE_PROPERTY, oldValue, newValue);
-	}
-
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.value = this.value(astRoot);
-	}
-	
-	public void update(CompilationUnit astRoot) {
-		this.setValue(this.value(astRoot));
-	}
-	
-	protected JoinFetchType value(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, EclipseLinkJPA.JOIN_FETCH_VALUE, false);
-	}	
-	
-	public static class JoinFetchAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final JoinFetchAnnotationDefinition INSTANCE = new JoinFetchAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static JoinFetchAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private JoinFetchAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new JoinFetchImpl((JavaResourcePersistentAttribute) parent, (Attribute) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new NullJoinFetchAnnotation((JavaResourcePersistentAttribute) parent);
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/MutableImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/MutableImpl.java
deleted file mode 100644
index 1759c4944b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/MutableImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.BooleanExpressionConverter;
-import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Attribute;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-import org.eclipse.jpt.eclipselink.core.resource.java.MutableAnnotation;
-
-
-public class MutableImpl extends AbstractResourceAnnotation<Attribute> implements MutableAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final AnnotationElementAdapter<Boolean> valueAdapter;
-
-	private static final DeclarationAnnotationElementAdapter<Boolean> VALUE_ADAPTER = buildValueAdapter();
-
-	
-	private Boolean value;
-	
-	protected MutableImpl(JavaResourcePersistentAttribute parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-		this.valueAdapter = new ShortCircuitAnnotationElementAdapter<Boolean>(attribute, VALUE_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.value = this.value(astRoot);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	//*************** Mutable implementation ****************
-	public Boolean getValue() {
-		return this.value;
-	}
-	
-	public void setValue(Boolean newValue) {
-		if (attributeValueHasNotChanged(this.value, newValue)) {
-			return;
-		}
-		Boolean oldValue = this.value;
-		this.value = newValue;
-		this.valueAdapter.setValue(newValue);
-		firePropertyChanged(VALUE_PROPERTY, oldValue, newValue);
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(VALUE_ADAPTER, astRoot);
-	}
-
-	public void update(CompilationUnit astRoot) {
-		this.setValue(this.value(astRoot));
-	}
-	
-	protected Boolean value(CompilationUnit astRoot) {
-		return this.valueAdapter.getValue(astRoot);
-	}
-	
-	// ********** static methods **********
-	private static DeclarationAnnotationElementAdapter<Boolean> buildValueAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.MUTABLE__VALUE, false, BooleanExpressionConverter.instance());
-	}
-
-	
-	public static class MutableAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final MutableAnnotationDefinition INSTANCE = new MutableAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static MutableAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private MutableAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new MutableImpl((JavaResourcePersistentAttribute) parent, (Attribute) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/NullCacheAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/NullCacheAnnotation.java
deleted file mode 100644
index fb68500af7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/NullCacheAnnotation.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractJavaResourceNode;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.resource.java.CacheAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.CacheCoordinationType;
-import org.eclipse.jpt.eclipselink.core.resource.java.CacheType;
-import org.eclipse.jpt.eclipselink.core.resource.java.TimeOfDayAnnotation;
-
-public class NullCacheAnnotation extends AbstractJavaResourceNode implements CacheAnnotation, Annotation
-{
-	protected NullCacheAnnotation(JavaResourcePersistentType parent) {
-		super(parent);
-	}
-	
-	@Override
-	public JavaResourcePersistentType getParent() {
-		return (JavaResourcePersistentType) super.getParent();
-	}
-	
-	public String getAnnotationName() {
-		return CacheAnnotation.ANNOTATION_NAME;
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		//null, nothing to initialize
-	}
-	
-	public org.eclipse.jdt.core.dom.Annotation getJdtAnnotation(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public void newAnnotation() {
-		throw new UnsupportedOperationException();
-	}
-	
-	public void removeAnnotation() {
-		throw new UnsupportedOperationException();
-	}
-	
-	protected CacheAnnotation createCacheResource() {
-		return (CacheAnnotation) getParent().addSupportingAnnotation(getAnnotationName());
-	}
-	
-	public CacheType getType() {
-		return null;
-	}
-	
-	public void setType(CacheType type) {
-		if (type != null) {
-			createCacheResource().setType(type);
-		}
-	}
-
-	public Integer getSize() {
-		return null;
-	}
-	
-	public void setSize(Integer size) {
-		if (size != null) {
-			createCacheResource().setSize(size);
-		}
-	}
-	
-	public Boolean getShared() {
-		return null;
-	}
-	
-	public void setShared(Boolean shared) {
-		if (shared != null) {
-			createCacheResource().setShared(shared);
-		}
-	}
-	
-	public Integer getExpiry() {
-		return null;
-	}
-	
-	public void setExpiry(Integer expiry) {
-		if (expiry != null) {
-			createCacheResource().setExpiry(expiry);
-		}		
-	}
-	
-	public TimeOfDayAnnotation getExpiryTimeOfDay() {
-		return null;
-	}
-	
-	public TimeOfDayAnnotation addExpiryTimeOfDay() {
-		return createCacheResource().addExpiryTimeOfDay();
-	}
-	
-	public void removeExpiryTimeOfDay() {
-		
-	}
-	
-	public Boolean getAlwaysRefresh() {
-		return null;
-	}
-	
-	public void setAlwaysRefresh(Boolean alwaysRefresh) {
-		if (alwaysRefresh != null) {
-			createCacheResource().setAlwaysRefresh(alwaysRefresh);
-		}
-	}
-	
-	public Boolean getRefreshOnlyIfNewer() {
-		return null;
-	}
-	
-	public void setRefreshOnlyIfNewer(Boolean refreshOnlyIfNewer) {
-		if (refreshOnlyIfNewer != null) {
-			createCacheResource().setRefreshOnlyIfNewer(refreshOnlyIfNewer);
-		}
-	}
-	
-	public Boolean getDisableHits() {
-		return null;
-	}
-	
-	public void setDisableHits(Boolean disableHits) {
-		if (disableHits != null) {
-			createCacheResource().setDisableHits(disableHits);
-		}
-	}
-	
-	public CacheCoordinationType getCoordinationType() {
-		return null;
-	}
-	
-	public void setCoordinationType(CacheCoordinationType coordinationType) {
-		if (coordinationType != null) {
-			createCacheResource().setCoordinationType(coordinationType);
-		}
-	}
-	
-	public TextRange getTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	public TextRange getTypeTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	public TextRange getSizeTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public TextRange getSharedTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public TextRange getExpiryTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public TextRange getExpiryTimeOfDayTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public TextRange getAlwaysRefreshTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public TextRange getRefreshOnlyIfNewerTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public TextRange getDisablesHitsTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public TextRange getCoordinationTypeTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public void update(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/NullJoinFetchAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/NullJoinFetchAnnotation.java
deleted file mode 100644
index 53da2c52df..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/NullJoinFetchAnnotation.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractJavaResourceNode;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.resource.java.ExistenceCheckingAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.JoinFetchAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.JoinFetchType;
-
-public class NullJoinFetchAnnotation extends AbstractJavaResourceNode implements JoinFetchAnnotation, Annotation
-{
-	protected NullJoinFetchAnnotation(JavaResourcePersistentAttribute parent) {
-		super(parent);
-	}
-	
-	@Override
-	public JavaResourcePersistentType getParent() {
-		return (JavaResourcePersistentType) super.getParent();
-	}
-	
-	public String getAnnotationName() {
-		return ExistenceCheckingAnnotation.ANNOTATION_NAME;
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		//null, nothing to initialize
-	}
-	
-	public org.eclipse.jdt.core.dom.Annotation getJdtAnnotation(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public void newAnnotation() {
-		throw new UnsupportedOperationException();
-	}
-	
-	public void removeAnnotation() {
-		throw new UnsupportedOperationException();
-	}
-	
-	protected JoinFetchAnnotation createJoinFetchAnnotation() {
-		return (JoinFetchAnnotation) getParent().addSupportingAnnotation(getAnnotationName());
-	}
-	
-	public JoinFetchType getValue() {
-		return null;
-	}
-	
-	public void setValue(JoinFetchType value) {
-		if (value != null) {
-			createJoinFetchAnnotation().setValue(value);
-		}
-	}
-	
-	public TextRange getTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public void update(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/NullTransformation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/NullTransformation.java
deleted file mode 100644
index cd04bf925d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/NullTransformation.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractJavaResourceNode;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.BasicAnnotation;
-import org.eclipse.jpt.core.resource.java.FetchType;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.resource.java.TransformationAnnotation;
-
-
-public class NullTransformation extends AbstractJavaResourceNode implements BasicAnnotation, Annotation
-{	
-	protected NullTransformation(JavaResourcePersistentMember parent) {
-		super(parent);
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		//null, nothing to initialize
-	}
-
-	public org.eclipse.jdt.core.dom.Annotation getJdtAnnotation(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public void newAnnotation() {
-		throw new UnsupportedOperationException();
-	}
-	
-	public void removeAnnotation() {
-		throw new UnsupportedOperationException();
-	}
-
-	public String getAnnotationName() {
-		return TransformationAnnotation.ANNOTATION_NAME;
-	}
-	
-	@Override
-	public JavaResourcePersistentMember getParent() {
-		return (JavaResourcePersistentMember) super.getParent();
-	}
-	
-	protected TransformationAnnotation createTransformationResource() {
-		getParent().setMappingAnnotation(getAnnotationName());
-		return (TransformationAnnotation) getParent().getMappingAnnotation();
-	}
-
-	public FetchType getFetch() {
-		return null;
-	}
-	
-	public void setFetch(FetchType fetch) {
-		if (fetch != null) {
-			createTransformationResource().setFetch(fetch);
-		}				
-	}
-	
-	public Boolean getOptional() {
-		return null;
-	}
-
-	public void setOptional(Boolean optional) {
-		if (optional != null) {
-			createTransformationResource().setOptional(optional);
-		}				
-	}
-
-	public void update(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	public TextRange getTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	public TextRange getFetchTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public TextRange getOptionalTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/NullWriteTransformerColumn.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/NullWriteTransformerColumn.java
deleted file mode 100644
index 4b88b4cb4b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/NullWriteTransformerColumn.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.NullBaseColumn;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.ColumnAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.resource.java.WriteTransformerAnnotation;
-
-
-public class NullWriteTransformerColumn extends NullBaseColumn implements ColumnAnnotation, Annotation
-{	
-	public NullWriteTransformerColumn(WriteTransformerAnnotation parent) {
-		super(parent);
-	}
-
-	@Override
-	public WriteTransformerAnnotation getParent() {
-		return (WriteTransformerAnnotation) super.getParent();
-	}
-	
-	public String getAnnotationName() {
-		return ColumnAnnotation.ANNOTATION_NAME;
-	}
-
-	@Override
-	protected ColumnAnnotation createResourceColumn() {
-		return getParent().addColumn();
-	}
-
-	public Integer getLength() {
-		return null;
-	}
-	
-	public void setLength(Integer length) {
-		if (length != null) {
-			createResourceColumn().setLength(length);
-		}
-	}
-	
-	public Integer getScale() {
-		return null;
-	}
-	
-	public void setScale(Integer scale) {
-		if (scale != null) {
-			createResourceColumn().setScale(scale);
-		}
-	}
-	
-	public Integer getPrecision() {
-		return null;
-	}
-	
-	public void setPrecision(Integer precision) {
-		if (precision != null) {
-			createResourceColumn().setPrecision(precision);
-		}
-	}
-	
-	public TextRange getScaleTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public TextRange getLengthTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public TextRange getPrecisionTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ObjectTypeConverterImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ObjectTypeConverterImpl.java
deleted file mode 100644
index a149ae9fa1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ObjectTypeConverterImpl.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractJavaResourceNode;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.resource.java.ContainerAnnotationTools;
-import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.StringExpressionConverter;
-import org.eclipse.jpt.core.internal.utility.jdt.TypeStringExpressionConverter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation;
-import org.eclipse.jpt.core.resource.java.ContainerAnnotation;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.eclipselink.core.resource.java.ConversionValueAnnotation;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-import org.eclipse.jpt.eclipselink.core.resource.java.NestableConversionValue;
-import org.eclipse.jpt.eclipselink.core.resource.java.ObjectTypeConverterAnnotation;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-
-public class ObjectTypeConverterImpl extends AbstractResourceAnnotation<Member> implements ObjectTypeConverterAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final AnnotationElementAdapter<String> nameAdapter;
-	private final AnnotationElementAdapter<String> dataTypeAdapter;
-	private final AnnotationElementAdapter<String> objectTypeAdapter;
-	private final AnnotationElementAdapter<String> defaultObjectValueAdapter;
-
-	private static final DeclarationAnnotationElementAdapter<String> NAME_ADAPTER = buildNameAdapter();
-	private static final DeclarationAnnotationElementAdapter<String> DATA_TYPE_ADAPTER = buildDataTypeAdapter();
-	private static final DeclarationAnnotationElementAdapter<String> OBJECT_TYPE_ADAPTER = buildObjectTypeAdapter();
-	private static final DeclarationAnnotationElementAdapter<String> DEFAULT_OBJECT_VALUE_ADAPTER = buildDefaultObjectValueAdapter();
-
-	
-	private String name;
-	private String dataType;
-	private String objectType;
-	private String defaultObjectValue;
-	
-	protected final List<NestableConversionValue> conversionValues;
-	private final ConversionValuesContainerAnnotation conversionValuesContainerAnnotation;
-	
-	protected ObjectTypeConverterImpl(JavaResourcePersistentMember parent, Member member) {
-		super(parent, member, DECLARATION_ANNOTATION_ADAPTER);
-		this.nameAdapter = new ShortCircuitAnnotationElementAdapter<String>(member, NAME_ADAPTER);
-		this.dataTypeAdapter = new ShortCircuitAnnotationElementAdapter<String>(member, DATA_TYPE_ADAPTER);
-		this.objectTypeAdapter = new ShortCircuitAnnotationElementAdapter<String>(member, OBJECT_TYPE_ADAPTER);
-		this.defaultObjectValueAdapter = new ShortCircuitAnnotationElementAdapter<String>(member, DEFAULT_OBJECT_VALUE_ADAPTER);
-		this.conversionValues = new ArrayList<NestableConversionValue>();
-		this.conversionValuesContainerAnnotation = new ConversionValuesContainerAnnotation();
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.name = this.name(astRoot);
-		this.dataType = this.dataType(astRoot);
-		this.objectType = this.objectType(astRoot);
-		this.defaultObjectValue = this.defaultObjectValue(astRoot);
-		ContainerAnnotationTools.initializeNestedAnnotations(astRoot, this.conversionValuesContainerAnnotation);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	//*************** ObjectTypeConverter implementation ****************
-	public String getName() {
-		return this.name;
-	}
-	
-	public void setName(String newName) {
-		if (attributeValueHasNotChanged(this.name, newName)) {
-			return;
-		}
-		String oldName = this.name;
-		this.name = newName;
-		this.nameAdapter.setValue(newName);
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
-	}
-
-	public String getDataType() {
-		return this.dataType;
-	}
-	
-	public void setDataType(String newDataType) {
-		if (attributeValueHasNotChanged(this.dataType, newDataType)) {
-			return;
-		}
-		String oldDataType = this.dataType;
-		this.dataType = newDataType;
-		this.dataTypeAdapter.setValue(newDataType);
-		firePropertyChanged(DATA_TYPE_PROPERTY, oldDataType, newDataType);
-	}
-	
-	public String getObjectType() {
-		return this.objectType;
-	}
-	
-	public void setObjectType(String newObjectType) {
-		if (attributeValueHasNotChanged(this.objectType, newObjectType)) {
-			return;
-		}
-		String oldObjectType = this.objectType;
-		this.objectType = newObjectType;
-		this.objectTypeAdapter.setValue(newObjectType);
-		firePropertyChanged(OBJECT_TYPE_PROPERTY, oldObjectType, newObjectType);
-	}
-	
-	public String getDefaultObjectValue() {
-		return this.defaultObjectValue;
-	}
-	
-	public void setDefaultObjectValue(String newDefaultObjectValue) {
-		if (attributeValueHasNotChanged(this.defaultObjectValue, newDefaultObjectValue)) {
-			return;
-		}
-		String oldDefaultObjectValue = this.defaultObjectValue;
-		this.defaultObjectValue = newDefaultObjectValue;
-		this.defaultObjectValueAdapter.setValue(newDefaultObjectValue);
-		firePropertyChanged(DEFAULT_OBJECT_VALUE_PROPERTY, oldDefaultObjectValue, newDefaultObjectValue);
-	}
-	
-	public ListIterator<ConversionValueAnnotation> conversionValues() {
-		return new CloneListIterator<ConversionValueAnnotation>(this.conversionValues);
-	}
-	
-	public int conversionValuesSize() {
-		return this.conversionValues.size();
-	}
-	
-	public NestableConversionValue conversionValueAt(int index) {
-		return this.conversionValues.get(index);
-	}
-	
-	public int indexOfConversionValue(ConversionValueAnnotation conversionValue) {
-		return this.conversionValues.indexOf(conversionValue);
-	}
-	
-	public NestableConversionValue addConversionValue(int index) {
-		NestableConversionValue conversionValue = (NestableConversionValue) ContainerAnnotationTools.addNestedAnnotation(index, this.conversionValuesContainerAnnotation);
-		fireItemAdded(AssociationOverrideAnnotation.JOIN_COLUMNS_LIST, index, conversionValue);
-		return conversionValue;
-	}
-	
-	protected void addConversionValue(int index, NestableConversionValue conversionValue) {
-		addItemToList(index, conversionValue, this.conversionValues, AssociationOverrideAnnotation.JOIN_COLUMNS_LIST);
-	}
-	
-	public void removeConversionValue(int index) {
-		NestableConversionValue conversionValue = this.conversionValues.get(index);
-		removeConversionValue(conversionValue);
-		conversionValue.removeAnnotation();
-		ContainerAnnotationTools.synchAnnotationsAfterRemove(index, this.conversionValuesContainerAnnotation);
-	}
-
-	protected void removeConversionValue(NestableConversionValue conversionValue) {
-		removeItemFromList(conversionValue, this.conversionValues, AssociationOverrideAnnotation.JOIN_COLUMNS_LIST);
-	}
-
-	public void moveConversionValue(int targetIndex, int sourceIndex) {
-		moveConversionValueInternal(targetIndex, sourceIndex);
-		ContainerAnnotationTools.synchAnnotationsAfterMove(targetIndex, sourceIndex, this.conversionValuesContainerAnnotation);
-		fireItemMoved(AssociationOverrideAnnotation.JOIN_COLUMNS_LIST, targetIndex, sourceIndex);
-	}
-	
-	protected void moveConversionValueInternal(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.conversionValues, targetIndex, sourceIndex);
-	}
-
-	protected NestableConversionValue createConversionValue(int index) {
-		return ConversionValueImpl.createConversionValue(this, getMember(), getDeclarationAnnotationAdapter(), index);
-	}
-
-	
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(NAME_ADAPTER, astRoot);
-	}
-
-	public TextRange getDataTypeTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(DATA_TYPE_ADAPTER, astRoot);
-	}
-	
-	public TextRange getObjectTypeTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(OBJECT_TYPE_ADAPTER, astRoot);
-	}
-	
-	public TextRange getDefaultObjectValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(DEFAULT_OBJECT_VALUE_ADAPTER, astRoot);		
-	}
-	
-	public void update(CompilationUnit astRoot) {
-		this.setName(this.name(astRoot));
-		this.setDataType(this.dataType(astRoot));
-		this.setObjectType(this.objectType(astRoot));
-		this.setDefaultObjectValue(this.defaultObjectValue(astRoot));
-		ContainerAnnotationTools.updateNestedAnnotationsFromJava(astRoot, this.conversionValuesContainerAnnotation);
-	}
-	
-	protected String name(CompilationUnit astRoot) {
-		return this.nameAdapter.getValue(astRoot);
-	}
-	
-	protected String dataType(CompilationUnit astRoot) {
-		return this.dataTypeAdapter.getValue(astRoot);
-	}
-	
-	protected String objectType(CompilationUnit astRoot) {
-		return this.objectTypeAdapter.getValue(astRoot);
-	}
-	
-	protected String defaultObjectValue(CompilationUnit astRoot) {
-		return this.defaultObjectValueAdapter.getValue(astRoot);
-	}
-	
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.name);
-	}
-	
-	// ********** static methods **********
-	private static DeclarationAnnotationElementAdapter<String> buildNameAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.OBJECT_TYPE_CONVERTER__NAME, false, StringExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<String> buildDataTypeAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.OBJECT_TYPE_CONVERTER__DATE_TYPE, false, TypeStringExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<String> buildObjectTypeAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.OBJECT_TYPE_CONVERTER__OBJECT_TYPE, false, TypeStringExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<String> buildDefaultObjectValueAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE, false, StringExpressionConverter.instance());
-	}
-	
-	public static class ObjectTypeConverterAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final ObjectTypeConverterAnnotationDefinition INSTANCE = new ObjectTypeConverterAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static ObjectTypeConverterAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private ObjectTypeConverterAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new ObjectTypeConverterImpl(parent, member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-	private class ConversionValuesContainerAnnotation extends AbstractJavaResourceNode 
-		implements ContainerAnnotation<NestableConversionValue> 
-	{
-		public ConversionValuesContainerAnnotation() {
-			super(ObjectTypeConverterImpl.this);
-		}
-	
-		public void initialize(CompilationUnit astRoot) {
-			//nothing to initialize
-		}
-		
-		public NestableConversionValue addInternal(int index) {
-			NestableConversionValue conversionValue = ObjectTypeConverterImpl.this.createConversionValue(index);
-			ObjectTypeConverterImpl.this.conversionValues.add(index, conversionValue);
-			return conversionValue;
-		}
-		
-		public NestableConversionValue add(int index) {
-			NestableConversionValue conversionValue = ObjectTypeConverterImpl.this.createConversionValue(index);
-			ObjectTypeConverterImpl.this.addConversionValue(index, conversionValue);
-			return conversionValue;
-		}
-		
-		public int indexOf(NestableConversionValue conversionValue) {
-			return ObjectTypeConverterImpl.this.indexOfConversionValue(conversionValue);
-		}
-	
-		public void move(int targetIndex, int sourceIndex) {
-			ObjectTypeConverterImpl.this.moveConversionValue(targetIndex, sourceIndex);
-		}
-	
-		public void moveInternal(int targetIndex, int sourceIndex) {
-			ObjectTypeConverterImpl.this.moveConversionValueInternal(targetIndex, sourceIndex);			
-		}
-		
-		public NestableConversionValue nestedAnnotationAt(int index) {
-			return ObjectTypeConverterImpl.this.conversionValueAt(index);
-		}
-	
-		public ListIterator<NestableConversionValue> nestedAnnotations() {
-			return new CloneListIterator<NestableConversionValue>(ObjectTypeConverterImpl.this.conversionValues);
-		}
-	
-		public int nestedAnnotationsSize() {
-			return conversionValuesSize();
-		}
-	
-		public void remove(int index) {
-			this.remove(nestedAnnotationAt(index));
-		}		
-	
-		public void remove(NestableConversionValue conversionValue) {
-			ObjectTypeConverterImpl.this.removeConversionValue(conversionValue);
-		}
-	
-		public String getAnnotationName() {
-			return ObjectTypeConverterImpl.this.getAnnotationName();
-		}
-	
-		public String getNestableAnnotationName() {
-			return EclipseLinkJPA.CONVERSION_VALUE;
-		}
-	
-		public NestableConversionValue nestedAnnotationFor(org.eclipse.jdt.core.dom.Annotation jdtAnnotation) {
-			for (NestableConversionValue conversionValue : CollectionTools.iterable(nestedAnnotations())) {
-				if (jdtAnnotation == conversionValue.getJdtAnnotation((CompilationUnit) jdtAnnotation.getRoot())) {
-					return conversionValue;
-				}
-			}
-			return null;
-		}
-	
-		public org.eclipse.jdt.core.dom.Annotation getJdtAnnotation(CompilationUnit astRoot) {
-			return ObjectTypeConverterImpl.this.getJdtAnnotation(astRoot);
-		}
-	
-		public void newAnnotation() {
-			ObjectTypeConverterImpl.this.newAnnotation();
-		}
-	
-		public void removeAnnotation() {
-			ObjectTypeConverterImpl.this.removeAnnotation();
-		}
-	
-		public void update(CompilationUnit astRoot) {
-			ObjectTypeConverterImpl.this.update(astRoot);
-		}
-		
-		public TextRange getTextRange(CompilationUnit astRoot) {
-			return ObjectTypeConverterImpl.this.getTextRange(astRoot);
-		}
-		
-		public String getElementName() {
-			return EclipseLinkJPA.OBJECT_TYPE_CONVERTER__CONVERSION_VALUES;
-		}
-
-		@Override
-		public void toString(StringBuilder sb) {
-			sb.append(this.getAnnotationName());
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/PrivateOwnedImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/PrivateOwnedImpl.java
deleted file mode 100644
index 2ecaeb2c56..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/PrivateOwnedImpl.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.jdt.Attribute;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.eclipselink.core.resource.java.PrivateOwnedAnnotation;
-
-
-public class PrivateOwnedImpl extends AbstractResourceAnnotation<Attribute> implements PrivateOwnedAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	protected PrivateOwnedImpl(JavaResourceNode parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		//nothing to initialize
-	}
-	
-	public void update(CompilationUnit astRoot) {
-		//nothing to update
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	
-	public static class PrivateOwnedAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final PrivateOwnedAnnotationDefinition INSTANCE = new PrivateOwnedAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private PrivateOwnedAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new PrivateOwnedImpl(parent, (Attribute) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ReadOnlyImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ReadOnlyImpl.java
deleted file mode 100644
index 7a6057ced3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ReadOnlyImpl.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.core.utility.jdt.Type;
-import org.eclipse.jpt.eclipselink.core.resource.java.ReadOnlyAnnotation;
-
-
-public class ReadOnlyImpl extends AbstractResourceAnnotation<Type> implements ReadOnlyAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	protected ReadOnlyImpl(JavaResourceNode parent, Type type) {
-		super(parent, type, DECLARATION_ANNOTATION_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		//nothing to initialize
-	}
-	
-	public void update(CompilationUnit astRoot) {
-		//nothing to update
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	
-	public static class ReadOnlyAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final ReadOnlyAnnotationDefinition INSTANCE = new ReadOnlyAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private ReadOnlyAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new ReadOnlyImpl(parent, (Type) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ReadTransformerImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ReadTransformerImpl.java
deleted file mode 100644
index 20a66c1ebf..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/ReadTransformerImpl.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleTypeStringExpressionConverter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Attribute;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-import org.eclipse.jpt.eclipselink.core.resource.java.ReadTransformerAnnotation;
-
-
-public class ReadTransformerImpl extends AbstractResourceAnnotation<Attribute> implements ReadTransformerAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final AnnotationElementAdapter<String> transformerClassAdapter;
-	private final AnnotationElementAdapter<String> methodAdapter;
-
-	private static final DeclarationAnnotationElementAdapter<String> TRANSFORMER_CLASS_ADAPTER = buildTransformerClassAdapter();
-	private static final DeclarationAnnotationElementAdapter<String> METHOD_ADAPTER = buildMethodAdapter();
-
-	
-	private String transformerClass;
-	private String method;
-	
-	protected ReadTransformerImpl(JavaResourcePersistentAttribute parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-		this.transformerClassAdapter = new ShortCircuitAnnotationElementAdapter<String>(attribute, TRANSFORMER_CLASS_ADAPTER);
-		this.methodAdapter = new ShortCircuitAnnotationElementAdapter<String>(attribute, METHOD_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.transformerClass = this.transformerClass(astRoot);
-		this.method = this.method(astRoot);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	//*************** ReadTransformer implementation ****************
-	public String getTransformerClass() {
-		return this.transformerClass;
-	}
-	
-	public void setTransformerClass(String newTransformerClass) {
-		if (attributeValueHasNotChanged(this.transformerClass, newTransformerClass)) {
-			return;
-		}
-		String oldTransformerClass = this.transformerClass;
-		this.transformerClass = newTransformerClass;
-		this.transformerClassAdapter.setValue(newTransformerClass);
-		firePropertyChanged(TRANSFORMER_CLASS_PROPERTY, oldTransformerClass, newTransformerClass);		
-	}
-	
-	public String getMethod() {
-		return this.method;
-	}
-	
-	public void setMethod(String newMethod) {
-		if (attributeValueHasNotChanged(this.method, newMethod)) {
-			return;
-		}
-		String oldMethod = this.method;
-		this.method = newMethod;
-		this.methodAdapter.setValue(newMethod);
-		firePropertyChanged(METHOD_PROPERTY, oldMethod, newMethod);		
-	}
-
-	public TextRange getTransformerClassTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(TRANSFORMER_CLASS_ADAPTER, astRoot);
-	}
-	
-	public TextRange getMethodTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(METHOD_ADAPTER, astRoot);
-	}
-
-	public void update(CompilationUnit astRoot) {
-		this.setTransformerClass(this.transformerClass(astRoot));
-		this.setMethod(this.method(astRoot));
-	}
-	
-	protected String transformerClass(CompilationUnit astRoot) {
-		return this.transformerClassAdapter.getValue(astRoot);
-	}
-	
-	protected String method(CompilationUnit astRoot) {
-		return this.methodAdapter.getValue(astRoot);
-	}
-	
-	// ********** static methods **********
-	private static DeclarationAnnotationElementAdapter<String> buildTransformerClassAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.READ_TRANSFORMER__TRANSFORMER_CLASS, false, SimpleTypeStringExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<String> buildMethodAdapter() {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.READ_TRANSFORMER__METHOD, false);
-	}
-	
-	public static class ReadTransformerAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final ReadTransformerAnnotationDefinition INSTANCE = new ReadTransformerAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static ReadTransformerAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private ReadTransformerAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new ReadTransformerImpl((JavaResourcePersistentAttribute) parent, (Attribute) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/StructConverterImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/StructConverterImpl.java
deleted file mode 100644
index 3f08cdcf6b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/StructConverterImpl.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.StringExpressionConverter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-import org.eclipse.jpt.eclipselink.core.resource.java.StructConverterAnnotation;
-
-
-public class StructConverterImpl extends AbstractResourceAnnotation<Member> implements StructConverterAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final AnnotationElementAdapter<String> nameAdapter;
-	private final AnnotationElementAdapter<String> converterAdapter;
-
-	private static final DeclarationAnnotationElementAdapter<String> NAME_ADAPTER = buildNameAdapter();
-	private static final DeclarationAnnotationElementAdapter<String> CONVERTER_ADAPTER = buildConverterAdapter();
-
-	
-	private String name;
-	private String converter;
-	
-	protected StructConverterImpl(JavaResourcePersistentMember parent, Member member) {
-		super(parent, member, DECLARATION_ANNOTATION_ADAPTER);
-		this.nameAdapter = new ShortCircuitAnnotationElementAdapter<String>(member, NAME_ADAPTER);
-		this.converterAdapter = new ShortCircuitAnnotationElementAdapter<String>(member, CONVERTER_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.name = this.name(astRoot);
-		this.converter = this.converter(astRoot);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	//*************** CustomConverter implementation ****************
-	public String getName() {
-		return this.name;
-	}
-	
-	public void setName(String newName) {
-		if (attributeValueHasNotChanged(this.name, newName)) {
-			return;
-		}
-		String oldName = this.name;
-		this.name = newName;
-		this.nameAdapter.setValue(newName);
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
-	}
-
-	public String getConverter() {
-		return this.converter;
-	}
-	
-	public void setConverter(String newConverter) {
-		if (attributeValueHasNotChanged(this.converter, newConverter)) {
-			return;
-		}
-		String oldConverter = this.converter;
-		this.converter = newConverter;
-		this.converterAdapter.setValue(newConverter);
-		firePropertyChanged(CONVERTER_PROPERTY, oldConverter, newConverter);
-	}
-	
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(NAME_ADAPTER, astRoot);
-	}
-
-	public TextRange getConverterTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(CONVERTER_ADAPTER, astRoot);
-	}
-	
-	public void update(CompilationUnit astRoot) {
-		this.setName(this.name(astRoot));
-		this.setConverter(this.converter(astRoot));
-	}
-	
-	protected String name(CompilationUnit astRoot) {
-		return this.nameAdapter.getValue(astRoot);
-	}
-	
-	protected String converter(CompilationUnit astRoot) {
-		return this.converterAdapter.getValue(astRoot);
-	}
-	
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.name);
-	}
-	
-	// ********** static methods **********
-	private static DeclarationAnnotationElementAdapter<String> buildNameAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.STRUCT_CONVERTER__NAME, false, StringExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<String> buildConverterAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.STRUCT_CONVERTER__CONVERTER, false, StringExpressionConverter.instance());
-	}
-	
-	public static class StructConverterAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final StructConverterAnnotationDefinition INSTANCE = new StructConverterAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static StructConverterAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private StructConverterAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new StructConverterImpl(parent, member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/TimeOfDayImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/TimeOfDayImpl.java
deleted file mode 100644
index 080e85d7b8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/TimeOfDayImpl.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.NumberIntegerExpressionConverter;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Type;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-import org.eclipse.jpt.eclipselink.core.resource.java.TimeOfDayAnnotation;
-
-
-public class TimeOfDayImpl extends AbstractResourceAnnotation<Type> implements TimeOfDayAnnotation
-{	
-	private final AnnotationElementAdapter<Integer> hourAdapter;
-	private final AnnotationElementAdapter<Integer> minuteAdapter;
-	private final AnnotationElementAdapter<Integer> secondAdapter;
-	private final AnnotationElementAdapter<Integer> millisecondAdapter;
-	
-	private final DeclarationAnnotationElementAdapter<Integer> hourDeclarationAdapter;
-	private final DeclarationAnnotationElementAdapter<Integer> minuteDeclarationAdapter;
-	private final DeclarationAnnotationElementAdapter<Integer> secondDeclarationAdapter;
-	private final DeclarationAnnotationElementAdapter<Integer> millisecondDeclarationAdapter;
-	
-	
-	private Integer hour;
-	private Integer minute;
-	private Integer second;
-	private Integer millisecond;
-	
-	protected TimeOfDayImpl(JavaResourceNode parent, Type type, DeclarationAnnotationAdapter daa) {
-		super(parent, type, daa);
-		this.hourDeclarationAdapter = buildHourAdapter(daa);
-		this.hourAdapter = new ShortCircuitAnnotationElementAdapter<Integer>(type, this.hourDeclarationAdapter);
-		this.minuteDeclarationAdapter = buildMinuteAdapter(daa);
-		this.minuteAdapter = new ShortCircuitAnnotationElementAdapter<Integer>(type, this.minuteDeclarationAdapter);
-		this.secondDeclarationAdapter = buildSecondAdapter(daa);
-		this.secondAdapter = new ShortCircuitAnnotationElementAdapter<Integer>(type, this.secondDeclarationAdapter);
-		this.millisecondDeclarationAdapter = buildMillisecondAdapter(daa);
-		this.millisecondAdapter = new ShortCircuitAnnotationElementAdapter<Integer>(type, this.millisecondDeclarationAdapter);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	//*************** TimeOfDayAnnotation implementation ****************
-	
-	public Integer getHour() {
-		return this.hour;
-	}
-	
-	public void setHour(Integer newHour) {
-		if (attributeValueHasNotChanged(this.hour, newHour)) {
-			return;
-		}
-		Integer oldHour = this.hour;
-		this.hour = newHour;
-		this.hourAdapter.setValue(newHour);
-		firePropertyChanged(HOUR_PROPERTY, oldHour, newHour);
-	}
-
-	public Integer getMinute() {
-		return this.minute;
-	}
-	
-	public void setMinute(Integer newMinute) {
-		if (attributeValueHasNotChanged(this.minute, newMinute)) {
-			return;
-		}
-		Integer oldMinute = this.minute;
-		this.minute = newMinute;
-		this.minuteAdapter.setValue(newMinute);
-		firePropertyChanged(MINUTE_PROPERTY, oldMinute, newMinute);
-	}
-	
-	public Integer getSecond() {
-		return this.second;
-	}
-	
-	public void setSecond(Integer newSecond) {
-		if (attributeValueHasNotChanged(this.second, newSecond)) {
-			return;
-		}
-		Integer oldSecond = this.second;
-		this.second = newSecond;
-		this.secondAdapter.setValue(newSecond);
-		firePropertyChanged(SECOND_PROPERTY, oldSecond, newSecond);
-	}
-	
-	public Integer getMillisecond() {
-		return this.millisecond;
-	}
-	
-	public void setMillisecond(Integer newMillisecond) {
-		if (attributeValueHasNotChanged(this.millisecond, newMillisecond)) {
-			return;
-		}
-		Integer oldMillisecond = this.millisecond;
-		this.millisecond = newMillisecond;
-		this.millisecondAdapter.setValue(newMillisecond);
-		firePropertyChanged(MILLISECOND_PROPERTY, oldMillisecond, newMillisecond);
-	}
-	
-	public TextRange getHourTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.hourDeclarationAdapter, astRoot);
-	}
-
-	public TextRange getMinuteTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.minuteDeclarationAdapter, astRoot);
-	}
-	
-	public TextRange getSecondTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.secondDeclarationAdapter, astRoot);
-	}
-	
-	public TextRange getMillisecondTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.millisecondDeclarationAdapter, astRoot);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.hour = this.hour(astRoot);
-		this.minute = this.minute(astRoot);
-		this.second = this.second(astRoot);
-		this.millisecond = this.millisecond(astRoot);
-	}
-
-	public void update(CompilationUnit astRoot) {
-		this.setHour(this.hour(astRoot));
-		this.setMinute(this.minute(astRoot));
-		this.setSecond(this.second(astRoot));
-		this.setMillisecond(this.millisecond(astRoot));
-	}
-	
-	protected Integer hour(CompilationUnit astRoot) {
-		return this.hourAdapter.getValue(astRoot);
-	}
-	
-	protected Integer minute(CompilationUnit astRoot) {
-		return this.minuteAdapter.getValue(astRoot);
-	}
-	
-	protected Integer second(CompilationUnit astRoot) {
-		return this.secondAdapter.getValue(astRoot);
-	}
-	
-	protected Integer millisecond(CompilationUnit astRoot) {
-		return this.millisecondAdapter.getValue(astRoot);
-	}
-	
-	// ********** static methods **********
-	
-	private static DeclarationAnnotationElementAdapter<Integer> buildHourAdapter(DeclarationAnnotationAdapter daa) {
-		return new ConversionDeclarationAnnotationElementAdapter<Integer>(daa, EclipseLinkJPA.TIME_OF_DAY__HOUR, false, NumberIntegerExpressionConverter.instance());
-	}
-	
-	private static DeclarationAnnotationElementAdapter<Integer> buildMinuteAdapter(DeclarationAnnotationAdapter daa) {
-		return new ConversionDeclarationAnnotationElementAdapter<Integer>(daa, EclipseLinkJPA.TIME_OF_DAY__MINUTE, false, NumberIntegerExpressionConverter.instance());
-	}
-	
-	private static DeclarationAnnotationElementAdapter<Integer> buildSecondAdapter(DeclarationAnnotationAdapter daa) {
-		return new ConversionDeclarationAnnotationElementAdapter<Integer>(daa, EclipseLinkJPA.TIME_OF_DAY__SECOND, false, NumberIntegerExpressionConverter.instance());
-	}
-	
-	private static DeclarationAnnotationElementAdapter<Integer> buildMillisecondAdapter(DeclarationAnnotationAdapter daa) {
-		return new ConversionDeclarationAnnotationElementAdapter<Integer>(daa, EclipseLinkJPA.TIME_OF_DAY__MILLISECOND, false, NumberIntegerExpressionConverter.instance());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/TransformationImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/TransformationImpl.java
deleted file mode 100644
index b5b4f85571..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/TransformationImpl.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.BooleanExpressionConverter;
-import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.EnumDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.FetchType;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Attribute;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-import org.eclipse.jpt.eclipselink.core.resource.java.TransformationAnnotation;
-
-
-public class TransformationImpl extends AbstractResourceAnnotation<Attribute> implements TransformationAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final AnnotationElementAdapter<Boolean> optionalAdapter;
-
-	private final AnnotationElementAdapter<String> fetchAdapter;
-
-	private static final DeclarationAnnotationElementAdapter<Boolean> OPTIONAL_ADAPTER = buildOptionalAdapter();
-
-	private static final DeclarationAnnotationElementAdapter<String> FETCH_ADAPTER = buildFetchAdapter();
-	
-	private Boolean optional;
-	
-	private FetchType fetch;
-	
-	protected TransformationImpl(JavaResourcePersistentAttribute parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-		this.optionalAdapter = new ShortCircuitAnnotationElementAdapter<Boolean>(attribute, OPTIONAL_ADAPTER);
-		this.fetchAdapter = new ShortCircuitAnnotationElementAdapter<String>(attribute, FETCH_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.optional = this.optional(astRoot);
-		this.fetch = this.fetch(astRoot);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	//*************** Transformation implementation ****************
-	public Boolean getOptional() {
-		return this.optional;
-	}
-	
-	public void setOptional(Boolean newOptional) {
-		if (attributeValueHasNotChanged(this.optional, newOptional)) {
-			return;
-		}
-		Boolean oldOptional = this.optional;
-		this.optional = newOptional;
-		this.optionalAdapter.setValue(newOptional);
-		firePropertyChanged(OPTIONAL_PROPERTY, oldOptional, newOptional);
-	}
-
-	public FetchType getFetch() {
-		return this.fetch;
-	}
-	
-	public void setFetch(FetchType newFetch) {
-		if (attributeValueHasNotChanged(this.fetch, newFetch)) {
-			return;
-		}
-		FetchType oldFetch = this.fetch;
-		this.fetch = newFetch;
-		this.fetchAdapter.setValue(FetchType.toJavaAnnotationValue(newFetch));
-		firePropertyChanged(FETCH_PROPERTY, oldFetch, newFetch);
-	}
-	
-	public TextRange getFetchTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(FETCH_ADAPTER, astRoot);
-	}
-	
-	public TextRange getOptionalTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(OPTIONAL_ADAPTER, astRoot);
-	}
-
-	public void update(CompilationUnit astRoot) {
-		this.setOptional(this.optional(astRoot));
-		this.setFetch(this.fetch(astRoot));
-	}
-	
-	protected FetchType fetch(CompilationUnit astRoot) {
-		return FetchType.fromJavaAnnotationValue(this.fetchAdapter.getValue(astRoot));
-	}
-	
-	protected Boolean optional(CompilationUnit astRoot) {
-		return this.optionalAdapter.getValue(astRoot);
-	}
-	
-	// ********** static methods **********
-	private static DeclarationAnnotationElementAdapter<Boolean> buildOptionalAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.TRANSFORMATION__OPTIONAL, false, BooleanExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<String> buildFetchAdapter() {
-		return new EnumDeclarationAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.TRANSFORMATION__FETCH, false);
-	}
-	
-	public static class TransformationAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final TransformationAnnotationDefinition INSTANCE = new TransformationAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static TransformationAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private TransformationAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new TransformationImpl((JavaResourcePersistentAttribute) parent, (Attribute) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new NullTransformation(parent);
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/TypeConverterImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/TypeConverterImpl.java
deleted file mode 100644
index 5431b88800..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/TypeConverterImpl.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.StringExpressionConverter;
-import org.eclipse.jpt.core.internal.utility.jdt.TypeStringExpressionConverter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-import org.eclipse.jpt.eclipselink.core.resource.java.TypeConverterAnnotation;
-
-
-public class TypeConverterImpl extends AbstractResourceAnnotation<Member> implements TypeConverterAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final AnnotationElementAdapter<String> nameAdapter;
-	private final AnnotationElementAdapter<String> dataTypeAdapter;
-	private final AnnotationElementAdapter<String> objectTypeAdapter;
-
-	private static final DeclarationAnnotationElementAdapter<String> NAME_ADAPTER = buildNameAdapter();
-	private static final DeclarationAnnotationElementAdapter<String> DATA_TYPE_ADAPTER = buildDataTypeAdapter();
-	private static final DeclarationAnnotationElementAdapter<String> OBJECT_TYPE_ADAPTER = buildObjectTypeAdapter();
-
-	
-	private String name;
-	private String dataType;
-	private String objectType;
-	
-	protected TypeConverterImpl(JavaResourcePersistentMember parent, Member member) {
-		super(parent, member, DECLARATION_ANNOTATION_ADAPTER);
-		this.nameAdapter = new ShortCircuitAnnotationElementAdapter<String>(member, NAME_ADAPTER);
-		this.dataTypeAdapter = new ShortCircuitAnnotationElementAdapter<String>(member, DATA_TYPE_ADAPTER);
-		this.objectTypeAdapter = new ShortCircuitAnnotationElementAdapter<String>(member, OBJECT_TYPE_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.name = this.name(astRoot);
-		this.dataType = this.dataType(astRoot);
-		this.objectType = this.objectType(astRoot);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	//*************** TypeConverter implementation ****************
-	public String getName() {
-		return this.name;
-	}
-	
-	public void setName(String newName) {
-		if (attributeValueHasNotChanged(this.name, newName)) {
-			return;
-		}
-		String oldName = this.name;
-		this.name = newName;
-		this.nameAdapter.setValue(newName);
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
-	}
-
-	public String getDataType() {
-		return this.dataType;
-	}
-	
-	public void setDataType(String newDataType) {
-		if (attributeValueHasNotChanged(this.dataType, newDataType)) {
-			return;
-		}
-		String oldDataType = this.dataType;
-		this.dataType = newDataType;
-		this.dataTypeAdapter.setValue(newDataType);
-		firePropertyChanged(DATA_TYPE_PROPERTY, oldDataType, newDataType);
-	}
-	
-	public String getObjectType() {
-		return this.objectType;
-	}
-	
-	public void setObjectType(String newObjectType) {
-		if (attributeValueHasNotChanged(this.objectType, newObjectType)) {
-			return;
-		}
-		String oldObjectType = this.objectType;
-		this.objectType = newObjectType;
-		this.objectTypeAdapter.setValue(newObjectType);
-		firePropertyChanged(OBJECT_TYPE_PROPERTY, oldObjectType, newObjectType);
-	}
-	
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(NAME_ADAPTER, astRoot);
-	}
-
-	public TextRange getDataTypeTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(DATA_TYPE_ADAPTER, astRoot);
-	}
-	
-	public TextRange getObjectTypeTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(OBJECT_TYPE_ADAPTER, astRoot);
-	}
-	
-	public void update(CompilationUnit astRoot) {
-		this.setName(this.name(astRoot));
-		this.setDataType(this.dataType(astRoot));
-		this.setObjectType(this.objectType(astRoot));
-	}
-	
-	protected String name(CompilationUnit astRoot) {
-		return this.nameAdapter.getValue(astRoot);
-	}
-	
-	protected String dataType(CompilationUnit astRoot) {
-		return this.dataTypeAdapter.getValue(astRoot);
-	}
-	
-	protected String objectType(CompilationUnit astRoot) {
-		return this.objectTypeAdapter.getValue(astRoot);
-	}
-	
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.name);
-	}
-	
-	// ********** static methods **********
-	private static DeclarationAnnotationElementAdapter<String> buildNameAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.TYPE_CONVERTER__NAME, false, StringExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<String> buildDataTypeAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.TYPE_CONVERTER__DATE_TYPE, false, TypeStringExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<String> buildObjectTypeAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.TYPE_CONVERTER__OBJECT_TYPE, false, TypeStringExpressionConverter.instance());
-	}
-	
-	public static class TypeConverterAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final TypeConverterAnnotationDefinition INSTANCE = new TypeConverterAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static TypeConverterAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private TypeConverterAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new TypeConverterImpl(parent, member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/VariableOneToOneImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/VariableOneToOneImpl.java
deleted file mode 100644
index 8583bdca38..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/VariableOneToOneImpl.java
+++ /dev/null
@@ -1,75 +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.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.jdt.Attribute;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.eclipselink.core.resource.java.VariableOneToOneAnnotation;
-
-
-public class VariableOneToOneImpl extends AbstractResourceAnnotation<Attribute> implements VariableOneToOneAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	
-	protected VariableOneToOneImpl(JavaResourcePersistentAttribute parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void update(CompilationUnit astRoot) {
-	}
-	
-	public static class VariableOneToOneAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final VariableOneToOneAnnotationDefinition INSTANCE = new VariableOneToOneAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static VariableOneToOneAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private VariableOneToOneAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new VariableOneToOneImpl((JavaResourcePersistentAttribute) parent, (Attribute) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/WriteTransformerImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/WriteTransformerImpl.java
deleted file mode 100644
index d841323cf8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/java/WriteTransformerImpl.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.resource.java.AbstractResourceAnnotation;
-import org.eclipse.jpt.core.internal.resource.java.ColumnImpl;
-import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.MemberAnnotationAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.NestedDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleTypeStringExpressionConverter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.ColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Attribute;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
-import org.eclipse.jpt.eclipselink.core.resource.java.WriteTransformerAnnotation;
-
-
-public class WriteTransformerImpl extends AbstractResourceAnnotation<Attribute> implements WriteTransformerAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final AnnotationElementAdapter<String> transformerClassAdapter;
-	private final AnnotationElementAdapter<String> methodAdapter;
-	private final MemberAnnotationAdapter columnAdapter;
-
-	private static final DeclarationAnnotationElementAdapter<String> TRANSFORMER_CLASS_ADAPTER = buildTransformerClassAdapter();
-	private static final DeclarationAnnotationElementAdapter<String> METHOD_ADAPTER = buildMethodAdapter();
-
-	private String transformerClass;
-	private String method;
-	private ColumnImpl column;
-	
-	
-	protected WriteTransformerImpl(JavaResourcePersistentAttribute parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-		this.transformerClassAdapter = new ShortCircuitAnnotationElementAdapter<String>(attribute, TRANSFORMER_CLASS_ADAPTER);
-		this.methodAdapter = new ShortCircuitAnnotationElementAdapter<String>(attribute, METHOD_ADAPTER);
-		this.columnAdapter = new MemberAnnotationAdapter(getMember(), buildColumnAnnotationAdapter(getDeclarationAnnotationAdapter()));
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		this.transformerClass = this.transformerClass(astRoot);
-		this.method = this.method(astRoot);
-		if (this.columnAdapter.getAnnotation(astRoot) != null) {
-			this.column = createColumn(this, getMember(), getDeclarationAnnotationAdapter());
-			this.column.initialize(astRoot);
-		}
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	//*************** WriteTransformer implementation ****************
-	public String getTransformerClass() {
-		return this.transformerClass;
-	}
-	
-	public void setTransformerClass(String newTransformerClass) {
-		if (attributeValueHasNotChanged(this.transformerClass, newTransformerClass)) {
-			return;
-		}
-		String oldTransformerClass = this.transformerClass;
-		this.transformerClass = newTransformerClass;
-		this.transformerClassAdapter.setValue(newTransformerClass);
-		firePropertyChanged(TRANSFORMER_CLASS_PROPERTY, oldTransformerClass, newTransformerClass);		
-	}
-	
-	public String getMethod() {
-		return this.method;
-	}
-	
-	public void setMethod(String newMethod) {
-		if (attributeValueHasNotChanged(this.method, newMethod)) {
-			return;
-		}
-		String oldMethod = this.method;
-		this.method = newMethod;
-		this.methodAdapter.setValue(newMethod);
-		firePropertyChanged(METHOD_PROPERTY, oldMethod, newMethod);		
-	}
-
-	public ColumnAnnotation getNonNullColumn() {
-		return (getColumn() != null) ? getColumn() : new NullWriteTransformerColumn(this);
-	}
-	
-	public ColumnAnnotation getColumn() {
-		return this.column;
-	}
-	
-	public ColumnAnnotation addColumn() {
-		ColumnImpl column = createColumn(this, getMember(), getDeclarationAnnotationAdapter());
-		column.newAnnotation();
-		setColumn(column);
-		return column;
-	}
-
-	public void removeColumn() {
-		this.column.removeAnnotation();
-		setColumn(null);
-	}
-	
-	protected void setColumn(ColumnImpl newColumn) {
-		ColumnImpl oldColumn = this.column;
-		this.column = newColumn;
-		firePropertyChanged(WriteTransformerAnnotation.COLUMN_PROPERTY, oldColumn, newColumn);
-	}
-
-	
-	public TextRange getTransformerClassTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(TRANSFORMER_CLASS_ADAPTER, astRoot);
-	}
-	
-	public TextRange getMethodTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(METHOD_ADAPTER, astRoot);
-	}
-	
-	public TextRange getColumnTextRange(CompilationUnit astRoot) {
-		if (this.column != null) {
-			return this.column.getTextRange(astRoot);
-		}
-		return getTextRange(astRoot);
-	}
-
-	public void update(CompilationUnit astRoot) {
-		this.setTransformerClass(this.transformerClass(astRoot));
-		this.setMethod(this.method(astRoot));
-		if (this.columnAdapter.getAnnotation(astRoot) == null) {
-			this.setColumn(null);
-		}
-		else {
-			if (getColumn() != null) {
-				getColumn().update(astRoot);
-			}
-			else {
-				ColumnImpl column = createColumn(this, getMember(), getDeclarationAnnotationAdapter());
-				column.initialize(astRoot);
-				this.setColumn(column);
-			}
-		}
-	}
-	
-	protected String transformerClass(CompilationUnit astRoot) {
-		return this.transformerClassAdapter.getValue(astRoot);
-	}
-	
-	protected String method(CompilationUnit astRoot) {
-		return this.methodAdapter.getValue(astRoot);
-	}
-	
-	// ********** static methods **********
-	private static DeclarationAnnotationElementAdapter<String> buildTransformerClassAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.WRITE_TRANSFORMER__TRANSFORMER_CLASS, false, SimpleTypeStringExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<String> buildMethodAdapter() {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, EclipseLinkJPA.WRITE_TRANSFORMER__METHOD, false);
-	}
-	
-	private static DeclarationAnnotationAdapter buildColumnAnnotationAdapter(DeclarationAnnotationAdapter writeTransformerAnnotationAdapter) {
-		return new NestedDeclarationAnnotationAdapter(writeTransformerAnnotationAdapter, EclipseLinkJPA.WRITE_TRANSFORMER__COLUMN, JPA.COLUMN, false);
-	}
-
-	private static ColumnImpl createColumn(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter writeTransformerAnnotationAdapter) {
-		return new ColumnImpl(parent, member, buildColumnAnnotationAdapter(writeTransformerAnnotationAdapter));
-	}
-
-	public static class WriteTransformerAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final WriteTransformerAnnotationDefinition INSTANCE = new WriteTransformerAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static WriteTransformerAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure single instance.
-		 */
-		private WriteTransformerAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new WriteTransformerImpl((JavaResourcePersistentAttribute) parent, (Attribute) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/EclipseLink1_1OrmXmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/EclipseLink1_1OrmXmlResourceProvider.java
deleted file mode 100644
index 6d8851bb0c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/EclipseLink1_1OrmXmlResourceProvider.java
+++ /dev/null
@@ -1,72 +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.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.core.runtime.Path;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.resource.AbstractXmlResourceProvider;
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkConstants;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-
-public class EclipseLink1_1OrmXmlResourceProvider
-	extends AbstractXmlResourceProvider
-{
-	/**
-	 * (Convenience method) Returns an EclipseLink ORM resource model provider for 
-	 * the given file.
-	 */
-	public static EclipseLink1_1OrmXmlResourceProvider getXmlResourceProvider(IFile file) {
-		return getXmlResourceProvider_(file.getProject(), file.getFullPath().toString());
-	}
-	
-	/**
-	 * (Convenience method) Returns an EclipseLink ORM resource model provider for
-	 * the given project in the specified deploy location
-	 */
-	public static EclipseLink1_1OrmXmlResourceProvider getXmlResourceProvider(IProject project, String deployLocation) {
-		return getXmlResourceProvider_(project, JptCorePlugin.getDeploymentURI(project, deployLocation));
-		
-	}
-	
-	/**
-	 * (Convenience method) Returns an EclipseLink ORM resource model provider for 
-	 * the given project in the default deploy location
-	 */
-	public static EclipseLink1_1OrmXmlResourceProvider getDefaultXmlResourceProvider(IProject project) {
-		return getXmlResourceProvider(project, JptEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_FILE_PATH);
-	}
-	
-	private static EclipseLink1_1OrmXmlResourceProvider getXmlResourceProvider_(IProject project, String location) {
-		return new EclipseLink1_1OrmXmlResourceProvider(project, new Path(location));
-	}
-	
-	
-	public EclipseLink1_1OrmXmlResourceProvider(IProject project) {
-		this(project, new Path(JptEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_FILE_PATH));
-	}
-	
-	public EclipseLink1_1OrmXmlResourceProvider(IProject project, IPath filePath) {
-		super(project, filePath, JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE);
-	}
-	
-
-	@Override
-	protected void populateRoot() {
-		XmlEntityMappings entityMappings = EclipseLink1_1OrmFactory.eINSTANCE.createXmlEntityMappings();
-		entityMappings.setVersion(EclipseLinkConstants.VERSION_1_1_TEXT);
-		getResourceContents().add(entityMappings);
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java
deleted file mode 100644
index 10aa5d8254..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java
+++ /dev/null
@@ -1,70 +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.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.core.runtime.Path;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.resource.AbstractXmlResourceProvider;
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkConstants;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-
-public class EclipseLinkOrmXmlResourceProvider
-	extends AbstractXmlResourceProvider
-{
-	/**
-	 * (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().toString());
-	}
-	
-	/**
-	 * (Convenience method) Returns an EclipseLink ORM resource model provider for
-	 * the given project in the specified deploy location
-	 */
-	public static EclipseLinkOrmXmlResourceProvider getXmlResourceProvider(IProject project, String deployLocation) {
-		return getXmlResourceProvider_(project, JptCorePlugin.getDeploymentURI(project, deployLocation));
-		
-	}
-	
-	/**
-	 * (Convenience method) Returns an EclipseLink ORM resource model provider for 
-	 * the given project in the default deploy location
-	 */
-	public static EclipseLinkOrmXmlResourceProvider getDefaultXmlResourceProvider(IProject project) {
-		return getXmlResourceProvider(project, JptEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_FILE_PATH);
-	}
-	
-	private static EclipseLinkOrmXmlResourceProvider getXmlResourceProvider_(IProject project, String location) {
-		return new EclipseLinkOrmXmlResourceProvider(project, new Path(location));
-	}
-	
-	
-	public EclipseLinkOrmXmlResourceProvider(IProject project) {
-		this(project, new Path(JptEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_FILE_PATH));
-	}
-	
-	public EclipseLinkOrmXmlResourceProvider(IProject project, IPath filePath) {
-		super(project, filePath, JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE);
-	}
-	
-	@Override
-	protected void populateRoot() {
-		XmlEntityMappings entityMappings = EclipseLinkOrmFactory.eINSTANCE.createXmlEntityMappings();
-		entityMappings.setVersion(EclipseLinkConstants.VERSION_1_0_TEXT);
-		getResourceContents().add(entityMappings);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/XMLRootElementContentDescriber2.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/XMLRootElementContentDescriber2.java
deleted file mode 100644
index c4d468e99b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/XMLRootElementContentDescriber2.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jesper Steen Moeller - added namespace support
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.orm;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import javax.xml.parsers.ParserConfigurationException;
-import org.eclipse.core.internal.content.ContentMessages;
-import org.eclipse.core.internal.runtime.RuntimeLog;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.XMLContentDescriber;
-import org.eclipse.osgi.util.NLS;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-//TODO bug 263976 - copied from org.eclipse.core.runtime.content.XMLRootElementContentDescriber2
-/**
- * A content describer for detecting the name of the top-level element, 
- * its namespace and the DTD system identifier in an XML file.
- * <p>
- * This executable extension supports "element" parameter, that 
- * can be specified more than once. If the
- * <code>":-"</code> method is used, then the value is treated as
- * "element" (always just one)
- * </p>
- * <p>
- * The value of "element" is specified using such a format
- * <code>{namespace}name/dtd:version</code>. The namespace or dtd part  
- * can be omitted and accepted are values like <code>name/dtd</code>,
- * <code>{ns}name</code> and <code>name</code>.
- * </p>
- * <p>
- * The describer will detect a document, if it matches at least one "element"
- * what means, that dtd, namespace (if specified) and name in "element"
- * match those in the document.
- * </p>
- * <p>
- * If the "element" name part is "*", e.g. <code>{namespace}*</code>, 
- * it denotes a wildcard match. If the "element" namespace part is empty, 
- * e.g. <code>{}name</code>, only these documents with the root element 
- * that belong to the unnamed namespace <code><elem xmlns=""></code> 
- * will be detected.
- * </p>
- * <p>
- * This class should be used instead of {@link XMLRootElementContentDescriber}
- * which doesn't detect namespaces and doesn't allow to specify 
- * more than one set of dtds, root element names and namespaces which 
- * should be detected.
- * </p>
- * <p>
- * This class is not intended to be subclassed or instantiated by clients, 
- * only to be referenced by the "describer" configuration element in
- * extensions to the <code>org.eclipse.core.runtime.contentTypes</code>
- * extension point.
- * </p>
- * 
- * @since org.eclipse.core.contenttype 3.3
- */
-public final class XMLRootElementContentDescriber2 extends XMLContentDescriber implements IExecutableExtension {
-	private static final String ELEMENT_TO_FIND = "element"; //$NON-NLS-1$
-	
-	/* (Intentionally not included in javadoc)
-	 * The top-level elements we are looking for. This value will be initialized
-	 * by the <code>setInitializationData</code> method. If no value is
-	 * provided, then this means that we don't care what the top-level element
-	 * will be. The list is a collection of <code>QualifiedElement</code>. 
-	 */
-	private QualifiedElement[] elementsToFind = null;
-
-	/* (Intentionally not included in javadoc)
-	 * Simple value holder for root element name, its namespace and dtd.
-	 */
-	 private class QualifiedElement {
-		private String namespace;
-		private String element;
-		private String dtd;
-		private String version;
-		
-		public QualifiedElement(String namespace, String element, String dtd, String version) {
-			this.namespace = namespace;
-			this.element = element;
-			this.dtd = dtd;
-			this.version = version;
-		}
-
-		public QualifiedElement(String qualifiedElement) {
-			// Extract namespace part
-			int openBrace = qualifiedElement.indexOf('{');
-			int closeBrace = qualifiedElement.indexOf('}');
-			if (openBrace == 0 && closeBrace >=1 ) {
-				namespace = qualifiedElement.substring(1, closeBrace);
-				qualifiedElement = qualifiedElement.substring(closeBrace+1);
-			}
-			// Extract dtd part
-			int dtdSlash = qualifiedElement.indexOf('/');
-			if (dtdSlash > 0) {
-				dtd = qualifiedElement.substring(dtdSlash+1);
-				qualifiedElement = qualifiedElement.substring(0, dtdSlash);
-			}
-			// Extract version part
-			int versionSlash = qualifiedElement.indexOf(':');
-			if (versionSlash > 0) {
-				version = qualifiedElement.substring(versionSlash + 1);
-				qualifiedElement = qualifiedElement.substring(0, versionSlash);
-			}
-			
-			// Check if the name is a wildcard
-			element = ("*".equals(qualifiedElement) ? null : qualifiedElement);
-		}
-
-		public String getNamespace() {
-			return namespace;
-		}
-		
-		public String getElement() {
-			return element;
-		}
-		public String getDTD() {
-			return dtd;
-		}
-		
-		public String getVersion() {
-			return version;
-		}
-		
-		public boolean matches(String someNamespace, String someElement, String someDtd, String someVersion) {
-			boolean nsMatch = this.namespace != null ? this.namespace.equals(someNamespace) : true;
-			boolean elementEquals = this.element != null ? this.element.equals(someElement) : true;
-			boolean dtdEquals = this.dtd != null ? this.dtd.equals(someDtd) : true;
-			boolean versionEquals = this.version != null ? this.version.equals(someVersion) : true;
-			return nsMatch && elementEquals && dtdEquals && versionEquals;
-		}
-	}
-	
-	/* (Intentionally not included in javadoc)
-	 * Determines the validation status for the given contents.
-	 * 
-	 * @param contents the contents to be evaluated
-	 * @return one of the following:<ul>
-	 * <li><code>VALID</code></li>,
-	 * <li><code>INVALID</code></li>,
-	 * <li><code>INDETERMINATE</code></li>
-	 * </ul>
-	 * @throws IOException
-	 */
-	private int checkCriteria(InputSource contents) throws IOException {
-		XMLRootHandler xmlHandler = new XMLRootHandler(elementsToFind != null);
-		try {
-			if (!xmlHandler.parseContents(contents))
-				return INDETERMINATE;
-		} catch (SAXException e) {
-			// we may be handed any kind of contents... it is normal we fail to parse
-			return INDETERMINATE;
-		} catch (ParserConfigurationException e) {
-			// some bad thing happened - force this describer to be disabled
-			String message = ContentMessages.content_parserConfiguration;
-			RuntimeLog.log(new Status(IStatus.ERROR, ContentMessages.OWNER_NAME, 0, message, e));
-			throw new RuntimeException(message);
-		}
-		// Check to see if we matched our criteria.
-		if (elementsToFind != null) {
-			boolean foundOne = false;
-			for (int i = 0; i < elementsToFind.length && !foundOne; ++i) {
-				foundOne |= elementsToFind[i].matches(xmlHandler.getRootNamespace(), xmlHandler.getRootName(), xmlHandler.getDTD(), xmlHandler.getVersion());
-			}
-			if (!foundOne)
-				return INDETERMINATE;
-		}
-		// We must be okay then.		
-		return VALID;
-	}
-
-	/* (Intentionally not included in javadoc)
-	 * @see IContentDescriber#describe(InputStream, IContentDescription)
-	 */
-	@Override
-	public int describe(InputStream contents, IContentDescription description) throws IOException {
-		// call the basic XML describer to do basic recognition
-		if (super.describe(contents, description) == INVALID)
-			return INVALID;
-		// super.describe will have consumed some chars, need to rewind		
-		contents.reset();
-		// Check to see if we matched our criteria.		
-		return checkCriteria(new InputSource(contents));
-	}
-
-	/* (Intentionally not included in javadoc)
-	 * @see IContentDescriber#describe(Reader, IContentDescription)
-	 */
-	@Override
-	public int describe(Reader contents, IContentDescription description) throws IOException {
-		// call the basic XML describer to do basic recognition
-		if (super.describe(contents, description) == INVALID)
-			return INVALID;
-		// super.describe will have consumed some chars, need to rewind
-		contents.reset();
-		// Check to see if we matched our criteria.
-		return checkCriteria(new InputSource(contents));
-	}
-
-	/* (Intentionally not included in javadoc)
-	 * @see IExecutableExtension#setInitializationData
-	 */
-	public void setInitializationData(final IConfigurationElement config, final String propertyName, final Object data) throws CoreException {
-		if (data instanceof String)
-			elementsToFind = new QualifiedElement[] {new QualifiedElement((String) data)};
-		else if (data instanceof Hashtable) {
-			List elements = null;
-
-			// the describer parameters have to be read again, because "element" parameter can be specified multiple times 
-			// and the given hashtable carries only one of them
-			IConfigurationElement describerElement = config.getChildren("describer")[0]; //$NON-NLS-1$
-			IConfigurationElement[] params = describerElement.getChildren("parameter"); //$NON-NLS-1$
-			String pname = null;
-			for (int i = 0; i < params.length; i++) {
-				pname = params[i].getAttribute("name"); //$NON-NLS-1$
-				if (ELEMENT_TO_FIND.equals(pname)) {
-					if (elements == null)
-						elements = new LinkedList();
-					elements.add(new QualifiedElement(params[i].getAttribute("value"))); //$NON-NLS-1$
-				}
-			}
-
-			List qualifiedElements = new ArrayList();
-
-			// create list of qualified elements
-			if (elements != null) {
-				for (Iterator it = elements.iterator(); it.hasNext();) {
-					qualifiedElements.add(it.next());
-				}
-			}
-			elementsToFind = (QualifiedElement[]) qualifiedElements.toArray(new QualifiedElement[qualifiedElements.size()]);
-		}
-
-		if (elementsToFind.length == 0) {
-			String message = NLS.bind(ContentMessages.content_badInitializationData, XMLRootElementContentDescriber2.class.getName());
-			throw new CoreException(new Status(IStatus.ERROR, ContentMessages.OWNER_NAME, 0, message, null));
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/XMLRootHandler.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/XMLRootHandler.java
deleted file mode 100644
index 8dc970953b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/XMLRootHandler.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.orm;
-
-import java.io.IOException;
-import java.io.StringReader;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-import org.eclipse.core.internal.content.Activator;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.DefaultHandler;
-
-//TODO bug 263976 - copied from org.eclipse.core.internal.content.XMLRootHandler
-/**
- * A content describer for detecting the name of the top-level element of the
- * DTD system identifier in an XML file. This supports two parameters:
- * <code>DTD_TO_FIND</code> and <code>ELEMENT_TO_FIND</code>. This is done
- * using the <code>IExecutableExtension</code> mechanism. If the
- * <code>":-"</code> method is used, then the value is treated as the
- * <code>ELEMENT_TO_FIND</code>.
- * 
- * @since 3.0
- */
-public final class XMLRootHandler extends DefaultHandler implements LexicalHandler {
-	/**
-	 * An exception indicating that the parsing should stop. This is usually
-	 * triggered when the top-level element has been found.
-	 * 
-	 * @since 3.0
-	 */
-	private class StopParsingException extends SAXException {
-		/**
-		 * All serializable objects should have a stable serialVersionUID
-		 */
-		private static final long serialVersionUID = 1L;
-
-		/**
-		 * Constructs an instance of <code>StopParsingException</code> with a
-		 * <code>null</code> detail message.
-		 */
-		public StopParsingException() {
-			super((String) null);
-		}
-	}
-
-	/**
-	 * Should we check the root element?
-	 */
-	private boolean checkRoot;
-	/**
-	 * The system identifier for the DTD that was found while parsing the XML.
-	 * This member variable is <code>null</code> unless the file has been
-	 * parsed successful to the point of finding the DTD's system identifier.
-	 */
-	private String dtdFound = null;
-	/**
-	 * This is the name of the top-level element found in the XML file. This
-	 * member variable is <code>null</code> unless the file has been parsed
-	 * successful to the point of finding the top-level element.
-	 */
-	private String elementFound = null;
-
-	/**
-	 * This is the namespace of the top-level element found in the XML file. This
-	 * member variable is <code>null</code> unless the file has been parsed
-	 * successful to the point of finding the top-level element.
-	 */
-	private String namespaceFound = null;
-	
-	private String versionFound = null;
-	
-	public XMLRootHandler(boolean checkRoot) {
-		this.checkRoot = checkRoot;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#comment(char[], int, int)
-	 */
-	public final void comment(final char[] ch, final int start, final int length) {
-		// Not interested.
-	}
-
-	/**
-	 * Creates a new SAX parser for use within this instance.
-	 * 
-	 * @return The newly created parser.
-	 * 
-	 * @throws ParserConfigurationException
-	 *             If a parser of the given configuration cannot be created.
-	 * @throws SAXException
-	 *             If something in general goes wrong when creating the parser.
-	 * @throws SAXNotRecognizedException
-	 *             If the <code>XMLReader</code> does not recognize the
-	 *             lexical handler configuration option.
-	 * @throws SAXNotSupportedException
-	 *             If the <code>XMLReader</code> does not support the lexical
-	 *             handler configuration option.
-	 */
-	private final SAXParser createParser(SAXParserFactory parserFactory) throws ParserConfigurationException, SAXException, SAXNotRecognizedException, SAXNotSupportedException {
-		// Initialize the parser.
-		final SAXParser parser = parserFactory.newSAXParser();
-		final XMLReader reader = parser.getXMLReader();
-		reader.setProperty("http://xml.org/sax/properties/lexical-handler", this); //$NON-NLS-1$
-		// disable DTD validation (bug 63625)
-		try {
-			//	be sure validation is "off" or the feature to ignore DTD's will not apply
-			reader.setFeature("http://xml.org/sax/features/validation", false); //$NON-NLS-1$
-			reader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); //$NON-NLS-1$
-		} catch (SAXNotRecognizedException e) {
-			// not a big deal if the parser does not recognize the features
-		} catch (SAXNotSupportedException e) {
-			// not a big deal if the parser does not support the features
-		}
-		return parser;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#endCDATA()
-	 */
-	public final void endCDATA() {
-		// Not interested.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#endDTD()
-	 */
-	public final void endDTD() {
-		// Not interested.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#endEntity(java.lang.String)
-	 */
-	public final void endEntity(final String name) {
-		// Not interested.
-	}
-
-	public String getDTD() {
-		return dtdFound;
-	}
-
-	public String getRootName() {
-		return elementFound;
-	}
-
-	/**
-	 * @since org.eclipse.core.contenttype 3.3
-	 */
-	public String getRootNamespace() {
-		return namespaceFound;
-	}
-
-	public String getVersion() {
-		return this.versionFound;
-	}
-	
-	public boolean parseContents(InputSource contents) throws IOException, ParserConfigurationException, SAXException {
-		// Parse the file into we have what we need (or an error occurs).
-		try {
-			SAXParserFactory factory = Activator.getDefault().getFactory();
-			if (factory == null)
-				return false;
-			final SAXParser parser = createParser(factory);
-			// to support external entities specified as relative URIs (see bug 63298)
-			contents.setSystemId("/"); //$NON-NLS-1$
-			parser.parse(contents, this);
-		} catch (StopParsingException e) {
-			// Abort the parsing normally. Fall through...
-		}
-		return true;
-	}
-
-	/*
-	 * Resolve external entity definitions to an empty string.  This is to speed
-	 * up processing of files with external DTDs.  Not resolving the contents 
-	 * of the DTD is ok, as only the System ID of the DTD declaration is used.
-	 * @see org.xml.sax.helpers.DefaultHandler#resolveEntity(java.lang.String, java.lang.String)
-	 */
-	@Override
-	public InputSource resolveEntity(String publicId, String systemId) throws SAXException {
-		return new InputSource(new StringReader("")); //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#startCDATA()
-	 */
-	public final void startCDATA() {
-		// Not interested.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#startDTD(java.lang.String,
-	 *      java.lang.String, java.lang.String)
-	 */
-	public final void startDTD(final String name, final String publicId, final String systemId) throws SAXException {
-		dtdFound = systemId;
-		// If we don't care about the top-level element, we can stop here.
-		if (!checkRoot)
-			throw new StopParsingException();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ContentHandler#startElement(java.lang.String,
-	 *      java.lang.String, java.lang.String, org.xml.sax.Attributes)
-	 */
-	@Override
-	public final void startElement(final String uri, final String elementName, final String qualifiedName, final Attributes attributes) throws SAXException {
-		elementFound = elementName;
-		namespaceFound = uri;
-		versionFound = attributes.getValue("version");
-		throw new StopParsingException();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#startEntity(java.lang.String)
-	 */
-	public final void startEntity(final String name) {
-		// Not interested.
-	}
-}
-
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/AccessMethodsTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/AccessMethodsTranslator.java
deleted file mode 100644
index d48c4f3e60..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/AccessMethodsTranslator.java
+++ /dev/null
@@ -1,52 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class AccessMethodsTranslator extends Translator
-	implements EclipseLinkOrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public AccessMethodsTranslator() {
-		super(ACCESS_METHODS, ECLIPSELINK_ORM_PKG.getXmlAccessMethodsHolder_AccessMethods());
-	}
-	
-	@Override
-	public EObject createEMFObject(@SuppressWarnings("unused") String nodeName, @SuppressWarnings("unused") String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlAccessMethods();
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createGetMethodTranslator(),
-			createSetMethodTranslator(),
-		};
-	}
-	
-	protected Translator createGetMethodTranslator() {
-		return new Translator(ACCESS_METHODS__GET_METHOD, ECLIPSELINK_ORM_PKG.getXmlAccessMethods_GetMethod(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createSetMethodTranslator() {
-		return new Translator(ACCESS_METHODS__SET_METHOD, ECLIPSELINK_ORM_PKG.getXmlAccessMethods_SetMethod(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/BasicCollectionTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/BasicCollectionTranslator.java
deleted file mode 100644
index b18deca31a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/BasicCollectionTranslator.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2008  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class BasicCollectionTranslator extends Translator
-	implements EclipseLinkOrmXmlMapper
-{
-	private Translator[] children;	
-
-	public BasicCollectionTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlBasicCollectionImpl();
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator()
-		};
-	}
-	
-	protected Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlAttributeMapping_Name(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/BasicMapTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/BasicMapTranslator.java
deleted file mode 100644
index 3c244c1c84..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/BasicMapTranslator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2008  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.orm.translators.BasicTranslator;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class BasicMapTranslator extends BasicTranslator
-	implements EclipseLinkOrmXmlMapper
-{
-	private Translator[] children;	
-
-	public BasicMapTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlBasicMapImpl();
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator()
-		};
-	}
-	
-	@Override
-	protected Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlAttributeMapping_Name(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/CacheTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/CacheTranslator.java
deleted file mode 100644
index 5e058f1962..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/CacheTranslator.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2008 Oracle. All rights reserved. This
- *  program and the accompanying materials are made available under the terms of
- *  the Eclipse Public License v1.0 which accompanies this distribution, and is
- *  available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: Oracle. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class CacheTranslator extends Translator
-	implements EclipseLinkOrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public CacheTranslator() {
-		super(CACHE, ECLIPSELINK_ORM_PKG.getXmlCacheHolder_Cache());
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createExpiryTranslator(),
-			createExpiryTimeOfDayTranslator(),
-			createSizeTranslator(),
-			createSharedTranslator(),
-			createTypeTranslator(),
-			createAlwaysRefreshTranslator(),
-			createRefreshOnlyIfNewerTranslator(),
-			createDisableHitsTranslator(),
-			createCoordinationTypeTranslator(),
-		};
-	}
-
-	protected Translator createExpiryTranslator() {
-		return new Translator(CACHE__EXPIRY, ECLIPSELINK_ORM_PKG.getXmlCache_Expiry());
-	}
-	
-	protected Translator createExpiryTimeOfDayTranslator() {
-		return new ExpiryTimeOfDayTranslator();
-	}
-	
-	protected Translator createSizeTranslator() {
-		return new Translator(CACHE__SIZE, ECLIPSELINK_ORM_PKG.getXmlCache_Size(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createSharedTranslator() {
-		return new Translator(CACHE__SHARED, ECLIPSELINK_ORM_PKG.getXmlCache_Shared(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createTypeTranslator() {
-		return new Translator(CACHE__TYPE, ECLIPSELINK_ORM_PKG.getXmlCache_Type(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createAlwaysRefreshTranslator() {
-		return new Translator(CACHE__ALWAYS_REFRESH, ECLIPSELINK_ORM_PKG.getXmlCache_AlwaysRefresh(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createRefreshOnlyIfNewerTranslator() {
-		return new Translator(CACHE__REFRESH_ONLY_IF_NEWER, ECLIPSELINK_ORM_PKG.getXmlCache_RefreshOnlyIfNewer(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createDisableHitsTranslator() {
-		return new Translator(CACHE__DISABLE_HITS, ECLIPSELINK_ORM_PKG.getXmlCache_DisableHits(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createCoordinationTypeTranslator() {
-		return new Translator(CACHE__COORDINATION_TYPE, ECLIPSELINK_ORM_PKG.getXmlCache_CoordinationType(), DOM_ATTRIBUTE);
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/CloneCopyPolicyTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/CloneCopyPolicyTranslator.java
deleted file mode 100644
index 35bf0fc8ba..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/CloneCopyPolicyTranslator.java
+++ /dev/null
@@ -1,53 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class CloneCopyPolicyTranslator extends Translator
-	implements EclipseLinkOrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public CloneCopyPolicyTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public EObject createEMFObject(@SuppressWarnings("unused") String nodeName, @SuppressWarnings("unused") String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlCloneCopyPolicy();
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createMethodTranslator(),
-			createWorkingCopyMethodTranslator(),
-		};
-	}
-	
-	protected Translator createMethodTranslator() {
-		return new Translator(CLONE_COPY_POLICY__METHOD, ECLIPSELINK_ORM_PKG.getXmlCloneCopyPolicy_Method(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createWorkingCopyMethodTranslator() {
-		return new Translator(CLONE_COPY_POLICY__WORKING_COPY_METHOD, ECLIPSELINK_ORM_PKG.getXmlCloneCopyPolicy_WorkingCopyMethod(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/ConversionValueTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/ConversionValueTranslator.java
deleted file mode 100644
index 45f04b91ce..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/ConversionValueTranslator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2008 Oracle. All rights reserved. This
- *  program and the accompanying materials are made available under the terms of
- *  the Eclipse Public License v1.0 which accompanies this distribution, and is
- *  available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: Oracle. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class ConversionValueTranslator extends Translator
-	implements EclipseLinkOrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public ConversionValueTranslator() {
-		super(CONVERSION_VALUE, ECLIPSELINK_ORM_PKG.getXmlObjectTypeConverter_ConversionValues(), END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public EObject createEMFObject(@SuppressWarnings("unused") String nodeName, @SuppressWarnings("unused") String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlConversionValueImpl();
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createDataValueTranslator(),
-			createObjectValueTranslator(),
-		};
-	}
-	
-	protected Translator createDataValueTranslator() {
-		return new Translator(CONVERSION_VALUE__DATA_VALUE, ECLIPSELINK_ORM_PKG.getXmlConversionValue_DataValue(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createObjectValueTranslator() {
-		return new Translator(CONVERSION_VALUE__OBJECT_VALUE, ECLIPSELINK_ORM_PKG.getXmlConversionValue_ObjectValue(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/ConverterTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/ConverterTranslator.java
deleted file mode 100644
index 024478cb13..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/ConverterTranslator.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2008 Oracle. All rights reserved. This
- *  program and the accompanying materials are made available under the terms of
- *  the Eclipse Public License v1.0 which accompanies this distribution, and is
- *  available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: Oracle. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class ConverterTranslator extends Translator
-	implements EclipseLinkOrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public ConverterTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public EObject createEMFObject(@SuppressWarnings("unused") String nodeName, @SuppressWarnings("unused") String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlConverterImpl();
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createClassTranslator(),
-		};
-	}
-	
-	protected Translator createNameTranslator() {
-		return new Translator(CONVERTER__NAME, ECLIPSELINK_ORM_PKG.getXmlNamedConverter_Name(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createClassTranslator() {
-		return new Translator(CONVERTER__CLASS, ECLIPSELINK_ORM_PKG.getXmlConverter_ClassName(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/CopyPolicyTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/CopyPolicyTranslator.java
deleted file mode 100644
index 012e354804..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/CopyPolicyTranslator.java
+++ /dev/null
@@ -1,48 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class CopyPolicyTranslator extends Translator
-	implements EclipseLinkOrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public CopyPolicyTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public EObject createEMFObject(@SuppressWarnings("unused") String nodeName, @SuppressWarnings("unused") String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlCopyPolicy();
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createClassTranslator(),
-		};
-	}
-	
-	protected Translator createClassTranslator() {
-		return new Translator(COPY_POLICY__CLASS, ECLIPSELINK_ORM_PKG.getXmlCopyPolicy_Class(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/CustomizerTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/CustomizerTranslator.java
deleted file mode 100644
index e3eca6372f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/CustomizerTranslator.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2008 Oracle. All rights reserved. This
- *  program and the accompanying materials are made available under the terms of
- *  the Eclipse Public License v1.0 which accompanies this distribution, and is
- *  available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: Oracle. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class CustomizerTranslator extends Translator 
-	implements EclipseLinkOrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public CustomizerTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createClassTranslator()
-		};
-	}
-	
-	protected Translator createClassTranslator() {
-		return new Translator(CLASS, ECLIPSELINK_ORM_PKG.getXmlCustomizer_CustomizerClassName(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkAttributesTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkAttributesTranslator.java
deleted file mode 100644
index 435d947f9d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkAttributesTranslator.java
+++ /dev/null
@@ -1,111 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.orm.translators.AttributesTranslator;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkAttributesTranslator extends AttributesTranslator
-	implements EclipseLinkOrmXmlMapper
-{
-	public EclipseLinkAttributesTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createAttributes();
-		
-	}
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createIdTranslator(),
-			createEmbeddedIdTranslator(),
-			createBasicTranslator(),
-			createBasicCollectionTranslator(),
-			createBasicMapTranslator(),
-			createVersionTranslator(),
-			createManyToOneTranslator(),
-			createOneToManyTranslator(),
-			createOneToOneTranslator(),
-			createVariableOneToOneTranslator(),
-			createManyToManyTranslator(),
-			createEmbeddedTranslator(),
-			createTransformationTranslator(),
-			createTransientTranslator()
-		};
-	}
-	
-	@Override
-	protected Translator createIdTranslator() {
-		return new EclipseLinkIdTranslator(ID, ORM_PKG.getAttributes_Ids());
-	}
-	
-	@Override
-	protected Translator createEmbeddedIdTranslator() {
-		return new EclipseLinkEmbeddedIdTranslator(EMBEDDED_ID, ORM_PKG.getAttributes_EmbeddedIds());
-	}
-	
-	@Override
-	protected Translator createBasicTranslator() {
-		return new EclipseLinkBasicTranslator(BASIC, ORM_PKG.getAttributes_Basics());
-	}
-	
-	@Override
-	protected Translator createVersionTranslator() {
-		return new EclipseLinkVersionTranslator(VERSION, ORM_PKG.getAttributes_Versions());
-	}
-	
-	@Override
-	protected Translator createManyToOneTranslator() {
-		return new EclipseLinkManyToOneTranslator(MANY_TO_ONE, ORM_PKG.getAttributes_ManyToOnes());
-	}
-	
-	@Override
-	protected Translator createOneToOneTranslator() {
-		return new EclipseLinkOneToOneTranslator(ONE_TO_ONE, ORM_PKG.getAttributes_OneToOnes());
-	}
-	
-	@Override
-	protected Translator createOneToManyTranslator() {
-		return new EclipseLinkOneToManyTranslator(ONE_TO_MANY, ORM_PKG.getAttributes_OneToManys());
-	}
-	
-	@Override
-	protected Translator createManyToManyTranslator() {
-		return new EclipseLinkManyToManyTranslator(MANY_TO_MANY, ORM_PKG.getAttributes_ManyToManys());
-	}
-	
-	@Override
-	protected Translator createEmbeddedTranslator() {
-		return new EclipseLinkEmbeddedTranslator(EMBEDDED, ORM_PKG.getAttributes_Embeddeds());
-	}
-	
-	protected Translator createVariableOneToOneTranslator() {
-		return new VariableOneToOneTranslator(VARIABLE_ONE_TO_ONE, ECLIPSELINK_ORM_PKG.getAttributes_VariableOneToOnes());
-	}
-
-	protected Translator createBasicCollectionTranslator() {
-		return new BasicCollectionTranslator(BASIC_COLLECTION, ECLIPSELINK_ORM_PKG.getAttributes_BasicCollections());
-	}
-	
-	protected Translator createBasicMapTranslator() {
-		return new BasicMapTranslator(BASIC_MAP, ECLIPSELINK_ORM_PKG.getAttributes_BasicMaps());
-	}
-	
-	protected Translator createTransformationTranslator() {
-		return new TransformationTranslator(TRANSFORMATION, ECLIPSELINK_ORM_PKG.getAttributes_Transformations());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkBasicTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkBasicTranslator.java
deleted file mode 100644
index e9bdf535f0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkBasicTranslator.java
+++ /dev/null
@@ -1,83 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.orm.translators.BasicTranslator;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkBasicTranslator extends BasicTranslator
-	implements EclipseLinkOrmXmlMapper
-{
-	public EclipseLinkBasicTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlBasicImpl();
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createFetchTranslator(),
-			createOptionalTranslator(),
-			createMutableTranslator(),
-			createColumnTranslator(), 
-			createLobTranslator(),
-			createTemporalTranslator(),
-			createEnumeratedTranslator(),
-			createConvertTranslator(),
-			createConverterTranslator(),
-			createTypeConverterTranslator(),
-			createObjectTypeConverterTranslator(),
-			createStructConverterTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()			
-		};
-	}
-	
-	protected Translator createMutableTranslator() {
-		return new Translator(MUTABLE, ECLIPSELINK_ORM_PKG.getXmlMutable_Mutable(), DOM_ATTRIBUTE);
-	}
-		
-	protected Translator createConvertTranslator() {
-		return new Translator(CONVERT, ECLIPSELINK_ORM_PKG.getXmlConvertibleMapping_Convert());
-	}
-	
-	protected Translator createConverterTranslator() {
-		return new ConverterTranslator(CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_Converter());
-	}
-	
-	protected Translator createTypeConverterTranslator() {
-		return new TypeConverterTranslator(TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_TypeConverter());
-	}
-	
-	protected Translator createObjectTypeConverterTranslator() {
-		return new ObjectTypeConverterTranslator(OBJECT_TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_ObjectTypeConverter());
-	}
-	
-	protected Translator createStructConverterTranslator() {
-		return new StructConverterTranslator(STRUCT_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_StructConverter());
-	}
-	
-	protected Translator createPropertyTranslator() {
-		return new PropertyTranslator(PROPERTY, ECLIPSELINK_ORM_PKG.getXmlBasic_Properties());
-	}
-	
-	protected Translator createAccessMethodsTranslator() {
-		return new AccessMethodsTranslator();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkChangeTrackingTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkChangeTrackingTranslator.java
deleted file mode 100644
index 12a70b1060..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkChangeTrackingTranslator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2008  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkChangeTrackingTranslator extends Translator
-	implements EclipseLinkOrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public EclipseLinkChangeTrackingTranslator(String domNameAndPath, EStructuralFeature aFeature, int style) {
-		super(domNameAndPath, aFeature, style);
-	}
-	
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createTypeTranslator()
-		};
-	}
-	
-	protected Translator createTypeTranslator() {
-		return new Translator(TYPE, ECLIPSELINK_ORM_PKG.getXmlChangeTracking_Type(), Translator.DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkEmbeddableTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkEmbeddableTranslator.java
deleted file mode 100644
index 2227392528..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkEmbeddableTranslator.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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.orm.translators.EmbeddableTranslator;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkEmbeddableTranslator extends EmbeddableTranslator
-	implements EclipseLinkOrmXmlMapper
-{
-	public EclipseLinkEmbeddableTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlEmbeddable();
-	}
-	
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createClassTranslator(),
-			createAccessTranslator(),
-			createMetadataCompleteTranslator(),
-			createExcludeDefaultMappingsTranslator(),
-			createDescriptionTranslator(),
-			createCustomizerTranslator(),
-			createChangeTrackingTranslator(),
-			createConverterTranslator(),
-			createTypeConverterTranslator(),
-			createObjectTypeConverterTranslator(),
-			createStructConverterTranslator(),
-			createPropertyTranslator(),
-			createAttributesTranslator(),
-			createCopyPolicyTranslator(),
-			createInstantiationCopyPolicyTranslator(),
-			createCloneCopyPolicyTranslator(),
-		};
-	}
-
-	protected Translator createCustomizerTranslator() {
-		return new CustomizerTranslator(CUSTOMIZER, ECLIPSELINK_ORM_PKG.getXmlCustomizerHolder_Customizer());
-	}
-	
-	protected Translator createChangeTrackingTranslator() {
-		return new EclipseLinkChangeTrackingTranslator(CHANGE_TRACKING, ECLIPSELINK_ORM_PKG.getXmlChangeTrackingHolder_ChangeTracking(), END_TAG_NO_INDENT);
-	}
-	
-	protected Translator createConverterTranslator() {
-		return new ConverterTranslator(CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConvertersHolder_Converters());
-	}
-	
-	protected Translator createTypeConverterTranslator() {
-		return new TypeConverterTranslator(TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConvertersHolder_TypeConverters());
-	}
-	
-	protected Translator createObjectTypeConverterTranslator() {
-		return new ObjectTypeConverterTranslator(OBJECT_TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConvertersHolder_ObjectTypeConverters());
-	}
-	
-	protected Translator createStructConverterTranslator() {
-		return new StructConverterTranslator(STRUCT_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConvertersHolder_StructConverters());
-	}
-	
-	@Override
-	protected Translator createAttributesTranslator() {
-		return new EclipseLinkAttributesTranslator(ATTRIBUTES, ORM_PKG.getXmlTypeMapping_Attributes());
-	}
-	
-	protected Translator createPropertyTranslator() {
-		return new PropertyTranslator(PROPERTY, ECLIPSELINK_ORM_PKG.getXmlEmbeddable_Properties());
-	}
-	
-	protected Translator createCopyPolicyTranslator() {
-		return new CopyPolicyTranslator(COPY_POLICY, ECLIPSELINK_ORM_PKG.getXmlEmbeddable_CopyPolicy());
-	}
-	
-	protected Translator createInstantiationCopyPolicyTranslator() {
-		return new InstantiationCopyPolicyTranslator(INSTANTIATION_COPY_POLICY, ECLIPSELINK_ORM_PKG.getXmlEmbeddable_InstantiationCopyPolicy());
-	}
-	
-	protected Translator createCloneCopyPolicyTranslator() {
-		return new CloneCopyPolicyTranslator(CLONE_COPY_POLICY, ECLIPSELINK_ORM_PKG.getXmlEmbeddable_CloneCopyPolicy());
-	}
-	
-
-	protected Translator createExcludeDefaultMappingsTranslator() {
-		return new Translator(EXCLUDE_DEFAULT_MAPPINGS, ECLIPSELINK_ORM_PKG.getXmlEmbeddable_ExcludeDefaultMappings(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkEmbeddedIdTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkEmbeddedIdTranslator.java
deleted file mode 100644
index cbdf94ae3b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkEmbeddedIdTranslator.java
+++ /dev/null
@@ -1,47 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.orm.translators.EmbeddedIdTranslator;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkEmbeddedIdTranslator extends EmbeddedIdTranslator
-	implements EclipseLinkOrmXmlMapper
-{
-	public EclipseLinkEmbeddedIdTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlEmbeddedIdImpl();
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createAttributeOverrideTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()
-		};
-	}
-		
-	protected Translator createPropertyTranslator() {
-		return new PropertyTranslator(PROPERTY, ECLIPSELINK_ORM_PKG.getXmlEmbeddedId_Properties());
-	}
-	
-	protected Translator createAccessMethodsTranslator() {
-		return new AccessMethodsTranslator();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkEmbeddedTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkEmbeddedTranslator.java
deleted file mode 100644
index e017af24ee..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkEmbeddedTranslator.java
+++ /dev/null
@@ -1,47 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.orm.translators.EmbeddedTranslator;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkEmbeddedTranslator extends EmbeddedTranslator
-	implements EclipseLinkOrmXmlMapper
-{
-	public EclipseLinkEmbeddedTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlEmbeddedImpl();
-	}
-		
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createAttributeOverrideTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()
-		};
-	}
-	
-	protected Translator createPropertyTranslator() {
-		return new PropertyTranslator(PROPERTY, ECLIPSELINK_ORM_PKG.getXmlEmbedded_Properties());
-	}
-	
-	protected Translator createAccessMethodsTranslator() {
-		return new AccessMethodsTranslator();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkEntityMappingsTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkEntityMappingsTranslator.java
deleted file mode 100644
index f130a23fc0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkEntityMappingsTranslator.java
+++ /dev/null
@@ -1,110 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jpt.core.internal.resource.orm.translators.EntityMappingsTranslator;
-import org.eclipse.jpt.core.resource.xml.XML;
-import org.eclipse.wst.common.internal.emf.resource.ConstantAttributeTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkEntityMappingsTranslator extends EntityMappingsTranslator
-	implements EclipseLinkOrmXmlMapper
-{
-	public static EclipseLinkEntityMappingsTranslator INSTANCE = new EclipseLinkEntityMappingsTranslator();
-	
-	protected EclipseLinkEntityMappingsTranslator(String domNameAndPath, EClass eClass) {
-		super(domNameAndPath, eClass);
-	}
-	
-	public EclipseLinkEntityMappingsTranslator() {
-		this(ENTITY_MAPPINGS, ECLIPSELINK_ORM_PKG.getXmlEntityMappings());
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createVersionTranslator(),
-			createNamespaceTranslator(),
-			createSchemaNamespaceTranslator(),
-			createSchemaLocationTranslator(),
-			createDescriptionTranslator(),
-			createPersistenceUnitMetadataTranslator(),
-			createPackageTranslator(),
-			createSchemaTranslator(),
-			createCatalogTranslator(),
-			createAccessTranslator(),
-			createConverterTranslator(),
-			createTypeConverterTranslator(),
-			createObjectTypeConverterTranslator(),
-			createStructConverterTranslator(),
-			createSequenceGeneratorTranslator(),
-			createTableGeneratorTranslator(),
-			createNamedQueryTranslator(),
-			createNamedNativeQueryTranslator(),
-			createNamedStoredProcedureQueryTranslator(),
-			createSqlResultSetMappingTranslator(),
-			createMappedSuperclassTranslator(),
-			createEntityTranslator(),
-			createEmbeddableTranslator()
-		};
-	}
-	
-	@Override
-	protected Translator createNamespaceTranslator() {
-		return new ConstantAttributeTranslator(XML.NAMESPACE, ECLIPSELINK_ORM_NS_URL);
-	}
-	
-	@Override
-	protected Translator createSchemaLocationTranslator() {
-		return new ConstantAttributeTranslator(XML.XSI_SCHEMA_LOCATION, ECLIPSELINK_ORM_NS_URL + ' ' + ECLIPSELINK_ORM_SCHEMA_LOC_1_0);
-	}
-	
-	@Override
-	protected Translator createPersistenceUnitMetadataTranslator() {
-		return new EclipseLinkPersistenceUnitMetadataTranslator(PERSISTENCE_UNIT_METADATA, ORM_PKG.getXmlEntityMappings_PersistenceUnitMetadata());
-	}
-	
-	@Override
-	protected Translator createEmbeddableTranslator() {
-		return new EclipseLinkEmbeddableTranslator(EMBEDDABLE, ORM_PKG.getXmlEntityMappings_Embeddables());
-	}
-	
-	@Override
-	protected Translator createEntityTranslator() {
-		return new EclipseLinkEntityTranslator(ENTITY, ORM_PKG.getXmlEntityMappings_Entities());
-	}
-	
-	@Override
-	protected Translator createMappedSuperclassTranslator() {
-		return new EclipseLinkMappedSuperclassTranslator(MAPPED_SUPERCLASS, ORM_PKG.getXmlEntityMappings_MappedSuperclasses());
-	}
-	
-	
-	protected Translator createConverterTranslator() {
-		return new ConverterTranslator(CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConvertersHolder_Converters());
-	}
-	
-	protected Translator createTypeConverterTranslator() {
-		return new TypeConverterTranslator(TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConvertersHolder_TypeConverters());
-	}
-	
-	protected Translator createObjectTypeConverterTranslator() {
-		return new ObjectTypeConverterTranslator(OBJECT_TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConvertersHolder_ObjectTypeConverters());
-	}
-	
-	protected Translator createStructConverterTranslator() {
-		return new StructConverterTranslator(STRUCT_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConvertersHolder_StructConverters());
-	}
-	
-	protected Translator createNamedStoredProcedureQueryTranslator() {
-		return new NamedStoredProcedureQueryTranslator(NAMED_STORED_PROCEDURE_QUERY, ECLIPSELINK_ORM_PKG.getXmlEntityMappings_NamedStoredProcedureQueries());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkEntityTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkEntityTranslator.java
deleted file mode 100644
index bac233e127..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkEntityTranslator.java
+++ /dev/null
@@ -1,151 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.orm.translators.EntityTranslator;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkEntityTranslator extends EntityTranslator
-	implements EclipseLinkOrmXmlMapper
-{
-	public EclipseLinkEntityTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlEntity();
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createClassTranslator(),
-			createAccessTranslator(),
-			createMetadataCompleteTranslator(),
-			createReadOnlyTranslator(),
-			createExistenceCheckingTranslator(),
-			createExcludeDefaultMappingsTranslator(),
-			createDescriptionTranslator(),
-			createCustomizerTranslator(),
-			createChangeTrackingTranslator(),
-			createTableTranslator(),
-			createSecondaryTableTranslator(),
-			createPrimaryKeyJoinColumnTranslator(),
-			createIdClassTranslator(),
-			createInheritanceTranslator(),
-			createDiscriminatorValueTranslator(),
-			createDiscriminatorColumnTranslator(),
-			createOptimisticLockingTranslator(),
-			createCacheTranslator(),
-			createConverterTranslator(),
-			createTypeConverterTranslator(),
-			createObjectTypeConverterTranslator(),
-			createStructConverterTranslator(),
-			createCopyPolicyTranslator(),
-			createInstantiationCopyPolicyTranslator(),
-			createCloneCopyPolicyTranslator(),
-			createSequenceGeneratorTranslator(),
-			createTableGeneratorTranslator(),
-			createNamedQueryTranslator(),
-			createNamedNativeQueryTranslator(),
-			createNamedStoredProcedureQueryTranslator(),
-			createSqlResultSetMappingTranslator(),
-			createExcludeDefaultListenersTranslator(),
-			createExcludeSuperclassListenersTranslator(),
-			createEntityListenersTranslator(),
-			createPrePersistTranslator(),
-			createPostPersistTranslator(),
-			createPreRemoveTranslator(),
-			createPostRemoveTranslator(),
-			createPreUpdateTranslator(),
-			createPostUpdateTranslator(),
-			createPostLoadTranslator(),
-			createPropertyTranslator(),
-			createAttributeOverrideTranslator(),
-			createAssociationOverrideTranslator(),
-			createAttributesTranslator(),
-		};
-	}
-	
-	protected Translator createReadOnlyTranslator() {
-		return new Translator(READ_ONLY, ECLIPSELINK_ORM_PKG.getXmlReadOnly_ReadOnly(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createExistenceCheckingTranslator() {
-		return new Translator(EXISTENCE_CHECKING, ECLIPSELINK_ORM_PKG.getXmlCacheHolder_ExistenceChecking(), DOM_ATTRIBUTE);
-	}
-
-	protected Translator createCustomizerTranslator() {
-		return new CustomizerTranslator(CUSTOMIZER, ECLIPSELINK_ORM_PKG.getXmlCustomizerHolder_Customizer());
-	}
-	
-	protected Translator createChangeTrackingTranslator() {
-		return new EclipseLinkChangeTrackingTranslator(CHANGE_TRACKING, ECLIPSELINK_ORM_PKG.getXmlChangeTrackingHolder_ChangeTracking(), END_TAG_NO_INDENT);
-	}
-	
-	protected Translator createCacheTranslator() {
-		return new CacheTranslator();
-	}
-	
-	protected Translator createConverterTranslator() {
-		return new ConverterTranslator(CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConvertersHolder_Converters());
-	}
-	
-	protected Translator createTypeConverterTranslator() {
-		return new TypeConverterTranslator(TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConvertersHolder_TypeConverters());
-	}
-	
-	protected Translator createObjectTypeConverterTranslator() {
-		return new ObjectTypeConverterTranslator(OBJECT_TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConvertersHolder_ObjectTypeConverters());
-	}
-	
-	protected Translator createStructConverterTranslator() {
-		return new StructConverterTranslator(STRUCT_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConvertersHolder_StructConverters());
-	}
-	
-	@Override
-	protected Translator createAttributesTranslator() {
-		return new EclipseLinkAttributesTranslator(ATTRIBUTES, ORM_PKG.getXmlTypeMapping_Attributes());
-	}
-	
-	protected Translator createPropertyTranslator() {
-		return new PropertyTranslator(PROPERTY, ECLIPSELINK_ORM_PKG.getXmlEntity_Properties());
-	}
-	
-	protected Translator createNamedStoredProcedureQueryTranslator() {
-		return new NamedStoredProcedureQueryTranslator(NAMED_STORED_PROCEDURE_QUERY, ECLIPSELINK_ORM_PKG.getXmlEntity_NamedStoredProcedureQueries());
-	}
-	
-	protected Translator createCopyPolicyTranslator() {
-		return new CopyPolicyTranslator(COPY_POLICY, ECLIPSELINK_ORM_PKG.getXmlEntity_CopyPolicy());
-	}
-	
-	protected Translator createInstantiationCopyPolicyTranslator() {
-		return new InstantiationCopyPolicyTranslator(INSTANTIATION_COPY_POLICY, ECLIPSELINK_ORM_PKG.getXmlEntity_InstantiationCopyPolicy());
-	}
-	
-	protected Translator createCloneCopyPolicyTranslator() {
-		return new CloneCopyPolicyTranslator(CLONE_COPY_POLICY, ECLIPSELINK_ORM_PKG.getXmlEntity_CloneCopyPolicy());
-	}
-	
-	protected Translator createOptimisticLockingTranslator() {
-		return new OptimisticLockingTranslator(OPTIMISTIC_LOCKING, ECLIPSELINK_ORM_PKG.getXmlEntity_OptimisticLocking());
-	}
-
-	protected Translator createExcludeDefaultMappingsTranslator() {
-		return new Translator(EXCLUDE_DEFAULT_MAPPINGS, ECLIPSELINK_ORM_PKG.getXmlEntity_ExcludeDefaultMappings(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkIdTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkIdTranslator.java
deleted file mode 100644
index 824ca9a919..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkIdTranslator.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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.orm.translators.IdTranslator;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkIdTranslator extends IdTranslator
-	implements EclipseLinkOrmXmlMapper
-{
-	public EclipseLinkIdTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlIdImpl();
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createMutableTranslator(),
-			createColumnTranslator(),
-			createGeneratedValueTranslator(),
-			createTemporalTranslator(),
-			createConvertTranslator(),
-			createConverterTranslator(),
-			createTypeConverterTranslator(),
-			createObjectTypeConverterTranslator(),
-			createStructConverterTranslator(),
-			createTableGeneratorTranslator(),
-			createSequenceGeneratorTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()
-		};
-	}
-	
-	protected Translator createMutableTranslator() {
-		return new Translator(MUTABLE, ECLIPSELINK_ORM_PKG.getXmlMutable_Mutable(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createConvertTranslator() {
-		return new Translator(CONVERT, ECLIPSELINK_ORM_PKG.getXmlConvertibleMapping_Convert());
-	}
-	
-	protected Translator createConverterTranslator() {
-		return new ConverterTranslator(CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_Converter());
-	}
-	
-	protected Translator createTypeConverterTranslator() {
-		return new TypeConverterTranslator(TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_TypeConverter());
-	}
-	
-	protected Translator createObjectTypeConverterTranslator() {
-		return new ObjectTypeConverterTranslator(OBJECT_TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_ObjectTypeConverter());
-	}
-	
-	protected Translator createStructConverterTranslator() {
-		return new StructConverterTranslator(STRUCT_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_StructConverter());
-	}
-		
-	protected Translator createPropertyTranslator() {
-		return new PropertyTranslator(PROPERTY, ECLIPSELINK_ORM_PKG.getXmlId_Properties());
-	}
-	
-	protected Translator createAccessMethodsTranslator() {
-		return new AccessMethodsTranslator();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkManyToManyTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkManyToManyTranslator.java
deleted file mode 100644
index b1ef99d051..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkManyToManyTranslator.java
+++ /dev/null
@@ -1,59 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.orm.translators.ManyToManyTranslator;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkManyToManyTranslator extends ManyToManyTranslator
-	implements EclipseLinkOrmXmlMapper
-{
-	public EclipseLinkManyToManyTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlManyToManyImpl();
-	}
-		
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createTargetEntityTranslator(),
-			createFetchTranslator(),
-			createMappedByTranslator(),
-			createOrderByTranslator(),
-			createMapKeyTranslator(),
-			createJoinTableTranslator(),
-			createCascadeTranslator(),
-			createJoinFetchTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()
-		};
-	}
-	
-	protected Translator createJoinFetchTranslator() {
-		return new Translator(JOIN_FETCH, ECLIPSELINK_ORM_PKG.getXmlJoinFetch_JoinFetch());
-	}
-	
-	protected Translator createPropertyTranslator() {
-		return new PropertyTranslator(PROPERTY, ECLIPSELINK_ORM_PKG.getXmlManyToMany_Properties());
-	}
-	
-	protected Translator createAccessMethodsTranslator() {
-		return new AccessMethodsTranslator();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkManyToOneTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkManyToOneTranslator.java
deleted file mode 100644
index 9cabe2e0c1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkManyToOneTranslator.java
+++ /dev/null
@@ -1,58 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.orm.translators.ManyToOneTranslator;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkManyToOneTranslator extends ManyToOneTranslator
-	implements EclipseLinkOrmXmlMapper
-{
-	public EclipseLinkManyToOneTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlManyToOneImpl();
-	}
-		
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createTargetEntityTranslator(),
-			createFetchTranslator(),
-			createOptionalTranslator(),
-			createJoinColumnTranslator(),
-			createJoinTableTranslator(),
-			createCascadeTranslator(),
-			createJoinFetchTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()
-		};
-	}
-	
-	protected Translator createJoinFetchTranslator() {
-		return new Translator(JOIN_FETCH, ECLIPSELINK_ORM_PKG.getXmlJoinFetch_JoinFetch());
-	}
-	
-	protected Translator createPropertyTranslator() {
-		return new PropertyTranslator(PROPERTY, ECLIPSELINK_ORM_PKG.getXmlManyToOne_Properties());
-	}
-	
-	protected Translator createAccessMethodsTranslator() {
-		return new AccessMethodsTranslator();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkMappedSuperclassTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkMappedSuperclassTranslator.java
deleted file mode 100644
index 4692ace6bc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkMappedSuperclassTranslator.java
+++ /dev/null
@@ -1,134 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.orm.translators.MappedSuperclassTranslator;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkMappedSuperclassTranslator extends MappedSuperclassTranslator
-	implements EclipseLinkOrmXmlMapper
-{
-	public EclipseLinkMappedSuperclassTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlMappedSuperclass();
-	}
-	
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createClassTranslator(),
-			createAccessTranslator(),
-			createMetadataCompleteTranslator(),
-			createReadOnlyTranslator(),
-			createExistenceCheckingTranslator(),
-			createExcludeDefaultMappingsTranslator(),
-			createDescriptionTranslator(),
-			createCustomizerTranslator(),
-			createChangeTrackingTranslator(),
-			createIdClassTranslator(),
-			createOptimisticLockingTranslator(),
-			createCacheTranslator(),
-			createConverterTranslator(),
-			createTypeConverterTranslator(),
-			createObjectTypeConverterTranslator(),
-			createStructConverterTranslator(),
-			createCopyPolicyTranslator(),
-			createInstantiationCopyPolicyTranslator(),
-			createCloneCopyPolicyTranslator(),
-			createExcludeDefaultListenersTranslator(),
-			createExcludeSuperclassListenersTranslator(),
-			createEntityListenersTranslator(),
-			createPrePersistTranslator(),
-			createPostPersistTranslator(),
-			createPreRemoveTranslator(),
-			createPostRemoveTranslator(),
-			createPreUpdateTranslator(),
-			createPostUpdateTranslator(),
-			createPostLoadTranslator(),
-			createPropertyTranslator(),
-			createAttributesTranslator()
-		};
-	}
-	
-	protected Translator createReadOnlyTranslator() {
-		return new Translator(READ_ONLY, ECLIPSELINK_ORM_PKG.getXmlReadOnly_ReadOnly(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createExistenceCheckingTranslator() {
-		return new Translator(EXISTENCE_CHECKING, ECLIPSELINK_ORM_PKG.getXmlCacheHolder_ExistenceChecking(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createCustomizerTranslator() {
-		return new CustomizerTranslator(CUSTOMIZER, ECLIPSELINK_ORM_PKG.getXmlCustomizerHolder_Customizer());
-	}
-	
-	protected Translator createChangeTrackingTranslator() {
-		return new EclipseLinkChangeTrackingTranslator(CHANGE_TRACKING, ECLIPSELINK_ORM_PKG.getXmlChangeTrackingHolder_ChangeTracking(), END_TAG_NO_INDENT);
-	}
-	
-	protected Translator createCacheTranslator() {
-		return new CacheTranslator();
-	}
-	
-	protected Translator createConverterTranslator() {
-		return new ConverterTranslator(CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConvertersHolder_Converters());
-	}
-	
-	protected Translator createTypeConverterTranslator() {
-		return new TypeConverterTranslator(TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConvertersHolder_TypeConverters());
-	}
-	
-	protected Translator createObjectTypeConverterTranslator() {
-		return new ObjectTypeConverterTranslator(OBJECT_TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConvertersHolder_ObjectTypeConverters());
-	}
-	
-	protected Translator createStructConverterTranslator() {
-		return new StructConverterTranslator(STRUCT_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConvertersHolder_StructConverters());
-	}
-	
-	@Override
-	protected Translator createAttributesTranslator() {
-		return new EclipseLinkAttributesTranslator(ATTRIBUTES, ORM_PKG.getXmlTypeMapping_Attributes());
-	}
-	
-	protected Translator createPropertyTranslator() {
-		return new PropertyTranslator(PROPERTY, ECLIPSELINK_ORM_PKG.getXmlMappedSuperclass_Properties());
-	}
-	
-	protected Translator createCopyPolicyTranslator() {
-		return new CopyPolicyTranslator(COPY_POLICY, ECLIPSELINK_ORM_PKG.getXmlMappedSuperclass_CopyPolicy());
-	}
-	
-	protected Translator createInstantiationCopyPolicyTranslator() {
-		return new InstantiationCopyPolicyTranslator(INSTANTIATION_COPY_POLICY, ECLIPSELINK_ORM_PKG.getXmlMappedSuperclass_InstantiationCopyPolicy());
-	}
-	
-	protected Translator createCloneCopyPolicyTranslator() {
-		return new CloneCopyPolicyTranslator(CLONE_COPY_POLICY, ECLIPSELINK_ORM_PKG.getXmlMappedSuperclass_CloneCopyPolicy());
-	}
-	
-	protected Translator createOptimisticLockingTranslator() {
-		return new OptimisticLockingTranslator(OPTIMISTIC_LOCKING, ECLIPSELINK_ORM_PKG.getXmlMappedSuperclass_OptimisticLocking());
-	}
-
-	protected Translator createExcludeDefaultMappingsTranslator() {
-		return new Translator(EXCLUDE_DEFAULT_MAPPINGS, ECLIPSELINK_ORM_PKG.getXmlMappedSuperclass_ExcludeDefaultMappings(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkOneToManyTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkOneToManyTranslator.java
deleted file mode 100644
index 336ae2ba45..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkOneToManyTranslator.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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.orm.translators.OneToManyTranslator;
-import org.eclipse.jpt.core.internal.resource.xml.translators.EmptyTagBooleanTranslator;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkOneToManyTranslator extends OneToManyTranslator
-	implements EclipseLinkOrmXmlMapper
-{
-	public EclipseLinkOneToManyTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlOneToManyImpl();
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createTargetEntityTranslator(),
-			createFetchTranslator(),
-			createMappedByTranslator(),
-			createOrderByTranslator(),
-			createMapKeyTranslator(),
-			createJoinTableTranslator(),
-			createJoinColumnTranslator(),
-			createCascadeTranslator(),
-			createPrivateOwnedTranslator(),
-			createJoinFetchTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()
-		};
-	}
-	
-	protected Translator createPrivateOwnedTranslator() {
-		return new EmptyTagBooleanTranslator(PRIVATE_OWNED, ECLIPSELINK_ORM_PKG.getXmlPrivateOwned_PrivateOwned());
-	}
-	
-	protected Translator createJoinFetchTranslator() {
-		return new Translator(JOIN_FETCH, ECLIPSELINK_ORM_PKG.getXmlJoinFetch_JoinFetch());
-	}
-	
-	protected Translator createPropertyTranslator() {
-		return new PropertyTranslator(PROPERTY, ECLIPSELINK_ORM_PKG.getXmlOneToMany_Properties());
-	}
-
-	protected Translator createAccessMethodsTranslator() {
-		return new AccessMethodsTranslator();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkOneToOneTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkOneToOneTranslator.java
deleted file mode 100644
index 37f32c7aa0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkOneToOneTranslator.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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.orm.translators.OneToOneTranslator;
-import org.eclipse.jpt.core.internal.resource.xml.translators.EmptyTagBooleanTranslator;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkOneToOneTranslator extends OneToOneTranslator
-	implements EclipseLinkOrmXmlMapper
-{
-	public EclipseLinkOneToOneTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlOneToOneImpl();
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createTargetEntityTranslator(),
-			createFetchTranslator(),
-			createOptionalTranslator(),
-			createMappedByTranslator(),
-			createPrimaryKeyJoinColumnTranslator(),
-			createJoinColumnTranslator(),
-			createJoinTableTranslator(),
-			createCascadeTranslator(),
-			createPrivateOwnedTranslator(),
-			createJoinFetchTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()
-		};
-	}
-	
-	protected Translator createPrivateOwnedTranslator() {
-		return new EmptyTagBooleanTranslator(PRIVATE_OWNED, ECLIPSELINK_ORM_PKG.getXmlPrivateOwned_PrivateOwned());
-	}
-	
-	protected Translator createJoinFetchTranslator() {
-		return new Translator(JOIN_FETCH, ECLIPSELINK_ORM_PKG.getXmlJoinFetch_JoinFetch());
-	}
-	
-	protected Translator createPropertyTranslator() {
-		return new PropertyTranslator(PROPERTY, ECLIPSELINK_ORM_PKG.getXmlOneToOne_Properties());
-	}
-	
-	protected Translator createAccessMethodsTranslator() {
-		return new AccessMethodsTranslator();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkOrmXmlMapper.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkOrmXmlMapper.java
deleted file mode 100644
index 69425764c2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkOrmXmlMapper.java
+++ /dev/null
@@ -1,127 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.jpt.core.internal.resource.orm.translators.OrmXmlMapper;
-import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkConstants;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
-
-public interface EclipseLinkOrmXmlMapper
-	extends OrmXmlMapper, EclipseLinkConstants
-{
-	EclipseLinkOrmPackage ECLIPSELINK_ORM_PKG = EclipseLinkOrmPackage.eINSTANCE;
-	
-	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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkPersistenceUnitMetadataTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkPersistenceUnitMetadataTranslator.java
deleted file mode 100644
index 44a94618be..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkPersistenceUnitMetadataTranslator.java
+++ /dev/null
@@ -1,42 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.orm.translators.PersistenceUnitMetadataTranslator;
-import org.eclipse.jpt.core.internal.resource.xml.translators.EmptyTagBooleanTranslator;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkPersistenceUnitMetadataTranslator extends PersistenceUnitMetadataTranslator implements EclipseLinkOrmXmlMapper
-{
-	public EclipseLinkPersistenceUnitMetadataTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata();
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createXmlMappingMetadataCompleteTranslator(),
-			createExcludeDefaultMappingsTranslator(),
-			createPersistenceUnitDefaultsTranslator(),
-		};
-	}
-
-	protected Translator createExcludeDefaultMappingsTranslator() {
-		return new EmptyTagBooleanTranslator(EXCLUDE_DEFAULT_MAPPINGS, ECLIPSELINK_ORM_PKG.getXmlPersistenceUnitMetadata_ExcludeDefaultMappings());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkVersionTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkVersionTranslator.java
deleted file mode 100644
index d20c705dcd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkVersionTranslator.java
+++ /dev/null
@@ -1,78 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.orm.translators.VersionTranslator;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkVersionTranslator extends VersionTranslator
-	implements EclipseLinkOrmXmlMapper
-{
-	public EclipseLinkVersionTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlVersionImpl();
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createMutableTranslator(),
-			createColumnTranslator(), 
-			createTemporalTranslator(),
-			createConvertTranslator(),
-			createConverterTranslator(),
-			createTypeConverterTranslator(),
-			createObjectTypeConverterTranslator(),
-			createStructConverterTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()
-		};
-	}
-	
-	protected Translator createMutableTranslator() {
-		return new Translator(MUTABLE, ECLIPSELINK_ORM_PKG.getXmlMutable_Mutable(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createConvertTranslator() {
-		return new Translator(CONVERT, ECLIPSELINK_ORM_PKG.getXmlConvertibleMapping_Convert());
-	}
-	
-	protected Translator createConverterTranslator() {
-		return new ConverterTranslator(CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_Converter());
-	}
-	
-	protected Translator createTypeConverterTranslator() {
-		return new TypeConverterTranslator(TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_TypeConverter());
-	}
-	
-	protected Translator createObjectTypeConverterTranslator() {
-		return new ObjectTypeConverterTranslator(OBJECT_TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_ObjectTypeConverter());
-	}
-	
-	protected Translator createStructConverterTranslator() {
-		return new StructConverterTranslator(STRUCT_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_StructConverter());
-	}
-	
-	protected Translator createPropertyTranslator() {
-		return new PropertyTranslator(PROPERTY, ECLIPSELINK_ORM_PKG.getXmlVersion_Properties());
-	}
-	
-	protected Translator createAccessMethodsTranslator() {
-		return new AccessMethodsTranslator();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/ExpiryTimeOfDayTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/ExpiryTimeOfDayTranslator.java
deleted file mode 100644
index 7fb7c683db..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/ExpiryTimeOfDayTranslator.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2008 Oracle. All rights reserved. This
- *  program and the accompanying materials are made available under the terms of
- *  the Eclipse Public License v1.0 which accompanies this distribution, and is
- *  available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: Oracle. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class ExpiryTimeOfDayTranslator extends Translator
-	implements EclipseLinkOrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public ExpiryTimeOfDayTranslator() {
-		super(EXPIRY_TIME_OF_DAY, ECLIPSELINK_ORM_PKG.getXmlCache_ExpiryTimeOfDay(), END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createHourTranslator(),
-			createMinuteTranslator(),
-			createSecondTranslator(),
-			createMillisecondTranslator(),
-		};
-	}
-	protected Translator createHourTranslator() {
-		return new Translator(EXPIRY_TIME_OF_DAY__HOUR, ECLIPSELINK_ORM_PKG.getXmlTimeOfDay_Hour(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createMinuteTranslator() {
-		return new Translator(EXPIRY_TIME_OF_DAY__MINUTE, ECLIPSELINK_ORM_PKG.getXmlTimeOfDay_Minute(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createSecondTranslator() {
-		return new Translator(EXPIRY_TIME_OF_DAY__SECOND, ECLIPSELINK_ORM_PKG.getXmlTimeOfDay_Second(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createMillisecondTranslator() {
-		return new Translator(EXPIRY_TIME_OF_DAY__MILLISECOND, ECLIPSELINK_ORM_PKG.getXmlTimeOfDay_Millisecond(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/InstantiationCopyPolicyTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/InstantiationCopyPolicyTranslator.java
deleted file mode 100644
index ca8f9b5c45..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/InstantiationCopyPolicyTranslator.java
+++ /dev/null
@@ -1,28 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class InstantiationCopyPolicyTranslator extends Translator
-	implements EclipseLinkOrmXmlMapper
-{	
-	
-	public InstantiationCopyPolicyTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public EObject createEMFObject(@SuppressWarnings("unused") String nodeName, @SuppressWarnings("unused") String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlInstantiationPolicy();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/NamedStoredProcedureQueryTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/NamedStoredProcedureQueryTranslator.java
deleted file mode 100644
index 8b2e6eaf7f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/NamedStoredProcedureQueryTranslator.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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.orm.translators.QueryHintTranslator;
-import org.eclipse.jpt.core.internal.resource.xml.translators.BooleanTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class NamedStoredProcedureQueryTranslator extends Translator 
-	implements EclipseLinkOrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public NamedStoredProcedureQueryTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createResultClassTranslator(),
-			createResultSetMappingTranslator(),
-			createProcedureNameTranslator(),
-			createReturnResultSetTranslator(),
-			createHintTranslator(),
-			createParameterTranslator(),
-		};
-	}
-
-	private Translator createNameTranslator() {
-		return new Translator(NAMED_STORED_PROCEDURE_QUERY__NAME, ECLIPSELINK_ORM_PKG.getXmlNamedStoredProcedureQuery_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createResultClassTranslator() {
-		return new Translator(NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASS, ECLIPSELINK_ORM_PKG.getXmlNamedStoredProcedureQuery_ResultClass(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createResultSetMappingTranslator() {
-		return new Translator(NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPING, ECLIPSELINK_ORM_PKG.getXmlNamedStoredProcedureQuery_ResultSetMapping(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createProcedureNameTranslator() {
-		return new Translator(NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME, ECLIPSELINK_ORM_PKG.getXmlNamedStoredProcedureQuery_ProcedureName(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createReturnResultSetTranslator() {
-		return new BooleanTranslator(NAMED_STORED_PROCEDURE_QUERY__RETURNS_RESULT_SET, ECLIPSELINK_ORM_PKG.getXmlNamedStoredProcedureQuery_ReturnsResultSet(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createHintTranslator() {
-		return new QueryHintTranslator(NAMED_STORED_PROCEDURE_QUERY__HINT, ECLIPSELINK_ORM_PKG.getXmlNamedStoredProcedureQuery_Hints());
-	}
-	
-	private Translator createParameterTranslator() {
-		return new StoredProcedureParameterTranslator(NAMED_STORED_PROCEDURE_QUERY__PARAMETER, ECLIPSELINK_ORM_PKG.getXmlNamedStoredProcedureQuery_Parameters());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/ObjectTypeConverterTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/ObjectTypeConverterTranslator.java
deleted file mode 100644
index f85f67809a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/ObjectTypeConverterTranslator.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2008 Oracle. All rights reserved. This
- *  program and the accompanying materials are made available under the terms of
- *  the Eclipse Public License v1.0 which accompanies this distribution, and is
- *  available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: Oracle. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class ObjectTypeConverterTranslator extends Translator
-	implements EclipseLinkOrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public ObjectTypeConverterTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(@SuppressWarnings("unused") String nodeName, @SuppressWarnings("unused") String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverterImpl();
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createConversionValueTranslator(),
-			createDefaultObjectValueTranslator(),
-			createNameTranslator(),
-			createDataTypeTranslator(),
-			createObjectTypeTranslator(),
-		};
-	}
-	
-	protected Translator createConversionValueTranslator() {
-		return new ConversionValueTranslator();
-	}
-	
-	protected Translator createDefaultObjectValueTranslator() {
-		return new Translator(OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE, ECLIPSELINK_ORM_PKG.getXmlObjectTypeConverter_DefaultObjectValue());
-	}
-	
-	protected Translator createNameTranslator() {
-		return new Translator(OBJECT_TYPE_CONVERTER__NAME, ECLIPSELINK_ORM_PKG.getXmlNamedConverter_Name(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createDataTypeTranslator() {
-		return new Translator(OBJECT_TYPE_CONVERTER__DATA_TYPE, ECLIPSELINK_ORM_PKG.getXmlObjectTypeConverter_DataType(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createObjectTypeTranslator() {
-		return new Translator(OBJECT_TYPE_CONVERTER__OBJECT_TYPE, ECLIPSELINK_ORM_PKG.getXmlObjectTypeConverter_ObjectType(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/OptimisticLockingTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/OptimisticLockingTranslator.java
deleted file mode 100644
index b8856032be..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/OptimisticLockingTranslator.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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.orm.translators.ColumnTranslator;
-import org.eclipse.jpt.core.internal.resource.xml.translators.BooleanTranslator;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class OptimisticLockingTranslator extends Translator
-	implements EclipseLinkOrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public OptimisticLockingTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(@SuppressWarnings("unused") String nodeName, @SuppressWarnings("unused") String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlOptimisticLocking();
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createTypeTranslator(),
-			createCascadeTranslator(),
-			createSelectedColumnTranslator(),
-		};
-	}
-	
-	protected Translator createTypeTranslator() {
-		return new Translator(OPTIMISTIC_LOCKING__TYPE, ECLIPSELINK_ORM_PKG.getXmlOptimisticLocking_Type(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createCascadeTranslator() {
-		return new BooleanTranslator(OPTIMISTIC_LOCKING__CASCADE, ECLIPSELINK_ORM_PKG.getXmlOptimisticLocking_Cascade(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createSelectedColumnTranslator() {
-		return new ColumnTranslator(OPTIMISTIC_LOCKING__SELECTED_COLUMN, ECLIPSELINK_ORM_PKG.getXmlOptimisticLocking_SelectedColumns());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/PropertyTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/PropertyTranslator.java
deleted file mode 100644
index 407228ab25..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/PropertyTranslator.java
+++ /dev/null
@@ -1,58 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class PropertyTranslator extends Translator
-	implements EclipseLinkOrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public PropertyTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public EObject createEMFObject(@SuppressWarnings("unused") String nodeName, @SuppressWarnings("unused") String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlProperty();
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createValueTranslator(),
-			createValueTypeTranslator(),
-		};
-	}
-	
-	protected Translator createNameTranslator() {
-		return new Translator(PROPERTY__NAME, ECLIPSELINK_ORM_PKG.getXmlProperty_Name(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createValueTranslator() {
-		return new Translator(PROPERTY__VALUE, ECLIPSELINK_ORM_PKG.getXmlProperty_Value(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createValueTypeTranslator() {
-		return new Translator(PROPERTY__VALUE_TYPE, ECLIPSELINK_ORM_PKG.getXmlProperty_ValueType(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/StoredProcedureParameterTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/StoredProcedureParameterTranslator.java
deleted file mode 100644
index 9ffe5118b5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/StoredProcedureParameterTranslator.java
+++ /dev/null
@@ -1,66 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class StoredProcedureParameterTranslator extends Translator 
-	implements EclipseLinkOrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public StoredProcedureParameterTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createDirectionTranslator(),
-			createNameTranslator(),
-			createQueryParameterTranslator(),
-			createTypeTranslator(),
-			createJdbcTypeTranslator(),
-			createJdbcTypeNameTranslator(),
-		};
-	}
-
-	private Translator createDirectionTranslator() {
-		return new Translator(PARAMETER__DIRECTION, ECLIPSELINK_ORM_PKG.getXmlStoredProcedureParameter_Direction(), DOM_ATTRIBUTE);
-	}
-
-	private Translator createNameTranslator() {
-		return new Translator(PARAMETER__NAME, ECLIPSELINK_ORM_PKG.getXmlStoredProcedureParameter_Name(), DOM_ATTRIBUTE);
-	}
-
-	private Translator createQueryParameterTranslator() {
-		return new Translator(PARAMETER__QUERY_PARAMETER, ECLIPSELINK_ORM_PKG.getXmlStoredProcedureParameter_QueryParameter(), DOM_ATTRIBUTE);
-	}
-
-	private Translator createTypeTranslator() {
-		return new Translator(PARAMETER__TYPE, ECLIPSELINK_ORM_PKG.getXmlStoredProcedureParameter_Type(), DOM_ATTRIBUTE);
-	}
-
-	private Translator createJdbcTypeTranslator() {
-		return new Translator(PARAMETER__JDBC_TYPE, ECLIPSELINK_ORM_PKG.getXmlStoredProcedureParameter_JdbcType(), DOM_ATTRIBUTE);
-	}
-
-	private Translator createJdbcTypeNameTranslator() {
-		return new Translator(PARAMETER__JDBC_TYPE_NAME, ECLIPSELINK_ORM_PKG.getXmlStoredProcedureParameter_JdbcTypeName(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/StructConverterTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/StructConverterTranslator.java
deleted file mode 100644
index 50eba69001..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/StructConverterTranslator.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2008 Oracle. All rights reserved. This
- *  program and the accompanying materials are made available under the terms of
- *  the Eclipse Public License v1.0 which accompanies this distribution, and is
- *  available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: Oracle. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class StructConverterTranslator extends Translator
-	implements EclipseLinkOrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public StructConverterTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public EObject createEMFObject(@SuppressWarnings("unused") String nodeName, @SuppressWarnings("unused") String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverterImpl();
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createConverterTranslator(),
-		};
-	}
-	
-	protected Translator createNameTranslator() {
-		return new Translator(STRUCT_CONVERTER__NAME, ECLIPSELINK_ORM_PKG.getXmlNamedConverter_Name(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createConverterTranslator() {
-		return new Translator(STRUCT_CONVERTER__CONVERTER, ECLIPSELINK_ORM_PKG.getXmlStructConverter_Converter(), DOM_ATTRIBUTE);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/TransformationTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/TransformationTranslator.java
deleted file mode 100644
index faeaceeb55..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/TransformationTranslator.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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class TransformationTranslator extends Translator
-	implements EclipseLinkOrmXmlMapper
-{
-	private Translator[] children;	
-
-	public TransformationTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlTransformationImpl();
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-//			createFetchTranslator(),
-//			createOptionalTranslator(),
-//			createMutableTranslator(),
-//			createReadTransformerTranslator(),
-//			createWriteTransformerTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()
-		};
-	}
-	
-	protected Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlAttributeMapping_Name(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createPropertyTranslator() {
-		return new PropertyTranslator(PROPERTY, ECLIPSELINK_ORM_PKG.getXmlTransformation_Properties());
-	}
-
-	protected Translator createAccessMethodsTranslator() {
-		return new AccessMethodsTranslator();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/TypeConverterTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/TypeConverterTranslator.java
deleted file mode 100644
index 2601c2aa5a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/TypeConverterTranslator.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2008 Oracle. All rights reserved. This
- *  program and the accompanying materials are made available under the terms of
- *  the Eclipse Public License v1.0 which accompanies this distribution, and is
- *  available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: Oracle. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class TypeConverterTranslator extends Translator
-	implements EclipseLinkOrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public TypeConverterTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public EObject createEMFObject(@SuppressWarnings("unused") String nodeName, @SuppressWarnings("unused") String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverterImpl();
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createDataTypeTranslator(),
-			createObjectTypeTranslator(),
-		};
-	}
-	
-	protected Translator createNameTranslator() {
-		return new Translator(TYPE_CONVERTER__NAME, ECLIPSELINK_ORM_PKG.getXmlNamedConverter_Name(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createDataTypeTranslator() {
-		return new Translator(TYPE_CONVERTER__DATA_TYPE, ECLIPSELINK_ORM_PKG.getXmlTypeConverter_DataType(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createObjectTypeTranslator() {
-		return new Translator(TYPE_CONVERTER__OBJECT_TYPE, ECLIPSELINK_ORM_PKG.getXmlTypeConverter_ObjectType(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/VariableOneToOneTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/VariableOneToOneTranslator.java
deleted file mode 100644
index 93fb11ec9d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/VariableOneToOneTranslator.java
+++ /dev/null
@@ -1,49 +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.eclipselink.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class VariableOneToOneTranslator extends Translator
-	implements EclipseLinkOrmXmlMapper
-{
-	private Translator[] children;	
-
-	public VariableOneToOneTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlVariableOneToOneImpl();
-	}
-	
-	@Override
-	protected Translator[] getChildren() {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator()
-		};
-	}
-	
-	protected Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlAttributeMapping_Name(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/BasicCollectionAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/BasicCollectionAnnotation.java
deleted file mode 100644
index 5fa7bc7e0d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/BasicCollectionAnnotation.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-
-/**
- * Java resource model interface that 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 BasicCollectionAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = EclipseLinkJPA.BASIC_COLLECTION;
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/BasicMapAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/BasicMapAnnotation.java
deleted file mode 100644
index 795c7c19ba..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/BasicMapAnnotation.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-
-/**
- * Java resource model interface that 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 BasicMapAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = EclipseLinkJPA.BASIC_MAP;
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CacheAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CacheAnnotation.java
deleted file mode 100644
index febd15af1a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CacheAnnotation.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Resource model interface that represents the 
- * org.eclipse.persistence.annotations.Cache annotation
- * 
- * 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 CacheAnnotation extends JavaResourceNode
-{
-	
-	String ANNOTATION_NAME = EclipseLinkJPA.CACHE;
-	
-	/**
-	 * Corresponds to the type element of the Cache annotation.
-	 * Returns null if the type element does not exist in java.
-	 */
-	CacheType getType();
-	
-	/**
-	 * Corresponds to the type element of the Cache annotation.
-	 * Set to null to remove the type element.
-	 */
-	void setType(CacheType type);
-		String TYPE_PROPERTY = "typeProperty"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the size element of the Cache annotation.
-	 * Returns null if the size valuePair does not exist in the annotation
-	 */
-	Integer getSize();
-	
-	/**
-	 * Corresponds to the size element of the Cache annotation.
-	 * Set to null to remove the size valuePair from the annotation
-	 */
-	void setSize(Integer size);
-		String SIZE_PROPERTY = "sizeProperty"; //$NON-NLS-1$
-		
-	/**
-	 * Corresponds to the shared element of the Cache annotation.
-	 * Returns null if the shared element does not exist in java.
-	 */
-	Boolean getShared();
-	
-	/**
-	 * Corresponds to the shared element of the Cache annotation.
-	 * Set to null to remove the shared element.
-	 */
-	void setShared(Boolean shared);
-		String SHARED_PROPERTY = "sharedProperty"; //$NON-NLS-1$
-
-	
-	/**
-	 * Corresponds to the expiry element of the Cache annotation.
-	 * Returns null if the expiry valuePair does not exist in the annotation
-	 */
-	Integer getExpiry();
-	
-	/**
-	 * Corresponds to the expiry element of the Cache annotation.
-	 * Set to null to remove the expiry valuePair from the annotation
-	 */
-	void setExpiry(Integer expiry);
-		String EXPIRY_PROPERTY = "expiryProperty"; //$NON-NLS-1$
-
-	TimeOfDayAnnotation addExpiryTimeOfDay();
-	void removeExpiryTimeOfDay();
-	TimeOfDayAnnotation getExpiryTimeOfDay();
-		String EXPIRY_TIME_OF_DAY_PROPERTY = "expiryTimeOfDayProperty"; //$NON-NLS-1$
-		
-	/**
-	 * Corresponds to the alwaysRefresh element of the Cache annotation.
-	 * Returns null if the alwaysRefresh element does not exist in java.
-	 */
-	Boolean getAlwaysRefresh();
-	
-	/**
-	 * Corresponds to the alwaysRefresh element of the Cache annotation.
-	 * Set to null to remove the alwaysRefresh element.
-	 */
-	void setAlwaysRefresh(Boolean alwaysRefresh);
-		String ALWAYS_REFRESH_PROPERTY = "alwaysRefreshProperty"; //$NON-NLS-1$
-		
-	/**
-	 * Corresponds to the refreshOnlyIfNewer element of the Cache annotation.
-	 * Returns null if the refreshOnlyIfNewer element does not exist in java.
-	 */
-	Boolean getRefreshOnlyIfNewer();
-	
-	/**
-	 * Corresponds to the refreshOnlyIfNewer element of the Cache annotation.
-	 * Set to null to remove the refreshOnlyIfNewer element.
-	 */
-	void setRefreshOnlyIfNewer(Boolean refreshOnlyIfNewer);
-		String REFRESH_ONLY_IF_NEWER_PROPERTY = "refreshOnlyIfNewerProperty"; //$NON-NLS-1$
-		
-	/**
-	 * Corresponds to the disableHits element of the Cache annotation.
-	 * Returns null if the disableHits element does not exist in java.
-	 */
-	Boolean getDisableHits();
-	
-	/**
-	 * Corresponds to the disableHits element of the Cache annotation.
-	 * Set to null to remove the disableHits element.
-	 */
-	void setDisableHits(Boolean disableHits);
-		String DISABLE_HITS_PROPERTY = "disableHitsProperty"; //$NON-NLS-1$
-		
-	/**
-	 * Corresponds to the type element of the Cache annotation.
-	 * Returns null if the type element does not exist in java.
-	 */
-	CacheCoordinationType getCoordinationType();
-	
-	/**
-	 * Corresponds to the type element of the Cache annotation.
-	 * Set to null to remove the type element.
-	 */
-	void setCoordinationType(CacheCoordinationType coordinationType);
-		String COORDINATION_TYPE_PROPERTY = "coordinationTypeProperty"; //$NON-NLS-1$
-
-			
-	/**
-	 * Return the {@link TextRange} for the type element.  If the type element 
-	 * does not exist return the {@link TextRange} for the Cache annotation.
-	 */
-	TextRange getTypeTextRange(CompilationUnit astRoot);
-	
-	/**
-	 * Return the {@link TextRange} for the shared element.  If the shared element 
-	 * does not exist return the {@link TextRange} for the Cache annotation.
-	 */
-	TextRange getSizeTextRange(CompilationUnit astRoot);
-	
-	/**
-	 * Return the {@link TextRange} for the shared element.  If the shared element 
-	 * does not exist return the {@link TextRange} for the Cache annotation.
-	 */
-	TextRange getSharedTextRange(CompilationUnit astRoot);
-	
-	/**
-	 * Return the {@link TextRange} for the expiry element.  If the expiry element 
-	 * does not exist return the {@link TextRange} for the Cache annotation.
-	 */
-	TextRange getExpiryTextRange(CompilationUnit astRoot);
-	
-	/**
-	 * Return the {@link TextRange} for the expiryTimeOfDay element.  If the expiryTimeOfDay element 
-	 * does not exist return the {@link TextRange} for the Cache annotation.
-	 */
-	TextRange getExpiryTimeOfDayTextRange(CompilationUnit astRoot);
-	
-	/**
-	 * Return the {@link TextRange} for the alwaysRefresh element.  If the alwaysRefresh element 
-	 * does not exist return the {@link TextRange} for the Cache annotation.
-	 */
-	TextRange getAlwaysRefreshTextRange(CompilationUnit astRoot);
-	
-	/**
-	 * Return the {@link TextRange} for the refreshOnlyIfNewer element.  If the refreshOnlyIfNewer element 
-	 * does not exist return the {@link TextRange} for the Cache annotation.
-	 */
-	TextRange getRefreshOnlyIfNewerTextRange(CompilationUnit astRoot);
-	
-	/**
-	 * Return the {@link TextRange} for the disableHits element.  If the disableHits element 
-	 * does not exist return the {@link TextRange} for the Cache annotation.
-	 */
-	TextRange getDisablesHitsTextRange(CompilationUnit astRoot);
-	
-	/**
-	 * Return the {@link TextRange} for the coordinationType element.  If the coordinationType element 
-	 * does not exist return the {@link TextRange} for the Cache annotation.
-	 */
-	TextRange getCoordinationTypeTextRange(CompilationUnit astRoot);
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CacheCoordinationType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CacheCoordinationType.java
deleted file mode 100644
index 6a3ed5204c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CacheCoordinationType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-/**
- * 
- * 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,
-	INVALIDATE_CHANGED_OBJECTS,
-	SEND_NEW_OBJECTS_WITH_CHANGES,
-	NONE;
-	
-	public static CacheCoordinationType fromJavaAnnotationValue(Object javaAnnotationValue) {
-		if (javaAnnotationValue == null) {
-			return null;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.CACHE_COORDINATION_TYPE__SEND_OBJECT_CHANGES)) {
-			return SEND_OBJECT_CHANGES;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.CACHE_COORDINATION_TYPE__INVALIDATE_CHANGED_OBJECTS)) {
-			return INVALIDATE_CHANGED_OBJECTS;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.CACHE_COORDINATION_TYPE__SEND_NEW_OBJECTS_WITH_CHANGES)) {
-			return SEND_NEW_OBJECTS_WITH_CHANGES;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.CACHE_COORDINATION_TYPE__NONE)) {
-			return NONE;
-		}
-		return null;
-	}
-
-	public static String toJavaAnnotationValue(CacheCoordinationType cacheCoordinationType) {
-		if (cacheCoordinationType == null) {
-			return null;
-		}
-		switch (cacheCoordinationType) {
-			case SEND_OBJECT_CHANGES :
-				return EclipseLinkJPA.CACHE_COORDINATION_TYPE__SEND_OBJECT_CHANGES;
-			case INVALIDATE_CHANGED_OBJECTS :
-				return EclipseLinkJPA.CACHE_COORDINATION_TYPE__INVALIDATE_CHANGED_OBJECTS;
-			case SEND_NEW_OBJECTS_WITH_CHANGES :
-				return EclipseLinkJPA.CACHE_COORDINATION_TYPE__SEND_NEW_OBJECTS_WITH_CHANGES;
-			case NONE :
-				return EclipseLinkJPA.CACHE_COORDINATION_TYPE__NONE;
-			default :
-				throw new IllegalArgumentException("unknown cache coordination type: " + cacheCoordinationType); //$NON-NLS-1$
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CacheType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CacheType.java
deleted file mode 100644
index bf0e43708d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CacheType.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-/**
- * 
- * 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,
-	WEAK,
-	SOFT,
-	SOFT_WEAK,
-	HARD_WEAK,
-	CACHE,
-	NONE;
-	
-	
-	public static CacheType fromJavaAnnotationValue(Object javaAnnotationValue) {
-		if (javaAnnotationValue == null) {
-			return null;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.CACHE_TYPE__FULL)) {
-			return FULL;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.CACHE_TYPE__WEAK)) {
-			return WEAK;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.CACHE_TYPE__SOFT)) {
-			return SOFT;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.CACHE_TYPE__SOFT_WEAK)) {
-			return SOFT_WEAK;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.CACHE_TYPE__HARD_WEAK)) {
-			return HARD_WEAK;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.CACHE_TYPE__CACHE)) {
-			return CACHE;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.CACHE_TYPE__NONE)) {
-			return NONE;
-		}
-		return null;
-	}
-
-	public static String toJavaAnnotationValue(CacheType cacheType) {
-		if (cacheType == null) {
-			return null;
-		}
-		switch (cacheType) {
-			case FULL :
-				return EclipseLinkJPA.CACHE_TYPE__FULL;
-			case WEAK :
-				return EclipseLinkJPA.CACHE_TYPE__WEAK;
-			case SOFT :
-				return EclipseLinkJPA.CACHE_TYPE__SOFT;
-			case SOFT_WEAK :
-				return EclipseLinkJPA.CACHE_TYPE__SOFT_WEAK;
-			case HARD_WEAK :
-				return EclipseLinkJPA.CACHE_TYPE__HARD_WEAK;
-			case CACHE :
-				return EclipseLinkJPA.CACHE_TYPE__CACHE;
-			case NONE :
-				return EclipseLinkJPA.CACHE_TYPE__NONE;
-			default :
-				throw new IllegalArgumentException("unknown cache type: " + cacheType); //$NON-NLS-1$
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ChangeTrackingAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ChangeTrackingAnnotation.java
deleted file mode 100644
index e1ad12d788..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ChangeTrackingAnnotation.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Resource model interface that represents the 
- * org.eclipse.persistence.annotations.ChangeTracking annotation
- * 
- * 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 ChangeTrackingAnnotation extends JavaResourceNode
-{
-	
-	String ANNOTATION_NAME = EclipseLinkJPA.CHANGE_TRACKING;
-	
-	/**
-	 * Corresponds to the value element of the ChangeTracking annotation.
-	 * Returns null if the value element does not exist in java.
-	 */
-	ChangeTrackingType getValue();
-	
-	/**
-	 * Corresponds to the value element of the ChangeTracking annotation.
-	 * Set to null to remove the value element.
-	 */
-	void setValue(ChangeTrackingType value);
-		String VALUE_PROPERTY = "valueProperty"; //$NON-NLS-1$
-	
-		
-	/**
-	 * Return the {@link TextRange} for the value element.  If the value element 
-	 * does not exist return the {@link TextRange} for the ChangeTracking annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ChangeTrackingType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ChangeTrackingType.java
deleted file mode 100644
index 749f7c2499..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ChangeTrackingType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-/**
- * 
- * 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,
-	OBJECT,
-	DEFERRED,
-	AUTO;
-	
-	public static ChangeTrackingType fromJavaAnnotationValue(Object javaAnnotationValue) {
-		if (javaAnnotationValue == null) {
-			return null;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.CHANGE_TRACKING_TYPE__ATTRIBUTE)) {
-			return ATTRIBUTE;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.CHANGE_TRACKING_TYPE__OBJECT)) {
-			return OBJECT;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.CHANGE_TRACKING_TYPE__DEFERRED)) {
-			return DEFERRED;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.CHANGE_TRACKING_TYPE__AUTO)) {
-			return AUTO;
-		}
-		return null;
-	}
-
-	public static String toJavaAnnotationValue(ChangeTrackingType changeTrackingType) {
-		if (changeTrackingType == null) {
-			return null;
-		}
-		switch (changeTrackingType) {
-			case ATTRIBUTE :
-				return EclipseLinkJPA.CHANGE_TRACKING_TYPE__ATTRIBUTE;
-			case OBJECT :
-				return EclipseLinkJPA.CHANGE_TRACKING_TYPE__OBJECT;
-			case DEFERRED :
-				return EclipseLinkJPA.CHANGE_TRACKING_TYPE__DEFERRED;
-			case AUTO :
-				return EclipseLinkJPA.CHANGE_TRACKING_TYPE__AUTO;
-			default :
-				throw new IllegalArgumentException("unknown change tracking type: " + changeTrackingType); //$NON-NLS-1$
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ConversionValueAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ConversionValueAnnotation.java
deleted file mode 100644
index 5aa1075219..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ConversionValueAnnotation.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Java resource model interface that 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 ConversionValueAnnotation extends JavaResourceNode
-{
-	
-	String ANNOTATION_NAME = EclipseLinkJPA.CONVERSION_VALUE;
-	
-		
-	/**
-	 * Corresponds to the dataValue element of the ConversionValue annotation.
-	 * Returns null if the dataValue element does not exist in java.
-	 */
-	String getDataValue();
-	
-	/**
-	 * Corresponds to the dataValue element of the ConversionValue annotation.
-	 * Set to null to remove the dataValue element.
-	 */
-	void setDataValue(String dataValue);
-		String DATA_VALUE_PROPERTY = "dataValueProperty"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the objectValue element of the ConversionValue annotation.
-	 * Returns null if the objectValue element does not exist in java.
-	 */
-	String getObjectValue();
-	
-	/**
-	 * Corresponds to the objectValue element of the ConversionValue annotation.
-	 * Set to null to remove the objectValue element.
-	 */
-	void setObjectValue(String objectValue);
-		String OBJECT_VALUE_PROPERTY = "objectValueProperty"; //$NON-NLS-1$
-		
-	/**
-	 * Return the {@link TextRange} for the dataValue element.  If the dataValue element 
-	 * does not exist return the {@link TextRange} for the ConversionValue annotation.
-	 */
-	TextRange getDataValueTextRange(CompilationUnit astRoot);
-	
-	/**
-	 * Return the {@link TextRange} for the objectValue element.  If the objectValue element 
-	 * does not exist return the {@link TextRange} for the ConversionValue annotation.
-	 */
-	TextRange getObjectValueTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ConvertAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ConvertAnnotation.java
deleted file mode 100644
index f6ff736b25..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ConvertAnnotation.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Java resource model interface that 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 ConvertAnnotation extends JavaResourceNode
-{
-	
-	String ANNOTATION_NAME = EclipseLinkJPA.CONVERT;
-	
-		
-	/**
-	 * Corresponds to the value element of the Convert annotation.
-	 * Returns null if the value element does not exist in java.
-	 */
-	String getValue();
-	
-	/**
-	 * Corresponds to the value element of the Convert annotation.
-	 * Set to null to remove the value element.
-	 */
-	void setValue(String value);
-		String VALUE_PROPERTY = "valueProperty"; //$NON-NLS-1$
-	
-	/**
-	 * Return the {@link TextRange} for the value element.  If the value element 
-	 * does not exist return the {@link TextRange} for the Convert annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ConverterAnnotation.java
deleted file mode 100644
index d81130b5a2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ConverterAnnotation.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Java resource model interface that 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.1
- * @since 2.1
- */
-public interface ConverterAnnotation extends NamedConverterAnnotation
-{
-	String ANNOTATION_NAME = EclipseLinkJPA.CONVERTER;
-		
-	/**
-	 * Corresponds to the converterClass element of the CustomConverter annotation.
-	 * Returns null if the converterClass element does not exist in java.
-	 */
-	String getConverterClass();
-	
-	/**
-	 * Corresponds to the converterClass element of the CustomConverter annotation.
-	 * Set to null to remove the converterClass element.
-	 */
-	void setConverterClass(String value);
-		String CONVERTER_CLASS_PROPERTY = "converterClass"; //$NON-NLS-1$
-		
-	/**
-	 * Return whether the converterClass implements the eclipselink Converter interface
-	 * @see org.eclipse.jpt.eclipselink.core.context.CustomConverter#ECLIPSELINK_CONVERTER_CLASS_NAME
-	 */
-	boolean converterClassImplementsInterface(String interfaceName, CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the converterClass element.  If the converterClass element 
-	 * does not exist return the {@link TextRange} for the CustomConverter annotation.
-	 */
-	TextRange getConverterClassTextRange(CompilationUnit astRoot);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CustomizerAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CustomizerAnnotation.java
deleted file mode 100644
index 6739a445ec..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CustomizerAnnotation.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Java resource model interface that 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.1
- * @since 2.1
- */
-public interface CustomizerAnnotation extends JavaResourceNode
-{
-	
-	String ANNOTATION_NAME = EclipseLinkJPA.CUSTOMIZER;
-
-	/**
-	 * Corresponds to the value element of the Customizer annotation.
-	 * Returns null if the value element does not exist in java.
-	 */
-	String getValue();
-	
-	/**
-	 * Corresponds to the value element of the Customizer annotation.
-	 * Set to null to remove the value element.
-	 */
-	void setValue(String value);
-		String VALUE_PROPERTY = "valueProperty"; //$NON-NLS-1$
-
-	/**
-	 * Return whether the converterClass implements the eclipselink Customizer interface
-	 * @see org.eclipse.jpt.eclipselink.core.context.Customizer#ECLIPSELINK_DESCRIPTOR_CUSTOMIZER_CLASS_NAME
-	 */
-	boolean customizerClassImplementsInterface(String interfaceName, CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the value element.  If the value element 
-	 * does not exist return the {@link TextRange} for the Customizer annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkJPA.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkJPA.java
deleted file mode 100644
index bfc9de9d23..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkJPA.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-
-/**
- * EclipseLink JPA 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 EclipseLinkJPA {
-
-	// EclipseLink JPA package
-	String PACKAGE = "org.eclipse.persistence.annotations"; //$NON-NLS-1$
-	String PACKAGE_ = PACKAGE + ".";
-
-
-	// ********** API **********
-
-	// JPA 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 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 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 CHANGE_TRACKING = PACKAGE_ + "ChangeTracking";
-		String CHANGE_TRACKING__VALUE = "value";
-
-	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 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 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 = PACKAGE_ + "JoinFetch";
-		String JOIN_FETCH_VALUE = "value";
-
-	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";
-
-	String MUTABLE = PACKAGE_ + "Mutable";
-		String MUTABLE__VALUE = "value";
-	
-	String OBJECT_TYPE_CONVERTER = PACKAGE_ + "ObjectTypeConverter";
-		String OBJECT_TYPE_CONVERTER__NAME = "name";
-		String OBJECT_TYPE_CONVERTER__DATE_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 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__DATE_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";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ExistenceCheckingAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ExistenceCheckingAnnotation.java
deleted file mode 100644
index e57b17f093..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ExistenceCheckingAnnotation.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Resource model interface that represents the 
- * org.eclipse.persistence.annotations.ExistenceChecking annotation
- * 
- * 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 ExistenceCheckingAnnotation extends JavaResourceNode
-{
-	
-	String ANNOTATION_NAME = EclipseLinkJPA.EXISTENCE_CHECKING;
-	
-	/**
-	 * Corresponds to the value element of the ExistenceChecking annotation.
-	 * Returns null if the value element does not exist in java.
-	 */
-	ExistenceType getValue();
-	
-	/**
-	 * Corresponds to the value element of the ExistenceChecking annotation.
-	 * Set to null to remove the value element.
-	 */
-	void setValue(ExistenceType value);
-		String VALUE_PROPERTY = "valueProperty"; //$NON-NLS-1$
-	
-		
-	/**
-	 * Return the {@link TextRange} for the value element.  If the value element 
-	 * does not exist return the {@link TextRange} for the ExistenceChecking annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ExistenceType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ExistenceType.java
deleted file mode 100644
index b466c2bf2d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ExistenceType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-/**
- * 
- * 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,
-    CHECK_DATABASE,
-    ASSUME_EXISTENCE,
-    ASSUME_NON_EXISTENCE;
-	
-	public static ExistenceType fromJavaAnnotationValue(Object javaAnnotationValue) {
-		if (javaAnnotationValue == null) {
-			return null;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.EXISTENCE_TYPE__CHECK_CACHE)) {
-			return CHECK_CACHE;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.EXISTENCE_TYPE__CHECK_DATABASE)) {
-			return CHECK_DATABASE;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.EXISTENCE_TYPE__ASSUME_EXISTENCE)) {
-			return ASSUME_EXISTENCE;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.EXISTENCE_TYPE__ASSUME_NON_EXISTENCE)) {
-			return ASSUME_NON_EXISTENCE;
-		}
-		return null;
-	}
-
-	public static String toJavaAnnotationValue(ExistenceType existenceType) {
-		if (existenceType == null) {
-			return null;
-		}
-		switch (existenceType) {
-			case CHECK_CACHE :
-				return EclipseLinkJPA.EXISTENCE_TYPE__CHECK_CACHE;
-			case CHECK_DATABASE :
-				return EclipseLinkJPA.EXISTENCE_TYPE__CHECK_DATABASE;
-			case ASSUME_EXISTENCE :
-				return EclipseLinkJPA.EXISTENCE_TYPE__ASSUME_EXISTENCE;
-			case ASSUME_NON_EXISTENCE :
-				return EclipseLinkJPA.EXISTENCE_TYPE__ASSUME_NON_EXISTENCE;
-			default :
-				throw new IllegalArgumentException("unknown existence type: " + existenceType); //$NON-NLS-1$
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/JoinFetchAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/JoinFetchAnnotation.java
deleted file mode 100644
index ffbb00211a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/JoinFetchAnnotation.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Resource model interface that represents the 
- * org.eclipse.persistence.annotations.JoinFetch annotation
- * 
- * 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 JoinFetchAnnotation extends JavaResourceNode
-{
-	
-	String ANNOTATION_NAME = EclipseLinkJPA.JOIN_FETCH;
-	
-	/**
-	 * Corresponds to the value element of the JoinFetch annotation.
-	 * Returns null if the value element does not exist in java.
-	 */
-	JoinFetchType getValue();
-	
-	/**
-	 * Corresponds to the value element of the JoinFetch annotation.
-	 * Set to null to remove the value element.
-	 */
-	void setValue(JoinFetchType value);
-		String VALUE_PROPERTY = "valueProperty"; //$NON-NLS-1$
-	
-		
-	/**
-	 * Return the {@link TextRange} for the value element.  If the value element 
-	 * does not exist return the {@link TextRange} for the JoinFetch annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/JoinFetchType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/JoinFetchType.java
deleted file mode 100644
index c6d183ab28..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/JoinFetchType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-/**
- * Resource model interface that represents the 
- * org.eclipse.persistence.annotations.JoinFetchType enum
- * 
- * 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,
-    OUTER;
-	
-	public static JoinFetchType fromJavaAnnotationValue(Object javaAnnotationValue) {
-		if (javaAnnotationValue == null) {
-			return null;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.JOIN_FETCH_TYPE__INNER)) {
-			return INNER;
-		}
-		if (javaAnnotationValue.equals(EclipseLinkJPA.JOIN_FETCH_TYPE__OUTER)) {
-			return OUTER;
-		}
-		return null;
-	}
-
-	public static String toJavaAnnotationValue(JoinFetchType joinFetchType) {
-		if (joinFetchType == null) {
-			return null;
-		}
-		switch (joinFetchType) {
-			case INNER :
-				return EclipseLinkJPA.JOIN_FETCH_TYPE__INNER;
-			case OUTER :
-				return EclipseLinkJPA.JOIN_FETCH_TYPE__OUTER;
-			default :
-				throw new IllegalArgumentException("unknown join fetch type: " + joinFetchType); //$NON-NLS-1$
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/MutableAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/MutableAnnotation.java
deleted file mode 100644
index f88be1ecf3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/MutableAnnotation.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Java resource model interface that 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 MutableAnnotation extends JavaResourceNode
-{
-	
-	String ANNOTATION_NAME = EclipseLinkJPA.MUTABLE;
-	
-		
-	/**
-	 * Corresponds to the value element of the Mutable annotation.
-	 * Returns null if the value element does not exist in java.
-	 */
-	Boolean getValue();
-	
-	/**
-	 * Corresponds to the value element of the Mutable annotation.
-	 * Set to null to remove the value element.
-	 */
-	void setValue(Boolean value);
-		String VALUE_PROPERTY = "valueProperty"; //$NON-NLS-1$
-	
-	/**
-	 * Return the {@link TextRange} for the value element.  If the value element 
-	 * does not exist return the {@link TextRange} for the Mutable annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/NamedConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/NamedConverterAnnotation.java
deleted file mode 100644
index f4d0487147..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/NamedConverterAnnotation.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2008  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * 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 NamedConverterAnnotation extends JavaResourceNode
-{
-	/**
-	 * Corresponds to the name element of the CustomConverter annotation.
-	 * Returns null if the name element does not exist in java.
-	 */
-	String getName();
-	
-	/**
-	 * Corresponds to the name element of the CustomConverter annotation.
-	 * Set to null to remove the name element.
-	 */
-	void setName(String value);
-		String NAME_PROPERTY = "nameProperty"; //$NON-NLS-1$
-
-	/**
-	 * Return the {@link TextRange} for the name element.  If the name element 
-	 * does not exist return the {@link TextRange} for the CustomConverter annotation.
-	 */
-	TextRange getNameTextRange(CompilationUnit astRoot);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/NestableConversionValue.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/NestableConversionValue.java
deleted file mode 100644
index 464a8e8b91..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/NestableConversionValue.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-
-/**
- * 
- * 
- * 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 NestableConversionValue extends ConversionValueAnnotation, NestableAnnotation
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ObjectTypeConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ObjectTypeConverterAnnotation.java
deleted file mode 100644
index 7d8a279f55..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ObjectTypeConverterAnnotation.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Java resource model interface that 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 ObjectTypeConverterAnnotation extends TypeConverterAnnotation
-{
-	String ANNOTATION_NAME = EclipseLinkJPA.OBJECT_TYPE_CONVERTER;
-	
-	/**
-	 * Corresponds to the conversionValues element of the ObjectTypeConverter annotation.
-	 * Returns an empty iterator if the conversionValues element does not exist in java.
-	 */
-	ListIterator<ConversionValueAnnotation> conversionValues();
-	
-	ConversionValueAnnotation conversionValueAt(int index);
-	
-	int indexOfConversionValue(ConversionValueAnnotation conversionValue);
-	
-	int conversionValuesSize();
-	
-	ConversionValueAnnotation addConversionValue(int index);
-	
-	void removeConversionValue(int index);
-	
-	void moveConversionValue(int targetIndex, int sourceIndex);
-	
-		String CONVERSION_VALUES_LIST = "conversionValuesList"; //$NON-NLS-1$
-		
-	/**
-	 * Corresponds to the defaultObjectValue element of the ObjectTypeConverter annotation.
-	 * Returns null if the defaultObjectValue element does not exist in java.
-	 */
-	String getDefaultObjectValue();
-	
-	/**
-	 * Corresponds to the defaultObjectValue element of the ObjectTypeConverter annotation.
-	 * Set to null to remove the defaultObjectValue element.
-	 */
-	void setDefaultObjectValue(String value);
-		String DEFAULT_OBJECT_VALUE_PROPERTY = "defaultObjectValueProperty"; //$NON-NLS-1$
-		
-	/**
-	 * Return the {@link TextRange} for the defaultObjectValue element.  If the defaultObjectValue element 
-	 * does not exist return the {@link TextRange} for the ObjectTypeConverter annotation.
-	 */
-	TextRange getDefaultObjectValueTextRange(CompilationUnit astRoot);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/PrivateOwnedAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/PrivateOwnedAnnotation.java
deleted file mode 100644
index a330c9dae1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/PrivateOwnedAnnotation.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-
-/**
- * Resource model interface that represents the 
- * org.eclipse.persistence.annotations.PrivateOwned annotation
- * 
- * 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 PrivateOwnedAnnotation extends JavaResourceNode
-{	
-	String ANNOTATION_NAME = EclipseLinkJPA.PRIVATE_OWNED;
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ReadOnlyAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ReadOnlyAnnotation.java
deleted file mode 100644
index 80e8a5f822..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ReadOnlyAnnotation.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-
-/**
- * Resource model interface that represents the 
- * org.eclipse.persistence.annotations.PrivateOwned annotation
- * 
- * 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 ReadOnlyAnnotation extends JavaResourceNode
-{	
-	String ANNOTATION_NAME = EclipseLinkJPA.READ_ONLY;
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ReadTransformerAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ReadTransformerAnnotation.java
deleted file mode 100644
index 900198ef6b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ReadTransformerAnnotation.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-/**
- * Java resource model interface that 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 ReadTransformerAnnotation extends TransformerAnnotation
-{
-	
-	String ANNOTATION_NAME = EclipseLinkJPA.READ_TRANSFORMER;
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/StructConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/StructConverterAnnotation.java
deleted file mode 100644
index ff01803fee..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/StructConverterAnnotation.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Java resource model interface that 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 StructConverterAnnotation extends NamedConverterAnnotation
-{
-	String ANNOTATION_NAME = EclipseLinkJPA.STRUCT_CONVERTER;
-	
-	/**
-	 * Corresponds to the converter element of the StructConverter annotation.
-	 * Returns null if the converter element does not exist in java.
-	 */
-	String getConverter();
-	
-	/**
-	 * Corresponds to the converter element of the StructConverter annotation.
-	 * Set to null to remove the converter element.
-	 */
-	void setConverter(String value);
-		String CONVERTER_PROPERTY = "converterProperty"; //$NON-NLS-1$
-	/**
-	 * Return the {@link TextRange} for the converter element.  If the converter element 
-	 * does not exist return the {@link TextRange} for the StructConverter annotation.
-	 */
-	TextRange getConverterTextRange(CompilationUnit astRoot);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/TimeOfDayAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/TimeOfDayAnnotation.java
deleted file mode 100644
index aa3e008fc3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/TimeOfDayAnnotation.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Resource model interface that represents the 
- * org.eclipse.persistence.annotations.TimeOfDay annotation
- * 
- * 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 TimeOfDayAnnotation extends JavaResourceNode
-{
-	
-	String ANNOTATION_NAME = EclipseLinkJPA.TIME_OF_DAY;
-	
-	/**
-	 * Corresponds to the hour element of the TimeOfDay annotation.
-	 * Returns null if the hour valuePair does not exist in the annotation
-	 */
-	Integer getHour();
-	
-	/**
-	 * Corresponds to the hour element of the TimeOfDay annotation.
-	 * Set to null to remove the hour valuePair from the annotation
-	 */
-	void setHour(Integer hour);
-		String HOUR_PROPERTY = "hourProperty"; //$NON-NLS-1$
-		
-	/**
-	 * Corresponds to the minute element of the TimeOfDay annotation.
-	 * Returns null if the minute valuePair does not exist in the annotation
-	 */
-	Integer getMinute();
-	
-	/**
-	 * Corresponds to the minute element of the TimeOfDay annotation.
-	 * Set to null to remove the minute valuePair from the annotation
-	 */
-	void setMinute(Integer minute);
-		String MINUTE_PROPERTY = "minuteProperty"; //$NON-NLS-1$
-		
-	/**
-	 * Corresponds to the second element of the TimeOfDay annotation.
-	 * Returns null if the second valuePair does not exist in the annotation
-	 */
-	Integer getSecond();
-	
-	/**
-	 * Corresponds to the second element of the TimeOfDay annotation.
-	 * Set to null to remove the second valuePair from the annotation
-	 */
-	void setSecond(Integer second);
-		String SECOND_PROPERTY = "secondProperty"; //$NON-NLS-1$
-
-	
-	/**
-	 * Corresponds to the millisecond element of the TimeOfDay annotation.
-	 * Returns null if the millisecond valuePair does not exist in the annotation
-	 */
-	Integer getMillisecond();
-	
-	/**
-	 * Corresponds to the millisecond element of the TimeOfDay annotation.
-	 * Set to null to remove the millisecond valuePair from the annotation
-	 */
-	void setMillisecond(Integer millisecond);
-		String MILLISECOND_PROPERTY = "millisecondProperty"; //$NON-NLS-1$
-		
-	
-	/**
-	 * Return the {@link TextRange} for the hour element.  If the hour element 
-	 * does not exist return the {@link TextRange} for the TimeOfDay annotation.
-	 */
-	TextRange getHourTextRange(CompilationUnit astRoot);
-	
-	/**
-	 * Return the {@link TextRange} for the minute element.  If the minute element 
-	 * does not exist return the {@link TextRange} for the TimeOfDay annotation.
-	 */
-	TextRange getMinuteTextRange(CompilationUnit astRoot);
-	
-	/**
-	 * Return the {@link TextRange} for the second element.  If the second element 
-	 * does not exist return the {@link TextRange} for the TimeOfDay annotation.
-	 */
-	TextRange getSecondTextRange(CompilationUnit astRoot);
-	
-	/**
-	 * Return the {@link TextRange} for the millisecond element.  If the millisecond element 
-	 * does not exist return the {@link TextRange} for the TimeOfDay annotation.
-	 */
-	TextRange getMillisecondTextRange(CompilationUnit astRoot);
-		
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/TransformationAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/TransformationAnnotation.java
deleted file mode 100644
index 767b30bc6b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/TransformationAnnotation.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.FetchType;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Java resource model interface that 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 TransformationAnnotation extends JavaResourceNode
-{
-	
-	String ANNOTATION_NAME = EclipseLinkJPA.TRANSFORMATION;
-	
-	/**
-	 * Corresponds to the fetch element of the Transformation annotation.
-	 * Returns null if the fetch element does not exist in java.
-	 */
-	FetchType getFetch();
-	
-	/**
-	 * Corresponds to the fetch element of the Transformation annotation.
-	 * Set to null to remove the fetch element.
-	 */
-	void setFetch(FetchType fetch);
-		String FETCH_PROPERTY = "fetchProperty"; //$NON-NLS-1$
-		
-	/**
-	 * Corresponds to the optional element of the Transformation annotation.
-	 * Returns null if the optional element does not exist in java.
-	 */
-	Boolean getOptional();
-	
-	/**
-	 * Corresponds to the optional element of the Transformation annotation.
-	 * Set to null to remove the optional element.
-	 */
-	void setOptional(Boolean optional);
-		String OPTIONAL_PROPERTY = "optionalProperty"; //$NON-NLS-1$
-	
-	/**
-	 * Return the {@link TextRange} for the fetch element.  If the fetch element 
-	 * does not exist return the {@link TextRange} for the Transformation annotation.
-	 */
-	TextRange getFetchTextRange(CompilationUnit astRoot);
-	
-	/**
-	 * Return the {@link TextRange} for the optional element.  If the optional element 
-	 * does not exist return the {@link TextRange} for the Transformation annotation.
-	 */
-	TextRange getOptionalTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/TransformerAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/TransformerAnnotation.java
deleted file mode 100644
index 0e9952f891..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/TransformerAnnotation.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * 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 TransformerAnnotation extends JavaResourceNode
-{
-	
-	/**
-	 * Corresponds to the transformerClass element of the *Transformer annotation.
-	 * Returns null if the transformerClass element does not exist in java.
-	 * Returns the portion of the transformerClass preceding the .class.
-	 * <p>
-	 *     &#64;ReadTransformer(transformerClass=Employee.class)
-	 * </p>
-	 * will return "Employee"
-	 **/
-	String getTransformerClass();
-	
-	/**
-	 * Corresponds to the transformerClass element of the *Transformer annotation.
-	 * Set to null to remove the transformerClass element.
-	 */
-	void setTransformerClass(String transformerClass);
-		String TRANSFORMER_CLASS_PROPERTY = "transformerClassProperty"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the method element of the *Transformer annotation.
-	 * Returns null if the method element does not exist in java.
-	 **/
-	String getMethod();
-	
-	/**
-	 * Corresponds to the method element of the *Transformer annotation.
-	 * Set to null to remove the method element.
-	 */
-	void setMethod(String method);
-		String METHOD_PROPERTY = "methodProperty"; //$NON-NLS-1$
-		
-	/**
-	 * Return the {@link TextRange} for the transformerClass element.  If the transformerClass element 
-	 * does not exist return the {@link TextRange} for the *Transformer annotation.
-	 */
-	TextRange getTransformerClassTextRange(CompilationUnit astRoot);
-	
-	/**
-	 * Return the {@link TextRange} for the method element.  If the method element 
-	 * does not exist return the {@link TextRange} for the *Transformer annotation.
-	 */
-	TextRange getMethodTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/TypeConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/TypeConverterAnnotation.java
deleted file mode 100644
index 60aa8a78df..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/TypeConverterAnnotation.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Java resource model interface that 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 TypeConverterAnnotation extends NamedConverterAnnotation
-{
-	String ANNOTATION_NAME = EclipseLinkJPA.TYPE_CONVERTER;
-	
-	/**
-	 * Corresponds to the dataType element of the TypeConverter annotation.
-	 * Returns null if the dataType element does not exist in java.
-	 */
-	String getDataType();
-	
-	/**
-	 * Corresponds to the dataType element of the TypeConverter annotation.
-	 * Set to null to remove the dataType element.
-	 */
-	void setDataType(String value);
-		String DATA_TYPE_PROPERTY = "dataTypeProperty"; //$NON-NLS-1$
-	
-	/**
-	 * Corresponds to the objectType element of the TypeConverter annotation.
-	 * Returns null if the objectType element does not exist in java.
-	 */
-	String getObjectType();
-	
-	/**
-	 * Corresponds to the objectType element of the TypeConverter annotation.
-	 * Set to null to remove the objectType element.
-	 */
-	void setObjectType(String value);
-		String OBJECT_TYPE_PROPERTY = "objectTypeProperty"; //$NON-NLS-1$
-	
-	/**
-	 * Return the {@link TextRange} for the dataType element.  If the dataType element 
-	 * does not exist return the {@link TextRange} for the TypeConverter annotation.
-	 */
-	TextRange getDataTypeTextRange(CompilationUnit astRoot);
-	
-	/**
-	 * Return the {@link TextRange} for the objectType element.  If the objectType element 
-	 * does not exist return the {@link TextRange} for the TypeConverter annotation.
-	 */
-	TextRange getObjectTypeTextRange(CompilationUnit astRoot);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/VariableOneToOneAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/VariableOneToOneAnnotation.java
deleted file mode 100644
index 21358f6113..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/VariableOneToOneAnnotation.java
+++ /dev/null
@@ -1,30 +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.eclipselink.core.resource.java;
-
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-
-/**
- * Java resource model interface that corresponds to the 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 VariableOneToOneAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = EclipseLinkJPA.VARIABLE_ONE_TO_ONE;
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/WriteTransformerAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/WriteTransformerAnnotation.java
deleted file mode 100644
index 09f2dd96b6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/WriteTransformerAnnotation.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.ColumnAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Java resource model interface that 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 WriteTransformerAnnotation extends TransformerAnnotation
-{
-	
-	String ANNOTATION_NAME = EclipseLinkJPA.WRITE_TRANSFORMER;
-	
-	/**
-	 * Corresponds to the column element of the WriteTransformer annotation.
-	 * Returns null if the column element does not exist in java.
-	 */
-	ColumnAnnotation getColumn();
-	
-	/**
-	 * Add the column element to the WriteTransformer annotation.
-	 */
-	ColumnAnnotation addColumn();
-	
-	/**
-	 * Remove the column element from the WriteTransformer annotation.
-	 */
-	void removeColumn();
-	
-	/**
-	 * 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();
-	
-	String COLUMN_PROPERTY = "columnProperty"; //$NON-NLS-1$
-	
-	/**
-	 * Return the {@link TextRange} for the column element.  If the column element 
-	 * does not exist return the {@link TextRange} for the WriteTransformer annotation.
-	 */
-	TextRange getColumnTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/Attributes.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/Attributes.java
deleted file mode 100644
index 435091012f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/Attributes.java
+++ /dev/null
@@ -1,352 +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.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.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.Attributes#getBasicCollections <em>Basic Collections</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.Attributes#getBasicMaps <em>Basic Maps</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.Attributes#getTransformations <em>Transformations</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.Attributes#getVariableOneToOnes <em>Variable One To Ones</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getAttributes()
- * @model kind="class"
- * @generated
- */
-public class Attributes extends org.eclipse.jpt.core.resource.orm.Attributes
-{
-	/**
-	 * 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>Basic Collections</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.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.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.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.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.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.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.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.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__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__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__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__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__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);
-	}
-	
-	@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.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];
-
-} // Attributes
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/CacheCoordinationType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/CacheCoordinationType.java
deleted file mode 100644
index c050c8178d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/CacheCoordinationType.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import java.util.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.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/CacheType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/CacheType.java
deleted file mode 100644
index 8515373d69..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/CacheType.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import java.util.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.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java
deleted file mode 100644
index a8b5be6480..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java
+++ /dev/null
@@ -1,761 +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.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 -->
- * 
- * 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.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_CONVERTER_IMPL: return (EObject)createXmlConverterImpl();
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL: return (EObject)createXmlTypeConverterImpl();
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE_IMPL: return (EObject)createXmlConversionValueImpl();
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL: return (EObject)createXmlObjectTypeConverterImpl();
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER_IMPL: return (EObject)createXmlStructConverterImpl();
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER: return (EObject)createXmlStoredProcedureParameter();
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY: return (EObject)createXmlNamedStoredProcedureQuery();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS: return (EObject)createXmlEntityMappings();
-			case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_METADATA: return (EObject)createXmlPersistenceUnitMetadata();
-			case EclipseLinkOrmPackage.XML_CUSTOMIZER: return (EObject)createXmlCustomizer();
-			case EclipseLinkOrmPackage.XML_CHANGE_TRACKING: return (EObject)createXmlChangeTracking();
-			case EclipseLinkOrmPackage.XML_COPY_POLICY: return (EObject)createXmlCopyPolicy();
-			case EclipseLinkOrmPackage.XML_INSTANTIATION_POLICY: return (EObject)createXmlInstantiationPolicy();
-			case EclipseLinkOrmPackage.XML_CLONE_COPY_POLICY: return (EObject)createXmlCloneCopyPolicy();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE: return (EObject)createXmlEmbeddable();
-			case EclipseLinkOrmPackage.XML_TIME_OF_DAY: return (EObject)createXmlTimeOfDay();
-			case EclipseLinkOrmPackage.XML_CACHE: return (EObject)createXmlCache();
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING: return (EObject)createXmlOptimisticLocking();
-			case EclipseLinkOrmPackage.XML_ENTITY: return (EObject)createXmlEntity();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS: return (EObject)createXmlMappedSuperclass();
-			case EclipseLinkOrmPackage.XML_ACCESS_METHODS: return (EObject)createXmlAccessMethods();
-			case EclipseLinkOrmPackage.XML_PROPERTY: return (EObject)createXmlProperty();
-			case EclipseLinkOrmPackage.XML_ID_IMPL: return (EObject)createXmlIdImpl();
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID_IMPL: return (EObject)createXmlEmbeddedIdImpl();
-			case EclipseLinkOrmPackage.XML_EMBEDDED_IMPL: return (EObject)createXmlEmbeddedImpl();
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL: return (EObject)createXmlBasicImpl();
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL: return (EObject)createXmlVersionImpl();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL: return (EObject)createXmlOneToOneImpl();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL: return (EObject)createXmlOneToManyImpl();
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL: return (EObject)createXmlManyToOneImpl();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL: return (EObject)createXmlManyToManyImpl();
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION_IMPL: return (EObject)createXmlBasicCollectionImpl();
-			case EclipseLinkOrmPackage.XML_BASIC_MAP_IMPL: return (EObject)createXmlBasicMapImpl();
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION_IMPL: return (EObject)createXmlTransformationImpl();
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL: return (EObject)createXmlVariableOneToOneImpl();
-			case EclipseLinkOrmPackage.ATTRIBUTES: return (EObject)createAttributes();
-			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.XML_DIRECTION:
-				return createXmlDirectionFromString(eDataType, initialValue);
-			case EclipseLinkOrmPackage.XML_CHANGE_TRACKING_TYPE:
-				return createXmlChangeTrackingTypeFromString(eDataType, initialValue);
-			case EclipseLinkOrmPackage.CACHE_TYPE:
-				return createCacheTypeFromString(eDataType, initialValue);
-			case EclipseLinkOrmPackage.CACHE_COORDINATION_TYPE:
-				return createCacheCoordinationTypeFromString(eDataType, initialValue);
-			case EclipseLinkOrmPackage.EXISTENCE_TYPE:
-				return createExistenceTypeFromString(eDataType, initialValue);
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING_TYPE:
-				return createXmlOptimisticLockingTypeFromString(eDataType, initialValue);
-			case EclipseLinkOrmPackage.XML_JOIN_FETCH_TYPE:
-				return createXmlJoinFetchTypeFromString(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.XML_DIRECTION:
-				return convertXmlDirectionToString(eDataType, instanceValue);
-			case EclipseLinkOrmPackage.XML_CHANGE_TRACKING_TYPE:
-				return convertXmlChangeTrackingTypeToString(eDataType, instanceValue);
-			case EclipseLinkOrmPackage.CACHE_TYPE:
-				return convertCacheTypeToString(eDataType, instanceValue);
-			case EclipseLinkOrmPackage.CACHE_COORDINATION_TYPE:
-				return convertCacheCoordinationTypeToString(eDataType, instanceValue);
-			case EclipseLinkOrmPackage.EXISTENCE_TYPE:
-				return convertExistenceTypeToString(eDataType, instanceValue);
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING_TYPE:
-				return convertXmlOptimisticLockingTypeToString(eDataType, instanceValue);
-			case EclipseLinkOrmPackage.XML_JOIN_FETCH_TYPE:
-				return convertXmlJoinFetchTypeToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlEntityMappings createXmlEntityMappings()
-	{
-		XmlEntityMappings xmlEntityMappings = new XmlEntityMappings();
-		return xmlEntityMappings;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlPersistenceUnitMetadata createXmlPersistenceUnitMetadata()
-	{
-		XmlPersistenceUnitMetadata xmlPersistenceUnitMetadata = new XmlPersistenceUnitMetadata();
-		return xmlPersistenceUnitMetadata;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlCustomizer createXmlCustomizer()
-	{
-		XmlCustomizer xmlCustomizer = new XmlCustomizer();
-		return xmlCustomizer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlChangeTracking createXmlChangeTracking()
-	{
-		XmlChangeTracking xmlChangeTracking = new XmlChangeTracking();
-		return xmlChangeTracking;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlCopyPolicy createXmlCopyPolicy()
-	{
-		XmlCopyPolicy xmlCopyPolicy = new XmlCopyPolicy();
-		return xmlCopyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlInstantiationPolicy createXmlInstantiationPolicy()
-	{
-		XmlInstantiationPolicy xmlInstantiationPolicy = new XmlInstantiationPolicy();
-		return xmlInstantiationPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlCloneCopyPolicy createXmlCloneCopyPolicy()
-	{
-		XmlCloneCopyPolicy xmlCloneCopyPolicy = new XmlCloneCopyPolicy();
-		return xmlCloneCopyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlEmbeddable createXmlEmbeddable()
-	{
-		XmlEmbeddable xmlEmbeddable = new XmlEmbeddable();
-		return xmlEmbeddable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlEntity createXmlEntity()
-	{
-		XmlEntity xmlEntity = new XmlEntity();
-		return xmlEntity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlMappedSuperclass createXmlMappedSuperclass()
-	{
-		XmlMappedSuperclass xmlMappedSuperclass = new XmlMappedSuperclass();
-		return xmlMappedSuperclass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlAccessMethods createXmlAccessMethods()
-	{
-		XmlAccessMethods xmlAccessMethods = new XmlAccessMethods();
-		return xmlAccessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlConverterImpl createXmlConverterImpl()
-	{
-		XmlConverterImpl xmlConverterImpl = new XmlConverterImpl();
-		return xmlConverterImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlTypeConverterImpl createXmlTypeConverterImpl()
-	{
-		XmlTypeConverterImpl xmlTypeConverterImpl = new XmlTypeConverterImpl();
-		return xmlTypeConverterImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlConversionValueImpl createXmlConversionValueImpl()
-	{
-		XmlConversionValueImpl xmlConversionValueImpl = new XmlConversionValueImpl();
-		return xmlConversionValueImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlObjectTypeConverterImpl createXmlObjectTypeConverterImpl()
-	{
-		XmlObjectTypeConverterImpl xmlObjectTypeConverterImpl = new XmlObjectTypeConverterImpl();
-		return xmlObjectTypeConverterImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlStructConverterImpl createXmlStructConverterImpl()
-	{
-		XmlStructConverterImpl xmlStructConverterImpl = new XmlStructConverterImpl();
-		return xmlStructConverterImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlStoredProcedureParameter createXmlStoredProcedureParameter()
-	{
-		XmlStoredProcedureParameter xmlStoredProcedureParameter = new XmlStoredProcedureParameter();
-		return xmlStoredProcedureParameter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlNamedStoredProcedureQuery createXmlNamedStoredProcedureQuery()
-	{
-		XmlNamedStoredProcedureQuery xmlNamedStoredProcedureQuery = new XmlNamedStoredProcedureQuery();
-		return xmlNamedStoredProcedureQuery;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlIdImpl createXmlIdImpl()
-	{
-		XmlIdImpl xmlIdImpl = new XmlIdImpl();
-		return xmlIdImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlEmbeddedIdImpl createXmlEmbeddedIdImpl()
-	{
-		XmlEmbeddedIdImpl xmlEmbeddedIdImpl = new XmlEmbeddedIdImpl();
-		return xmlEmbeddedIdImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlEmbeddedImpl createXmlEmbeddedImpl()
-	{
-		XmlEmbeddedImpl xmlEmbeddedImpl = new XmlEmbeddedImpl();
-		return xmlEmbeddedImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlBasicImpl createXmlBasicImpl()
-	{
-		XmlBasicImpl xmlBasicImpl = new XmlBasicImpl();
-		return xmlBasicImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlVersionImpl createXmlVersionImpl()
-	{
-		XmlVersionImpl xmlVersionImpl = new XmlVersionImpl();
-		return xmlVersionImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlOneToOneImpl createXmlOneToOneImpl()
-	{
-		XmlOneToOneImpl xmlOneToOneImpl = new XmlOneToOneImpl();
-		return xmlOneToOneImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlOneToManyImpl createXmlOneToManyImpl()
-	{
-		XmlOneToManyImpl xmlOneToManyImpl = new XmlOneToManyImpl();
-		return xmlOneToManyImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlManyToOneImpl createXmlManyToOneImpl()
-	{
-		XmlManyToOneImpl xmlManyToOneImpl = new XmlManyToOneImpl();
-		return xmlManyToOneImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlManyToManyImpl createXmlManyToManyImpl()
-	{
-		XmlManyToManyImpl xmlManyToManyImpl = new XmlManyToManyImpl();
-		return xmlManyToManyImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Attributes createAttributes()
-	{
-		Attributes attributes = new Attributes();
-		return attributes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlBasicCollectionImpl createXmlBasicCollectionImpl()
-	{
-		XmlBasicCollectionImpl xmlBasicCollectionImpl = new XmlBasicCollectionImpl();
-		return xmlBasicCollectionImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlBasicMapImpl createXmlBasicMapImpl()
-	{
-		XmlBasicMapImpl xmlBasicMapImpl = new XmlBasicMapImpl();
-		return xmlBasicMapImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlTransformationImpl createXmlTransformationImpl()
-	{
-		XmlTransformationImpl xmlTransformationImpl = new XmlTransformationImpl();
-		return xmlTransformationImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlProperty createXmlProperty()
-	{
-		XmlProperty xmlProperty = new XmlProperty();
-		return xmlProperty;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlVariableOneToOneImpl createXmlVariableOneToOneImpl()
-	{
-		XmlVariableOneToOneImpl xmlVariableOneToOneImpl = new XmlVariableOneToOneImpl();
-		return xmlVariableOneToOneImpl;
-	}
-
-	/**
-	 * <!-- 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 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 XmlTimeOfDay createXmlTimeOfDay()
-	{
-		XmlTimeOfDay xmlTimeOfDay = new XmlTimeOfDay();
-		return xmlTimeOfDay;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlCache createXmlCache()
-	{
-		XmlCache xmlCache = new XmlCache();
-		return xmlCache;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlOptimisticLocking createXmlOptimisticLocking()
-	{
-		XmlOptimisticLocking xmlOptimisticLocking = new XmlOptimisticLocking();
-		return xmlOptimisticLocking;
-	}
-
-	/**
-	 * <!-- 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 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 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 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 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;
-	}
-
-} //EclipseLinkOrmFactory
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
deleted file mode 100644
index 5f29e33d57..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
+++ /dev/null
@@ -1,10831 +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.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.core.resource.orm.OrmPackage;
-
-/**
- * <!-- 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.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.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.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlNamedConverter <em>Xml Named Converter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlNamedConverter
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedConverter()
-	 * @generated
-	 */
-	public static final int XML_NAMED_CONVERTER = 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_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.eclipselink.core.resource.orm.XmlCustomizer <em>Xml Customizer</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlCustomizer
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizer()
-	 * @generated
-	 */
-	public static final int XML_CUSTOMIZER = 16;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlCustomizerHolder <em>Xml Customizer Holder</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlCustomizerHolder
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizerHolder()
-	 * @generated
-	 */
-	public static final int XML_CUSTOMIZER_HOLDER = 17;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertersHolder <em>Xml Converters Holder</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertersHolder
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder()
-	 * @generated
-	 */
-	public static final int XML_CONVERTERS_HOLDER = 11;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings()
-	 * @generated
-	 */
-	public static final int XML_ENTITY_MAPPINGS = 14;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlChangeTracking <em>Xml Change Tracking</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlChangeTracking
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTracking()
-	 * @generated
-	 */
-	public static final int XML_CHANGE_TRACKING = 18;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlChangeTrackingHolder <em>Xml Change Tracking Holder</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlChangeTrackingHolder
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingHolder()
-	 * @generated
-	 */
-	public static final int XML_CHANGE_TRACKING_HOLDER = 19;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddable
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDABLE = 23;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlReadOnly <em>Xml Read Only</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlReadOnly
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReadOnly()
-	 * @generated
-	 */
-	public static final int XML_READ_ONLY = 24;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTimeOfDay <em>Xml Time Of Day</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTimeOfDay
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTimeOfDay()
-	 * @generated
-	 */
-	public static final int XML_TIME_OF_DAY = 25;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlCache <em>Xml Cache</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlCache
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCache()
-	 * @generated
-	 */
-	public static final int XML_CACHE = 26;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlCacheHolder <em>Xml Cache Holder</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlCacheHolder
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheHolder()
-	 * @generated
-	 */
-	public static final int XML_CACHE_HOLDER = 27;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity <em>Xml Entity</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity()
-	 * @generated
-	 */
-	public static final int XML_ENTITY = 29;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlMappedSuperclass
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public static final int XML_MAPPED_SUPERCLASS = 30;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMutable <em>Xml Mutable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlMutable
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMutable()
-	 * @generated
-	 */
-	public static final int XML_MUTABLE = 31;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertibleMapping <em>Xml Convertible Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertibleMapping
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertibleMapping()
-	 * @generated
-	 */
-	public static final int XML_CONVERTIBLE_MAPPING = 33;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlId <em>Xml Id</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlId
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId()
-	 * @generated
-	 */
-	public static final int XML_ID = 37;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlIdImpl <em>Xml Id Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlIdImpl
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlIdImpl()
-	 * @generated
-	 */
-	public static final int XML_ID_IMPL = 38;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic <em>Xml Basic</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic()
-	 * @generated
-	 */
-	public static final int XML_BASIC = 43;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicImpl <em>Xml Basic Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicImpl
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicImpl()
-	 * @generated
-	 */
-	public static final int XML_BASIC_IMPL = 44;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion <em>Xml Version</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersion()
-	 * @generated
-	 */
-	public static final int XML_VERSION = 45;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersionImpl <em>Xml Version Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersionImpl
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersionImpl()
-	 * @generated
-	 */
-	public static final int XML_VERSION_IMPL = 46;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlPrivateOwned <em>Xml Private Owned</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlPrivateOwned
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrivateOwned()
-	 * @generated
-	 */
-	public static final int XML_PRIVATE_OWNED = 47;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetch <em>Xml Join Fetch</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetch
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch()
-	 * @generated
-	 */
-	public static final int XML_JOIN_FETCH = 48;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOne()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_ONE = 49;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOneImpl <em>Xml One To One Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOneImpl
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOneImpl()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_ONE_IMPL = 50;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany
-	 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlOneToManyImpl <em>Xml One To Many Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToManyImpl
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToManyImpl()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_MANY_IMPL = 52;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToOne()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_ONE = 53;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOneImpl <em>Xml Many To One Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOneImpl
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToOneImpl()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_ONE_IMPL = 54;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToMany()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_MANY = 55;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToManyImpl <em>Xml Many To Many Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToManyImpl
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToManyImpl()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_MANY_IMPL = 56;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverter <em>Xml Converter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverter
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverter()
-	 * @generated
-	 */
-	public static final int XML_CONVERTER = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter <em>Xml Type Converter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter()
-	 * @generated
-	 */
-	public static final int XML_TYPE_CONVERTER = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue <em>Xml Conversion Value</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue()
-	 * @generated
-	 */
-	public static final int XML_CONVERSION_VALUE = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter <em>Xml Object Type Converter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter()
-	 * @generated
-	 */
-	public static final int XML_OBJECT_TYPE_CONVERTER = 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter <em>Xml Struct Converter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverter()
-	 * @generated
-	 */
-	public static final int XML_STRUCT_CONVERTER = 9;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterHolder <em>Xml Converter Holder</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterHolder
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder()
-	 * @generated
-	 */
-	public static final int XML_CONVERTER_HOLDER = 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_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.eclipselink.core.resource.orm.XmlConverterImpl <em>Xml Converter Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterImpl
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterImpl()
-	 * @generated
-	 */
-	public static final int XML_CONVERTER_IMPL = 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_CONVERTER_IMPL__NAME = XML_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_IMPL__CLASS_NAME = XML_CONVERTER__CLASS_NAME;
-
-	/**
-	 * The number of structural features of the '<em>Xml Converter Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTER_IMPL_FEATURE_COUNT = XML_CONVERTER_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_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.eclipselink.core.resource.orm.XmlTypeConverterImpl <em>Xml Type Converter Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverterImpl
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverterImpl()
-	 * @generated
-	 */
-	public static final int XML_TYPE_CONVERTER_IMPL = 4;
-
-	/**
-	 * 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_IMPL__NAME = XML_TYPE_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_IMPL__DATA_TYPE = XML_TYPE_CONVERTER__DATA_TYPE;
-
-	/**
-	 * 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_IMPL__OBJECT_TYPE = XML_TYPE_CONVERTER__OBJECT_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Xml Type Converter Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TYPE_CONVERTER_IMPL_FEATURE_COUNT = XML_TYPE_CONVERTER_FEATURE_COUNT + 0;
-
-	/**
-	 * 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.eclipselink.core.resource.orm.XmlConversionValueImpl <em>Xml Conversion Value Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValueImpl
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValueImpl()
-	 * @generated
-	 */
-	public static final int XML_CONVERSION_VALUE_IMPL = 6;
-
-	/**
-	 * 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_IMPL__DATA_VALUE = XML_CONVERSION_VALUE__DATA_VALUE;
-
-	/**
-	 * 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_IMPL__OBJECT_VALUE = XML_CONVERSION_VALUE__OBJECT_VALUE;
-
-	/**
-	 * The number of structural features of the '<em>Xml Conversion Value Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERSION_VALUE_IMPL_FEATURE_COUNT = XML_CONVERSION_VALUE_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_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 meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl <em>Xml Object Type Converter Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverterImpl()
-	 * @generated
-	 */
-	public static final int XML_OBJECT_TYPE_CONVERTER_IMPL = 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_OBJECT_TYPE_CONVERTER_IMPL__NAME = XML_OBJECT_TYPE_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_IMPL__DATA_TYPE = XML_OBJECT_TYPE_CONVERTER__DATA_TYPE;
-
-	/**
-	 * 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_IMPL__OBJECT_TYPE = XML_OBJECT_TYPE_CONVERTER__OBJECT_TYPE;
-
-	/**
-	 * 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_IMPL__CONVERSION_VALUES = XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES;
-
-	/**
-	 * 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_IMPL__DEFAULT_OBJECT_VALUE = XML_OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE;
-
-	/**
-	 * The number of structural features of the '<em>Xml Object Type Converter Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_OBJECT_TYPE_CONVERTER_IMPL_FEATURE_COUNT = XML_OBJECT_TYPE_CONVERTER_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.eclipselink.core.resource.orm.XmlStructConverterImpl <em>Xml Struct Converter Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverterImpl
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverterImpl()
-	 * @generated
-	 */
-	public static final int XML_STRUCT_CONVERTER_IMPL = 10;
-
-	/**
-	 * 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_IMPL__NAME = XML_STRUCT_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_IMPL__CONVERTER = XML_STRUCT_CONVERTER__CONVERTER;
-
-	/**
-	 * The number of structural features of the '<em>Xml Struct Converter Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STRUCT_CONVERTER_IMPL_FEATURE_COUNT = XML_STRUCT_CONVERTER_FEATURE_COUNT + 0;
-
-	/**
-	 * 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.eclipselink.core.resource.orm.XmlStoredProcedureParameter <em>Xml Stored Procedure Parameter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlStoredProcedureParameter
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter()
-	 * @generated
-	 */
-	public static final int XML_STORED_PROCEDURE_PARAMETER = 12;
-
-	/**
-	 * 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.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery <em>Xml Named Stored Procedure Query</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredProcedureQuery()
-	 * @generated
-	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY = 13;
-
-	/**
-	 * 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>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>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>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>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>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>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>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 + 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_ENTITY_MAPPINGS__TYPE_CONVERTERS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 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_ENTITY_MAPPINGS__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 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_ENTITY_MAPPINGS__STRUCT_CONVERTERS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 3;
-
-	/**
-	 * 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 + 4;
-
-	/**
-	 * 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 + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitMetadata()
-	 * @generated
-	 */
-	public static final int XML_PERSISTENCE_UNIT_METADATA = 15;
-
-	/**
-	 * 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 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 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 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 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.eclipselink.core.resource.orm.XmlCopyPolicy <em>Xml Copy Policy</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlCopyPolicy
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCopyPolicy()
-	 * @generated
-	 */
-	public static final int XML_COPY_POLICY = 20;
-
-	/**
-	 * 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.eclipselink.core.resource.orm.XmlInstantiationPolicy <em>Xml Instantiation Policy</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlInstantiationPolicy
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlInstantiationPolicy()
-	 * @generated
-	 */
-	public static final int XML_INSTANTIATION_POLICY = 21;
-
-	/**
-	 * The number of structural features of the '<em>Xml Instantiation Policy</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_INSTANTIATION_POLICY_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlCloneCopyPolicy <em>Xml Clone Copy Policy</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlCloneCopyPolicy
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCloneCopyPolicy()
-	 * @generated
-	 */
-	public static final int XML_CLONE_COPY_POLICY = 22;
-
-	/**
-	 * 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 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>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>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>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 + 0;
-
-	/**
-	 * 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 + 1;
-
-	/**
-	 * 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 + 2;
-
-	/**
-	 * 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 + 3;
-
-	/**
-	 * 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 + 4;
-
-	/**
-	 * 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 + 5;
-
-	/**
-	 * 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 + 6;
-
-	/**
-	 * 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 + 7;
-
-	/**
-	 * 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 + 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_EMBEDDABLE__PROPERTIES = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 9;
-
-	/**
-	 * 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 + 10;
-
-	/**
-	 * 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 + 11;
-
-	/**
-	 * 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 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>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 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.eclipselink.core.resource.orm.XmlOptimisticLocking <em>Xml Optimistic Locking</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlOptimisticLocking
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLocking()
-	 * @generated
-	 */
-	public static final int XML_OPTIMISTIC_LOCKING = 28;
-
-	/**
-	 * 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>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>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>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>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>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>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>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>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>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>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>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 + 0;
-
-	/**
-	 * 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 + 1;
-
-	/**
-	 * 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 + 2;
-
-	/**
-	 * 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 + 3;
-
-	/**
-	 * 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 + 4;
-
-	/**
-	 * 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 + 5;
-
-	/**
-	 * 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 + 6;
-
-	/**
-	 * 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 + 7;
-
-	/**
-	 * 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 + 8;
-
-	/**
-	 * 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 + 9;
-
-	/**
-	 * 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 + 10;
-
-	/**
-	 * 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 + 11;
-
-	/**
-	 * 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 + 12;
-
-	/**
-	 * 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 + 13;
-
-	/**
-	 * 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 + 14;
-
-	/**
-	 * 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 + 15;
-
-	/**
-	 * 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 + 16;
-
-	/**
-	 * 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>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>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>Pre Persist</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__PRE_PERSIST = OrmPackage.XML_MAPPED_SUPERCLASS__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_MAPPED_SUPERCLASS__POST_PERSIST = OrmPackage.XML_MAPPED_SUPERCLASS__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_MAPPED_SUPERCLASS__PRE_REMOVE = OrmPackage.XML_MAPPED_SUPERCLASS__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_MAPPED_SUPERCLASS__POST_REMOVE = OrmPackage.XML_MAPPED_SUPERCLASS__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_MAPPED_SUPERCLASS__PRE_UPDATE = OrmPackage.XML_MAPPED_SUPERCLASS__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_MAPPED_SUPERCLASS__POST_UPDATE = OrmPackage.XML_MAPPED_SUPERCLASS__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_MAPPED_SUPERCLASS__POST_LOAD = OrmPackage.XML_MAPPED_SUPERCLASS__POST_LOAD;
-
-	/**
-	 * 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 + 0;
-
-	/**
-	 * 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 + 1;
-
-	/**
-	 * 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 + 2;
-
-	/**
-	 * 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 + 3;
-
-	/**
-	 * 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 + 4;
-
-	/**
-	 * 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 + 5;
-
-	/**
-	 * 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 + 6;
-
-	/**
-	 * 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 + 7;
-
-	/**
-	 * 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 + 8;
-
-	/**
-	 * 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 + 9;
-
-	/**
-	 * 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 + 10;
-
-	/**
-	 * 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 + 11;
-
-	/**
-	 * 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 + 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_MAPPED_SUPERCLASS__PROPERTIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 13;
-
-	/**
-	 * 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 + 14;
-
-	/**
-	 * 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 + 15;
-
-	/**
-	 * 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 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 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.eclipselink.core.resource.orm.XmlAccessMethods <em>Xml Access Methods</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethods()
-	 * @generated
-	 */
-	public static final int XML_ACCESS_METHODS = 34;
-
-	/**
-	 * 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.eclipselink.core.resource.orm.XmlAccessMethodsHolder <em>Xml Access Methods Holder</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethodsHolder
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder()
-	 * @generated
-	 */
-	public static final int XML_ACCESS_METHODS_HOLDER = 35;
-
-	/**
-	 * 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.eclipselink.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedId
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddedId()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDED_ID = 39;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedIdImpl <em>Xml Embedded Id Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedIdImpl
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddedIdImpl()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDED_ID_IMPL = 40;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbedded()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDED = 41;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedImpl <em>Xml Embedded Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedImpl
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddedImpl()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDED_IMPL = 42;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.Attributes <em>Attributes</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.Attributes
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getAttributes()
-	 * @generated
-	 */
-	public static final int ATTRIBUTES = 65;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection <em>Xml Basic Collection</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicCollection()
-	 * @generated
-	 */
-	public static final int XML_BASIC_COLLECTION = 57;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollectionImpl <em>Xml Basic Collection Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollectionImpl
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicCollectionImpl()
-	 * @generated
-	 */
-	public static final int XML_BASIC_COLLECTION_IMPL = 58;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap <em>Xml Basic Map</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicMap()
-	 * @generated
-	 */
-	public static final int XML_BASIC_MAP = 59;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMapImpl <em>Xml Basic Map Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMapImpl
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicMapImpl()
-	 * @generated
-	 */
-	public static final int XML_BASIC_MAP_IMPL = 60;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation <em>Xml Transformation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransformation()
-	 * @generated
-	 */
-	public static final int XML_TRANSFORMATION = 61;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformationImpl <em>Xml Transformation Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformationImpl
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransformationImpl()
-	 * @generated
-	 */
-	public static final int XML_TRANSFORMATION_IMPL = 62;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty <em>Xml Property</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlProperty()
-	 * @generated
-	 */
-	public static final int XML_PROPERTY = 36;
-
-	/**
-	 * 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>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>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>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>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>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__MUTABLE = OrmPackage.XML_ID_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 + 1;
-
-	/**
-	 * 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 + 2;
-
-	/**
-	 * 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 + 3;
-
-	/**
-	 * 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 + 4;
-
-	/**
-	 * 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 + 5;
-
-	/**
-	 * 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 + 6;
-
-	/**
-	 * 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 + 7;
-
-	/**
-	 * 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 + 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_ID_IMPL__NAME = OrmPackage.XML_ID_IMPL__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_IMPL__COLUMN = OrmPackage.XML_ID_IMPL__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_IMPL__LOB = OrmPackage.XML_ID_IMPL__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_IMPL__TEMPORAL = OrmPackage.XML_ID_IMPL__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_IMPL__ENUMERATED = OrmPackage.XML_ID_IMPL__ENUMERATED;
-
-	/**
-	 * 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_IMPL__GENERATED_VALUE = OrmPackage.XML_ID_IMPL__GENERATED_VALUE;
-
-	/**
-	 * 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_IMPL__TABLE_GENERATOR = OrmPackage.XML_ID_IMPL__TABLE_GENERATOR;
-
-	/**
-	 * 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_IMPL__SEQUENCE_GENERATOR = OrmPackage.XML_ID_IMPL__SEQUENCE_GENERATOR;
-
-	/**
-	 * 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_IMPL__MUTABLE = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 0;
-
-	/**
-	 * 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_IMPL__CONVERTER = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * 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_IMPL__TYPE_CONVERTER = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 2;
-
-	/**
-	 * 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_IMPL__OBJECT_TYPE_CONVERTER = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 3;
-
-	/**
-	 * 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_IMPL__STRUCT_CONVERTER = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 4;
-
-	/**
-	 * 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_IMPL__CONVERT = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 5;
-
-	/**
-	 * 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_IMPL__ACCESS_METHODS = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 6;
-
-	/**
-	 * 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_IMPL__PROPERTIES = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the '<em>Xml Id Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID_IMPL_FEATURE_COUNT = OrmPackage.XML_ID_IMPL_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_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>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 + 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_EMBEDDED_ID__PROPERTIES = OrmPackage.XML_EMBEDDED_ID_FEATURE_COUNT + 1;
-
-	/**
-	 * 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 + 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_EMBEDDED_ID_IMPL__NAME = OrmPackage.XML_EMBEDDED_ID_IMPL__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_IMPL__ATTRIBUTE_OVERRIDES = OrmPackage.XML_EMBEDDED_ID_IMPL__ATTRIBUTE_OVERRIDES;
-
-	/**
-	 * 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_IMPL__ACCESS_METHODS = OrmPackage.XML_EMBEDDED_ID_IMPL_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_EMBEDDED_ID_IMPL__PROPERTIES = OrmPackage.XML_EMBEDDED_ID_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Embedded Id Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED_ID_IMPL_FEATURE_COUNT = OrmPackage.XML_EMBEDDED_ID_IMPL_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_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>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 + 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_EMBEDDED__PROPERTIES = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 1;
-
-	/**
-	 * 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 + 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_EMBEDDED_IMPL__NAME = OrmPackage.XML_EMBEDDED_IMPL__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_IMPL__ATTRIBUTE_OVERRIDES = OrmPackage.XML_EMBEDDED_IMPL__ATTRIBUTE_OVERRIDES;
-
-	/**
-	 * 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_IMPL__ACCESS_METHODS = OrmPackage.XML_EMBEDDED_IMPL_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_EMBEDDED_IMPL__PROPERTIES = OrmPackage.XML_EMBEDDED_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Embedded Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED_IMPL_FEATURE_COUNT = OrmPackage.XML_EMBEDDED_IMPL_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_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>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__MUTABLE = OrmPackage.XML_BASIC_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 + 1;
-
-	/**
-	 * 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 + 2;
-
-	/**
-	 * 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 + 3;
-
-	/**
-	 * 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 + 4;
-
-	/**
-	 * 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 + 5;
-
-	/**
-	 * 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 + 6;
-
-	/**
-	 * 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 + 7;
-
-	/**
-	 * 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 + 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_BASIC_IMPL__NAME = OrmPackage.XML_BASIC_IMPL__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_IMPL__COLUMN = OrmPackage.XML_BASIC_IMPL__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_IMPL__LOB = OrmPackage.XML_BASIC_IMPL__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_IMPL__TEMPORAL = OrmPackage.XML_BASIC_IMPL__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_IMPL__ENUMERATED = OrmPackage.XML_BASIC_IMPL__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_IMPL__FETCH = OrmPackage.XML_BASIC_IMPL__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_IMPL__OPTIONAL = OrmPackage.XML_BASIC_IMPL__OPTIONAL;
-
-	/**
-	 * 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_IMPL__MUTABLE = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 0;
-
-	/**
-	 * 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_IMPL__CONVERTER = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * 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_IMPL__TYPE_CONVERTER = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 2;
-
-	/**
-	 * 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_IMPL__OBJECT_TYPE_CONVERTER = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 3;
-
-	/**
-	 * 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_IMPL__STRUCT_CONVERTER = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 4;
-
-	/**
-	 * 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_IMPL__CONVERT = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 5;
-
-	/**
-	 * 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_IMPL__ACCESS_METHODS = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 6;
-
-	/**
-	 * 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_IMPL__PROPERTIES = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the '<em>Xml Basic Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_IMPL_FEATURE_COUNT = OrmPackage.XML_BASIC_IMPL_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_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>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__MUTABLE = OrmPackage.XML_VERSION_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 + 1;
-
-	/**
-	 * 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 + 2;
-
-	/**
-	 * 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 + 3;
-
-	/**
-	 * 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 + 4;
-
-	/**
-	 * 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 + 5;
-
-	/**
-	 * 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 + 6;
-
-	/**
-	 * 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 + 7;
-
-	/**
-	 * 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 + 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_VERSION_IMPL__NAME = OrmPackage.XML_VERSION_IMPL__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_IMPL__COLUMN = OrmPackage.XML_VERSION_IMPL__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_IMPL__LOB = OrmPackage.XML_VERSION_IMPL__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_IMPL__TEMPORAL = OrmPackage.XML_VERSION_IMPL__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_IMPL__ENUMERATED = OrmPackage.XML_VERSION_IMPL__ENUMERATED;
-
-	/**
-	 * 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_IMPL__MUTABLE = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 0;
-
-	/**
-	 * 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_IMPL__CONVERTER = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * 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_IMPL__TYPE_CONVERTER = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 2;
-
-	/**
-	 * 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_IMPL__OBJECT_TYPE_CONVERTER = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 3;
-
-	/**
-	 * 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_IMPL__STRUCT_CONVERTER = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 4;
-
-	/**
-	 * 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_IMPL__CONVERT = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 5;
-
-	/**
-	 * 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_IMPL__ACCESS_METHODS = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 6;
-
-	/**
-	 * 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_IMPL__PROPERTIES = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the '<em>Xml Version Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION_IMPL_FEATURE_COUNT = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 8;
-
-	/**
-	 * 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>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_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>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>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 + 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_ONE_TO_ONE__JOIN_FETCH = OrmPackage.XML_ONE_TO_ONE_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_ONE_TO_ONE__ACCESS_METHODS = OrmPackage.XML_ONE_TO_ONE_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_ONE_TO_ONE__PROPERTIES = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 3;
-
-	/**
-	 * 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 + 4;
-
-	/**
-	 * 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_IMPL__NAME = OrmPackage.XML_ONE_TO_ONE_IMPL__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_IMPL__TARGET_ENTITY = OrmPackage.XML_ONE_TO_ONE_IMPL__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_IMPL__FETCH = OrmPackage.XML_ONE_TO_ONE_IMPL__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_IMPL__CASCADE = OrmPackage.XML_ONE_TO_ONE_IMPL__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_IMPL__JOIN_TABLE = OrmPackage.XML_ONE_TO_ONE_IMPL__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_IMPL__JOIN_COLUMNS = OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_COLUMNS;
-
-	/**
-	 * 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_IMPL__OPTIONAL = OrmPackage.XML_ONE_TO_ONE_IMPL__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_IMPL__MAPPED_BY = OrmPackage.XML_ONE_TO_ONE_IMPL__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_IMPL__PRIMARY_KEY_JOIN_COLUMNS = OrmPackage.XML_ONE_TO_ONE_IMPL__PRIMARY_KEY_JOIN_COLUMNS;
-
-	/**
-	 * 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_IMPL__PRIVATE_OWNED = OrmPackage.XML_ONE_TO_ONE_IMPL_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_ONE_TO_ONE_IMPL__JOIN_FETCH = OrmPackage.XML_ONE_TO_ONE_IMPL_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_ONE_TO_ONE_IMPL__ACCESS_METHODS = OrmPackage.XML_ONE_TO_ONE_IMPL_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_ONE_TO_ONE_IMPL__PROPERTIES = OrmPackage.XML_ONE_TO_ONE_IMPL_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Xml One To One Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE_IMPL_FEATURE_COUNT = OrmPackage.XML_ONE_TO_ONE_IMPL_FEATURE_COUNT + 4;
-
-	/**
-	 * 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 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</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>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 + 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_ONE_TO_MANY__JOIN_FETCH = OrmPackage.XML_ONE_TO_MANY_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_ONE_TO_MANY__ACCESS_METHODS = OrmPackage.XML_ONE_TO_MANY_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_ONE_TO_MANY__PROPERTIES = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 3;
-
-	/**
-	 * 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 + 4;
-
-	/**
-	 * 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_IMPL__NAME = OrmPackage.XML_ONE_TO_MANY_IMPL__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_IMPL__TARGET_ENTITY = OrmPackage.XML_ONE_TO_MANY_IMPL__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_IMPL__FETCH = OrmPackage.XML_ONE_TO_MANY_IMPL__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_IMPL__CASCADE = OrmPackage.XML_ONE_TO_MANY_IMPL__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_IMPL__MAPPED_BY = OrmPackage.XML_ONE_TO_MANY_IMPL__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_IMPL__JOIN_TABLE = OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_TABLE;
-
-	/**
-	 * 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_IMPL__ORDER_BY = OrmPackage.XML_ONE_TO_MANY_IMPL__ORDER_BY;
-
-	/**
-	 * 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_IMPL__MAP_KEY = OrmPackage.XML_ONE_TO_MANY_IMPL__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_IMPL__JOIN_COLUMNS = OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_COLUMNS;
-
-	
-	/**
-	 * 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_IMPL__PRIVATE_OWNED = OrmPackage.XML_ONE_TO_MANY_IMPL_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_ONE_TO_MANY_IMPL__JOIN_FETCH = OrmPackage.XML_ONE_TO_MANY_IMPL_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_ONE_TO_MANY_IMPL__ACCESS_METHODS = OrmPackage.XML_ONE_TO_MANY_IMPL_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_ONE_TO_MANY_IMPL__PROPERTIES = OrmPackage.XML_ONE_TO_MANY_IMPL_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Xml One To Many Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_IMPL_FEATURE_COUNT = OrmPackage.XML_ONE_TO_MANY_IMPL_FEATURE_COUNT + 4;
-
-	/**
-	 * 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>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>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 + 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_MANY_TO_ONE__ACCESS_METHODS = OrmPackage.XML_MANY_TO_ONE_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_MANY_TO_ONE__PROPERTIES = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 2;
-
-	/**
-	 * 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 + 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE_IMPL__NAME = OrmPackage.XML_MANY_TO_ONE_IMPL__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_IMPL__TARGET_ENTITY = OrmPackage.XML_MANY_TO_ONE_IMPL__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_IMPL__FETCH = OrmPackage.XML_MANY_TO_ONE_IMPL__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_IMPL__CASCADE = OrmPackage.XML_MANY_TO_ONE_IMPL__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_IMPL__JOIN_TABLE = OrmPackage.XML_MANY_TO_ONE_IMPL__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_IMPL__JOIN_COLUMNS = OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_COLUMNS;
-
-	/**
-	 * 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_IMPL__OPTIONAL = OrmPackage.XML_MANY_TO_ONE_IMPL__OPTIONAL;
-
-	/**
-	 * 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_IMPL__JOIN_FETCH = OrmPackage.XML_MANY_TO_ONE_IMPL_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_MANY_TO_ONE_IMPL__ACCESS_METHODS = OrmPackage.XML_MANY_TO_ONE_IMPL_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_MANY_TO_ONE_IMPL__PROPERTIES = OrmPackage.XML_MANY_TO_ONE_IMPL_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Xml Many To One Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE_IMPL_FEATURE_COUNT = OrmPackage.XML_MANY_TO_ONE_IMPL_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_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 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</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>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 + 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_MANY_TO_MANY__ACCESS_METHODS = OrmPackage.XML_MANY_TO_MANY_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_MANY_TO_MANY__PROPERTIES = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 2;
-
-	/**
-	 * 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 + 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_IMPL__NAME = OrmPackage.XML_MANY_TO_MANY_IMPL__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_IMPL__TARGET_ENTITY = OrmPackage.XML_MANY_TO_MANY_IMPL__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_IMPL__FETCH = OrmPackage.XML_MANY_TO_MANY_IMPL__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_IMPL__CASCADE = OrmPackage.XML_MANY_TO_MANY_IMPL__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_IMPL__MAPPED_BY = OrmPackage.XML_MANY_TO_MANY_IMPL__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_IMPL__JOIN_TABLE = OrmPackage.XML_MANY_TO_MANY_IMPL__JOIN_TABLE;
-
-	/**
-	 * 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_IMPL__ORDER_BY = OrmPackage.XML_MANY_TO_MANY_IMPL__ORDER_BY;
-
-	/**
-	 * 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_IMPL__MAP_KEY = OrmPackage.XML_MANY_TO_MANY_IMPL__MAP_KEY;
-
-	/**
-	 * 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_IMPL__JOIN_FETCH = OrmPackage.XML_MANY_TO_MANY_IMPL_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_MANY_TO_MANY_IMPL__ACCESS_METHODS = OrmPackage.XML_MANY_TO_MANY_IMPL_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_MANY_TO_MANY_IMPL__PROPERTIES = OrmPackage.XML_MANY_TO_MANY_IMPL_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Xml Many To Many Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_IMPL_FEATURE_COUNT = OrmPackage.XML_MANY_TO_MANY_IMPL_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_COLLECTION__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_BASIC_COLLECTION__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_BASIC_COLLECTION__PROPERTIES = OrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * 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.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_BASIC_COLLECTION_IMPL__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_IMPL__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_IMPL__PROPERTIES = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Basic Collection Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_COLLECTION_IMPL_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_BASIC_MAP__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_BASIC_MAP__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_BASIC_MAP__PROPERTIES = OrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * 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.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_BASIC_MAP_IMPL__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_IMPL__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_IMPL__PROPERTIES = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Basic Map Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_MAP_IMPL_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_TRANSFORMATION__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_TRANSFORMATION__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_TRANSFORMATION__PROPERTIES = OrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * 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.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_TRANSFORMATION_IMPL__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_TRANSFORMATION_IMPL__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_TRANSFORMATION_IMPL__PROPERTIES = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Transformation Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TRANSFORMATION_IMPL_FEATURE_COUNT = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOne <em>Xml Variable One To One</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOne
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVariableOneToOne()
-	 * @generated
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE = 63;
-
-	/**
-	 * 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.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.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.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * 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.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOneImpl <em>Xml Variable One To One Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOneImpl
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVariableOneToOneImpl()
-	 * @generated
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE_IMPL = 64;
-
-	/**
-	 * 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_IMPL__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_IMPL__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_IMPL__PROPERTIES = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Variable One To One Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE_IMPL_FEATURE_COUNT = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * 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>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 + 0;
-
-	/**
-	 * 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 + 1;
-
-	/**
-	 * 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 + 2;
-
-	/**
-	 * 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 + 3;
-
-	/**
-	 * 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 + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlDirection <em>Xml Direction</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlDirection
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlDirection()
-	 * @generated
-	 */
-	public static final int XML_DIRECTION = 66;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlChangeTrackingType <em>Xml Change Tracking Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlChangeTrackingType
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingType()
-	 * @generated
-	 */
-	public static final int XML_CHANGE_TRACKING_TYPE = 67;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.CacheType <em>Cache Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.CacheType
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getCacheType()
-	 * @generated
-	 */
-	public static final int CACHE_TYPE = 68;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.CacheCoordinationType <em>Cache Coordination Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.CacheCoordinationType
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getCacheCoordinationType()
-	 * @generated
-	 */
-	public static final int CACHE_COORDINATION_TYPE = 69;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType <em>Xml Join Fetch Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetchType()
-	 * @generated
-	 */
-	public static final int XML_JOIN_FETCH_TYPE = 72;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlNamedConverterEClass = null;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.ExistenceType <em>Existence Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.ExistenceType
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getExistenceType()
-	 * @generated
-	 */
-	public static final int EXISTENCE_TYPE = 70;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOptimisticLockingType <em>Xml Optimistic Locking Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlOptimisticLockingType
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLockingType()
-	 * @generated
-	 */
-	public static final int XML_OPTIMISTIC_LOCKING_TYPE = 71;
-
-	/**
-	 * <!-- 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 xmlChangeTrackingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlChangeTrackingHolderEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlCopyPolicyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlInstantiationPolicyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlCloneCopyPolicyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlConvertersHolderEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlStoredProcedureParameterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlNamedStoredProcedureQueryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEntityMappingsEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPersistenceUnitMetadataEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbeddableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlReadOnlyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTimeOfDayEClass = 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 xmlOptimisticLockingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEntityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlMappedSuperclassEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlMutableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlConvertibleMappingEClass = null;
-
-	/**
-	 * <!-- 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 xmlIdEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlIdImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbeddedIdEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbeddedIdImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbeddedEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbeddedImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasicEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasicImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlVersionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlVersionImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPrivateOwnedEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlJoinFetchEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOneToOneEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOneToOneImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOneToManyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOneToManyImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlManyToOneEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlManyToOneImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlManyToManyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlManyToManyImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass attributesEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasicCollectionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasicCollectionImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasicMapEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasicMapImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTransformationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTransformationImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPropertyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlVariableOneToOneEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlVariableOneToOneImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum xmlDirectionEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum xmlChangeTrackingTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlConverterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlConverterImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTypeConverterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTypeConverterImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlConversionValueEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlConversionValueImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlObjectTypeConverterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlObjectTypeConverterImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlStructConverterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlStructConverterImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlConverterHolderEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum cacheTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum cacheCoordinationTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum xmlJoinFetchTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum existenceTypeEEnum = 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.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.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- 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.getEPackage(eNS_URI) instanceof EclipseLinkOrmPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EclipseLinkOrmPackage());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		OrmPackage.eINSTANCE.eClass();
-		XMLTypePackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theEclipseLinkOrmPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theEclipseLinkOrmPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theEclipseLinkOrmPackage.freeze();
-
-		return theEclipseLinkOrmPackage;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlNamedConverter
-	 * @generated
-	 */
-	public EClass getXmlNamedConverter()
-	{
-		return xmlNamedConverterEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.eclipselink.core.resource.orm.XmlCustomizer
-	 * @generated
-	 */
-	public EClass getXmlCustomizer()
-	{
-		return xmlCustomizerEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.eclipselink.core.resource.orm.XmlCustomizerHolder
-	 * @generated
-	 */
-	public EClass getXmlCustomizerHolder()
-	{
-		return xmlCustomizerHolderEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.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.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.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.eclipselink.core.resource.orm.XmlChangeTracking
-	 * @generated
-	 */
-	public EClass getXmlChangeTracking()
-	{
-		return xmlChangeTrackingEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.eclipselink.core.resource.orm.XmlChangeTrackingHolder
-	 * @generated
-	 */
-	public EClass getXmlChangeTrackingHolder()
-	{
-		return xmlChangeTrackingHolderEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.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.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.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.eclipselink.core.resource.orm.XmlCopyPolicy
-	 * @generated
-	 */
-	public EClass getXmlCopyPolicy()
-	{
-		return xmlCopyPolicyEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.eclipselink.core.resource.orm.XmlInstantiationPolicy <em>Xml Instantiation Policy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Instantiation Policy</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlInstantiationPolicy
-	 * @generated
-	 */
-	public EClass getXmlInstantiationPolicy()
-	{
-		return xmlInstantiationPolicyEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlCloneCopyPolicy
-	 * @generated
-	 */
-	public EClass getXmlCloneCopyPolicy()
-	{
-		return xmlCloneCopyPolicyEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.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.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.eclipselink.core.resource.orm.XmlConvertersHolder
-	 * @generated
-	 */
-	public EClass getXmlConvertersHolder()
-	{
-		return xmlConvertersHolderEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.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.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.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.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.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.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.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.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.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.eclipselink.core.resource.orm.XmlStoredProcedureParameter
-	 * @generated
-	 */
-	public EClass getXmlStoredProcedureParameter()
-	{
-		return xmlStoredProcedureParameterEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.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.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.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.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.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.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.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.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.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.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.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery
-	 * @generated
-	 */
-	public EClass getXmlNamedStoredProcedureQuery()
-	{
-		return xmlNamedStoredProcedureQueryEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.eclipselink.core.resource.orm.XmlEntityMappings
-	 * @generated
-	 */
-	public EClass getXmlEntityMappings()
-	{
-		return xmlEntityMappingsEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings#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.eclipselink.core.resource.orm.XmlEntityMappings#getNamedStoredProcedureQueries()
-	 * @see #getXmlEntityMappings()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_NamedStoredProcedureQueries()
-	{
-		return (EReference)xmlEntityMappingsEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata
-	 * @generated
-	 */
-	public EClass getXmlPersistenceUnitMetadata()
-	{
-		return xmlPersistenceUnitMetadataEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.eclipselink.core.resource.orm.XmlEmbeddable
-	 * @generated
-	 */
-	public EClass getXmlEmbeddable()
-	{
-		return xmlEmbeddableEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.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.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.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.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.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.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 containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddable#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.eclipselink.core.resource.orm.XmlEmbeddable#getProperties()
-	 * @see #getXmlEmbeddable()
-	 * @generated
-	 */
-	public EReference getXmlEmbeddable_Properties()
-	{
-		return (EReference)xmlEmbeddableEClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlEmbeddable#getExcludeDefaultMappings()
-	 * @see #getXmlEmbeddable()
-	 * @generated
-	 */
-	public EAttribute getXmlEmbeddable_ExcludeDefaultMappings()
-	{
-		return (EAttribute)xmlEmbeddableEClass.getEStructuralFeatures().get(4);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlReadOnly
-	 * @generated
-	 */
-	public EClass getXmlReadOnly()
-	{
-		return xmlReadOnlyEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.eclipselink.core.resource.orm.XmlTimeOfDay
-	 * @generated
-	 */
-	public EClass getXmlTimeOfDay()
-	{
-		return xmlTimeOfDayEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.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.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.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.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.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.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.eclipselink.core.resource.orm.XmlCache
-	 * @generated
-	 */
-	public EClass getXmlCache()
-	{
-		return xmlCacheEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.eclipselink.core.resource.orm.XmlCacheHolder
-	 * @generated
-	 */
-	public EClass getXmlCacheHolder()
-	{
-		return xmlCacheHolderEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.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.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.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.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.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.eclipselink.core.resource.orm.XmlOptimisticLocking
-	 * @generated
-	 */
-	public EClass getXmlOptimisticLocking()
-	{
-		return xmlOptimisticLockingEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.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.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.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.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.eclipselink.core.resource.orm.XmlEntity
-	 * @generated
-	 */
-	public EClass getXmlEntity()
-	{
-		return xmlEntityEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.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.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.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.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.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.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.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.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 containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity#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.eclipselink.core.resource.orm.XmlEntity#getNamedStoredProcedureQueries()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_NamedStoredProcedureQueries()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(4);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity#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.eclipselink.core.resource.orm.XmlEntity#getProperties()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_Properties()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(5);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlEntity#getExcludeDefaultMappings()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EAttribute getXmlEntity_ExcludeDefaultMappings()
-	{
-		return (EAttribute)xmlEntityEClass.getEStructuralFeatures().get(6);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlMappedSuperclass
-	 * @generated
-	 */
-	public EClass getXmlMappedSuperclass()
-	{
-		return xmlMappedSuperclassEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.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.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.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.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.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.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.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.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 containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMappedSuperclass#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.eclipselink.core.resource.orm.XmlMappedSuperclass#getProperties()
-	 * @see #getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_Properties()
-	{
-		return (EReference)xmlMappedSuperclassEClass.getEStructuralFeatures().get(4);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlMappedSuperclass#getExcludeDefaultMappings()
-	 * @see #getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public EAttribute getXmlMappedSuperclass_ExcludeDefaultMappings()
-	{
-		return (EAttribute)xmlMappedSuperclassEClass.getEStructuralFeatures().get(5);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlMutable
-	 * @generated
-	 */
-	public EClass getXmlMutable()
-	{
-		return xmlMutableEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.eclipselink.core.resource.orm.XmlConvertibleMapping
-	 * @generated
-	 */
-	public EClass getXmlConvertibleMapping()
-	{
-		return xmlConvertibleMappingEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.eclipselink.core.resource.orm.XmlAccessMethods
-	 * @generated
-	 */
-	public EClass getXmlAccessMethods()
-	{
-		return xmlAccessMethodsEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.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.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.eclipselink.core.resource.orm.XmlAccessMethodsHolder
-	 * @generated
-	 */
-	public EClass getXmlAccessMethodsHolder()
-	{
-		return xmlAccessMethodsHolderEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.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.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.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.eclipselink.core.resource.orm.XmlId
-	 * @generated
-	 */
-	public EClass getXmlId()
-	{
-		return xmlIdEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlId#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.eclipselink.core.resource.orm.XmlId#getProperties()
-	 * @see #getXmlId()
-	 * @generated
-	 */
-	public EReference getXmlId_Properties()
-	{
-		return (EReference)xmlIdEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlIdImpl <em>Xml Id Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Id Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlIdImpl
-	 * @generated
-	 */
-	public EClass getXmlIdImpl()
-	{
-		return xmlIdImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlEmbeddedId
-	 * @generated
-	 */
-	public EClass getXmlEmbeddedId()
-	{
-		return xmlEmbeddedIdEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedId#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.eclipselink.core.resource.orm.XmlEmbeddedId#getProperties()
-	 * @see #getXmlEmbeddedId()
-	 * @generated
-	 */
-	public EReference getXmlEmbeddedId_Properties()
-	{
-		return (EReference)xmlEmbeddedIdEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedIdImpl <em>Xml Embedded Id Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Embedded Id Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedIdImpl
-	 * @generated
-	 */
-	public EClass getXmlEmbeddedIdImpl()
-	{
-		return xmlEmbeddedIdImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlEmbedded
-	 * @generated
-	 */
-	public EClass getXmlEmbedded()
-	{
-		return xmlEmbeddedEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded#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.eclipselink.core.resource.orm.XmlEmbedded#getProperties()
-	 * @see #getXmlEmbedded()
-	 * @generated
-	 */
-	public EReference getXmlEmbedded_Properties()
-	{
-		return (EReference)xmlEmbeddedEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedImpl <em>Xml Embedded Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Embedded Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedImpl
-	 * @generated
-	 */
-	public EClass getXmlEmbeddedImpl()
-	{
-		return xmlEmbeddedImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlBasic
-	 * @generated
-	 */
-	public EClass getXmlBasic()
-	{
-		return xmlBasicEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic#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.eclipselink.core.resource.orm.XmlBasic#getProperties()
-	 * @see #getXmlBasic()
-	 * @generated
-	 */
-	public EReference getXmlBasic_Properties()
-	{
-		return (EReference)xmlBasicEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicImpl <em>Xml Basic Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Basic Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicImpl
-	 * @generated
-	 */
-	public EClass getXmlBasicImpl()
-	{
-		return xmlBasicImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlVersion
-	 * @generated
-	 */
-	public EClass getXmlVersion()
-	{
-		return xmlVersionEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion#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.eclipselink.core.resource.orm.XmlVersion#getProperties()
-	 * @see #getXmlVersion()
-	 * @generated
-	 */
-	public EReference getXmlVersion_Properties()
-	{
-		return (EReference)xmlVersionEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersionImpl <em>Xml Version Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Version Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersionImpl
-	 * @generated
-	 */
-	public EClass getXmlVersionImpl()
-	{
-		return xmlVersionImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlPrivateOwned
-	 * @generated
-	 */
-	public EClass getXmlPrivateOwned()
-	{
-		return xmlPrivateOwnedEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.eclipselink.core.resource.orm.XmlJoinFetch
-	 * @generated
-	 */
-	public EClass getXmlJoinFetch()
-	{
-		return xmlJoinFetchEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.eclipselink.core.resource.orm.XmlOneToOne
-	 * @generated
-	 */
-	public EClass getXmlOneToOne()
-	{
-		return xmlOneToOneEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne#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.eclipselink.core.resource.orm.XmlOneToOne#getProperties()
-	 * @see #getXmlOneToOne()
-	 * @generated
-	 */
-	public EReference getXmlOneToOne_Properties()
-	{
-		return (EReference)xmlOneToOneEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOneImpl <em>Xml One To One Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml One To One Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOneImpl
-	 * @generated
-	 */
-	public EClass getXmlOneToOneImpl()
-	{
-		return xmlOneToOneImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlOneToMany
-	 * @generated
-	 */
-	public EClass getXmlOneToMany()
-	{
-		return xmlOneToManyEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany#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.eclipselink.core.resource.orm.XmlOneToMany#getProperties()
-	 * @see #getXmlOneToMany()
-	 * @generated
-	 */
-	public EReference getXmlOneToMany_Properties()
-	{
-		return (EReference)xmlOneToManyEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToManyImpl <em>Xml One To Many Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml One To Many Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToManyImpl
-	 * @generated
-	 */
-	public EClass getXmlOneToManyImpl()
-	{
-		return xmlOneToManyImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlManyToOne
-	 * @generated
-	 */
-	public EClass getXmlManyToOne()
-	{
-		return xmlManyToOneEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne#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.eclipselink.core.resource.orm.XmlManyToOne#getProperties()
-	 * @see #getXmlManyToOne()
-	 * @generated
-	 */
-	public EReference getXmlManyToOne_Properties()
-	{
-		return (EReference)xmlManyToOneEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOneImpl <em>Xml Many To One Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Many To One Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOneImpl
-	 * @generated
-	 */
-	public EClass getXmlManyToOneImpl()
-	{
-		return xmlManyToOneImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlManyToMany
-	 * @generated
-	 */
-	public EClass getXmlManyToMany()
-	{
-		return xmlManyToManyEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany#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.eclipselink.core.resource.orm.XmlManyToMany#getProperties()
-	 * @see #getXmlManyToMany()
-	 * @generated
-	 */
-	public EReference getXmlManyToMany_Properties()
-	{
-		return (EReference)xmlManyToManyEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToManyImpl <em>Xml Many To Many Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Many To Many Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToManyImpl
-	 * @generated
-	 */
-	public EClass getXmlManyToManyImpl()
-	{
-		return xmlManyToManyImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.Attributes
-	 * @generated
-	 */
-	public EClass getAttributes()
-	{
-		return attributesEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.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.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.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.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.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.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.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.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.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.eclipselink.core.resource.orm.XmlBasicCollection
-	 * @generated
-	 */
-	public EClass getXmlBasicCollection()
-	{
-		return xmlBasicCollectionEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection#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.eclipselink.core.resource.orm.XmlBasicCollection#getProperties()
-	 * @see #getXmlBasicCollection()
-	 * @generated
-	 */
-	public EReference getXmlBasicCollection_Properties()
-	{
-		return (EReference)xmlBasicCollectionEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollectionImpl <em>Xml Basic Collection Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Basic Collection Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollectionImpl
-	 * @generated
-	 */
-	public EClass getXmlBasicCollectionImpl()
-	{
-		return xmlBasicCollectionImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlBasicMap
-	 * @generated
-	 */
-	public EClass getXmlBasicMap()
-	{
-		return xmlBasicMapEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap#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.eclipselink.core.resource.orm.XmlBasicMap#getProperties()
-	 * @see #getXmlBasicMap()
-	 * @generated
-	 */
-	public EReference getXmlBasicMap_Properties()
-	{
-		return (EReference)xmlBasicMapEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMapImpl <em>Xml Basic Map Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Basic Map Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMapImpl
-	 * @generated
-	 */
-	public EClass getXmlBasicMapImpl()
-	{
-		return xmlBasicMapImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlTransformation
-	 * @generated
-	 */
-	public EClass getXmlTransformation()
-	{
-		return xmlTransformationEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation#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.eclipselink.core.resource.orm.XmlTransformation#getProperties()
-	 * @see #getXmlTransformation()
-	 * @generated
-	 */
-	public EReference getXmlTransformation_Properties()
-	{
-		return (EReference)xmlTransformationEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformationImpl <em>Xml Transformation Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Transformation Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformationImpl
-	 * @generated
-	 */
-	public EClass getXmlTransformationImpl()
-	{
-		return xmlTransformationImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlProperty
-	 * @generated
-	 */
-	public EClass getXmlProperty()
-	{
-		return xmlPropertyEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.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.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.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.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.eclipselink.core.resource.orm.XmlVariableOneToOne
-	 * @generated
-	 */
-	public EClass getXmlVariableOneToOne()
-	{
-		return xmlVariableOneToOneEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOne#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.eclipselink.core.resource.orm.XmlVariableOneToOne#getProperties()
-	 * @see #getXmlVariableOneToOne()
-	 * @generated
-	 */
-	public EReference getXmlVariableOneToOne_Properties()
-	{
-		return (EReference)xmlVariableOneToOneEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOneImpl <em>Xml Variable One To One Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Variable One To One Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOneImpl
-	 * @generated
-	 */
-	public EClass getXmlVariableOneToOneImpl()
-	{
-		return xmlVariableOneToOneImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlDirection
-	 * @generated
-	 */
-	public EEnum getXmlDirection()
-	{
-		return xmlDirectionEEnum;
-	}
-
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlChangeTrackingType
-	 * @generated
-	 */
-	public EEnum getXmlChangeTrackingType()
-	{
-		return xmlChangeTrackingTypeEEnum;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlConverter
-	 * @generated
-	 */
-	public EClass getXmlConverter()
-	{
-		return xmlConverterEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.eclipselink.core.resource.orm.XmlConverterImpl <em>Xml Converter Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Converter Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterImpl
-	 * @generated
-	 */
-	public EClass getXmlConverterImpl()
-	{
-		return xmlConverterImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlTypeConverter
-	 * @generated
-	 */
-	public EClass getXmlTypeConverter()
-	{
-		return xmlTypeConverterEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.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.eclipselink.core.resource.orm.XmlTypeConverterImpl <em>Xml Type Converter Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Type Converter Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverterImpl
-	 * @generated
-	 */
-	public EClass getXmlTypeConverterImpl()
-	{
-		return xmlTypeConverterImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlConversionValue
-	 * @generated
-	 */
-	public EClass getXmlConversionValue()
-	{
-		return xmlConversionValueEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.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.eclipselink.core.resource.orm.XmlConversionValueImpl <em>Xml Conversion Value Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Conversion Value Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValueImpl
-	 * @generated
-	 */
-	public EClass getXmlConversionValueImpl()
-	{
-		return xmlConversionValueImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlObjectTypeConverter
-	 * @generated
-	 */
-	public EClass getXmlObjectTypeConverter()
-	{
-		return xmlObjectTypeConverterEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.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.eclipselink.core.resource.orm.XmlObjectTypeConverter#getObjectType()
-	 * @see #getXmlObjectTypeConverter()
-	 * @generated
-	 */
-	public EAttribute getXmlObjectTypeConverter_ObjectType()
-	{
-		return (EAttribute)xmlObjectTypeConverterEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl <em>Xml Object Type Converter Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Object Type Converter Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl
-	 * @generated
-	 */
-	public EClass getXmlObjectTypeConverterImpl()
-	{
-		return xmlObjectTypeConverterImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.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.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.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.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.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.eclipselink.core.resource.orm.XmlStructConverter
-	 * @generated
-	 */
-	public EClass getXmlStructConverter()
-	{
-		return xmlStructConverterEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.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.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.eclipselink.core.resource.orm.XmlStructConverterImpl <em>Xml Struct Converter Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Struct Converter Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverterImpl
-	 * @generated
-	 */
-	public EClass getXmlStructConverterImpl()
-	{
-		return xmlStructConverterImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlConverterHolder
-	 * @generated
-	 */
-	public EClass getXmlConverterHolder()
-	{
-		return xmlConverterHolderEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.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.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.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.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.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.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.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.eclipselink.core.resource.orm.XmlConverterHolder#getStructConverter()
-	 * @see #getXmlConverterHolder()
-	 * @generated
-	 */
-	public EReference getXmlConverterHolder_StructConverter()
-	{
-		return (EReference)xmlConverterHolderEClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.CacheType
-	 * @generated
-	 */
-	public EEnum getCacheType()
-	{
-		return cacheTypeEEnum;
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.CacheCoordinationType
-	 * @generated
-	 */
-	public EEnum getCacheCoordinationType()
-	{
-		return cacheCoordinationTypeEEnum;
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @generated
-	 */
-	public EEnum getXmlJoinFetchType()
-	{
-		return xmlJoinFetchTypeEEnum;
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.ExistenceType
-	 * @generated
-	 */
-	public EEnum getExistenceType()
-	{
-		return existenceTypeEEnum;
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.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.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
-		xmlNamedConverterEClass = createEClass(XML_NAMED_CONVERTER);
-		createEAttribute(xmlNamedConverterEClass, XML_NAMED_CONVERTER__NAME);
-
-		xmlConverterEClass = createEClass(XML_CONVERTER);
-		createEAttribute(xmlConverterEClass, XML_CONVERTER__CLASS_NAME);
-
-		xmlConverterImplEClass = createEClass(XML_CONVERTER_IMPL);
-
-		xmlTypeConverterEClass = createEClass(XML_TYPE_CONVERTER);
-		createEAttribute(xmlTypeConverterEClass, XML_TYPE_CONVERTER__DATA_TYPE);
-		createEAttribute(xmlTypeConverterEClass, XML_TYPE_CONVERTER__OBJECT_TYPE);
-
-		xmlTypeConverterImplEClass = createEClass(XML_TYPE_CONVERTER_IMPL);
-
-		xmlConversionValueEClass = createEClass(XML_CONVERSION_VALUE);
-		createEAttribute(xmlConversionValueEClass, XML_CONVERSION_VALUE__DATA_VALUE);
-		createEAttribute(xmlConversionValueEClass, XML_CONVERSION_VALUE__OBJECT_VALUE);
-
-		xmlConversionValueImplEClass = createEClass(XML_CONVERSION_VALUE_IMPL);
-
-		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);
-
-		xmlObjectTypeConverterImplEClass = createEClass(XML_OBJECT_TYPE_CONVERTER_IMPL);
-
-		xmlStructConverterEClass = createEClass(XML_STRUCT_CONVERTER);
-		createEAttribute(xmlStructConverterEClass, XML_STRUCT_CONVERTER__CONVERTER);
-
-		xmlStructConverterImplEClass = createEClass(XML_STRUCT_CONVERTER_IMPL);
-
-		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);
-
-		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);
-
-		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);
-
-		xmlEntityMappingsEClass = createEClass(XML_ENTITY_MAPPINGS);
-		createEReference(xmlEntityMappingsEClass, XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES);
-
-		xmlPersistenceUnitMetadataEClass = createEClass(XML_PERSISTENCE_UNIT_METADATA);
-		createEAttribute(xmlPersistenceUnitMetadataEClass, XML_PERSISTENCE_UNIT_METADATA__EXCLUDE_DEFAULT_MAPPINGS);
-
-		xmlCustomizerEClass = createEClass(XML_CUSTOMIZER);
-		createEAttribute(xmlCustomizerEClass, XML_CUSTOMIZER__CUSTOMIZER_CLASS_NAME);
-
-		xmlCustomizerHolderEClass = createEClass(XML_CUSTOMIZER_HOLDER);
-		createEReference(xmlCustomizerHolderEClass, XML_CUSTOMIZER_HOLDER__CUSTOMIZER);
-
-		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);
-
-		xmlCopyPolicyEClass = createEClass(XML_COPY_POLICY);
-		createEAttribute(xmlCopyPolicyEClass, XML_COPY_POLICY__CLASS);
-
-		xmlInstantiationPolicyEClass = createEClass(XML_INSTANTIATION_POLICY);
-
-		xmlCloneCopyPolicyEClass = createEClass(XML_CLONE_COPY_POLICY);
-		createEAttribute(xmlCloneCopyPolicyEClass, XML_CLONE_COPY_POLICY__METHOD);
-		createEAttribute(xmlCloneCopyPolicyEClass, XML_CLONE_COPY_POLICY__WORKING_COPY_METHOD);
-
-		xmlEmbeddableEClass = createEClass(XML_EMBEDDABLE);
-		createEReference(xmlEmbeddableEClass, XML_EMBEDDABLE__COPY_POLICY);
-		createEReference(xmlEmbeddableEClass, XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY);
-		createEReference(xmlEmbeddableEClass, XML_EMBEDDABLE__CLONE_COPY_POLICY);
-		createEReference(xmlEmbeddableEClass, XML_EMBEDDABLE__PROPERTIES);
-		createEAttribute(xmlEmbeddableEClass, XML_EMBEDDABLE__EXCLUDE_DEFAULT_MAPPINGS);
-
-		xmlReadOnlyEClass = createEClass(XML_READ_ONLY);
-		createEAttribute(xmlReadOnlyEClass, XML_READ_ONLY__READ_ONLY);
-
-		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);
-
-		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);
-
-		xmlOptimisticLockingEClass = createEClass(XML_OPTIMISTIC_LOCKING);
-		createEAttribute(xmlOptimisticLockingEClass, XML_OPTIMISTIC_LOCKING__TYPE);
-		createEAttribute(xmlOptimisticLockingEClass, XML_OPTIMISTIC_LOCKING__CASCADE);
-		createEReference(xmlOptimisticLockingEClass, XML_OPTIMISTIC_LOCKING__SELECTED_COLUMNS);
-
-		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);
-		createEReference(xmlEntityEClass, XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES);
-		createEReference(xmlEntityEClass, XML_ENTITY__PROPERTIES);
-		createEAttribute(xmlEntityEClass, XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS);
-
-		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);
-		createEReference(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__PROPERTIES);
-		createEAttribute(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_MAPPINGS);
-
-		xmlMutableEClass = createEClass(XML_MUTABLE);
-		createEAttribute(xmlMutableEClass, XML_MUTABLE__MUTABLE);
-
-		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);
-
-		xmlConvertibleMappingEClass = createEClass(XML_CONVERTIBLE_MAPPING);
-		createEAttribute(xmlConvertibleMappingEClass, XML_CONVERTIBLE_MAPPING__CONVERT);
-
-		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);
-
-		xmlPropertyEClass = createEClass(XML_PROPERTY);
-		createEAttribute(xmlPropertyEClass, XML_PROPERTY__NAME);
-		createEAttribute(xmlPropertyEClass, XML_PROPERTY__VALUE);
-		createEAttribute(xmlPropertyEClass, XML_PROPERTY__VALUE_TYPE);
-
-		xmlIdEClass = createEClass(XML_ID);
-		createEReference(xmlIdEClass, XML_ID__PROPERTIES);
-
-		xmlIdImplEClass = createEClass(XML_ID_IMPL);
-
-		xmlEmbeddedIdEClass = createEClass(XML_EMBEDDED_ID);
-		createEReference(xmlEmbeddedIdEClass, XML_EMBEDDED_ID__PROPERTIES);
-
-		xmlEmbeddedIdImplEClass = createEClass(XML_EMBEDDED_ID_IMPL);
-
-		xmlEmbeddedEClass = createEClass(XML_EMBEDDED);
-		createEReference(xmlEmbeddedEClass, XML_EMBEDDED__PROPERTIES);
-
-		xmlEmbeddedImplEClass = createEClass(XML_EMBEDDED_IMPL);
-
-		xmlBasicEClass = createEClass(XML_BASIC);
-		createEReference(xmlBasicEClass, XML_BASIC__PROPERTIES);
-
-		xmlBasicImplEClass = createEClass(XML_BASIC_IMPL);
-
-		xmlVersionEClass = createEClass(XML_VERSION);
-		createEReference(xmlVersionEClass, XML_VERSION__PROPERTIES);
-
-		xmlVersionImplEClass = createEClass(XML_VERSION_IMPL);
-
-		xmlPrivateOwnedEClass = createEClass(XML_PRIVATE_OWNED);
-		createEAttribute(xmlPrivateOwnedEClass, XML_PRIVATE_OWNED__PRIVATE_OWNED);
-
-		xmlJoinFetchEClass = createEClass(XML_JOIN_FETCH);
-		createEAttribute(xmlJoinFetchEClass, XML_JOIN_FETCH__JOIN_FETCH);
-
-		xmlOneToOneEClass = createEClass(XML_ONE_TO_ONE);
-		createEReference(xmlOneToOneEClass, XML_ONE_TO_ONE__PROPERTIES);
-
-		xmlOneToOneImplEClass = createEClass(XML_ONE_TO_ONE_IMPL);
-
-		xmlOneToManyEClass = createEClass(XML_ONE_TO_MANY);
-		createEReference(xmlOneToManyEClass, XML_ONE_TO_MANY__PROPERTIES);
-
-		xmlOneToManyImplEClass = createEClass(XML_ONE_TO_MANY_IMPL);
-
-		xmlManyToOneEClass = createEClass(XML_MANY_TO_ONE);
-		createEReference(xmlManyToOneEClass, XML_MANY_TO_ONE__PROPERTIES);
-
-		xmlManyToOneImplEClass = createEClass(XML_MANY_TO_ONE_IMPL);
-
-		xmlManyToManyEClass = createEClass(XML_MANY_TO_MANY);
-		createEReference(xmlManyToManyEClass, XML_MANY_TO_MANY__PROPERTIES);
-
-		xmlManyToManyImplEClass = createEClass(XML_MANY_TO_MANY_IMPL);
-
-		xmlBasicCollectionEClass = createEClass(XML_BASIC_COLLECTION);
-		createEReference(xmlBasicCollectionEClass, XML_BASIC_COLLECTION__PROPERTIES);
-
-		xmlBasicCollectionImplEClass = createEClass(XML_BASIC_COLLECTION_IMPL);
-
-		xmlBasicMapEClass = createEClass(XML_BASIC_MAP);
-		createEReference(xmlBasicMapEClass, XML_BASIC_MAP__PROPERTIES);
-
-		xmlBasicMapImplEClass = createEClass(XML_BASIC_MAP_IMPL);
-
-		xmlTransformationEClass = createEClass(XML_TRANSFORMATION);
-		createEReference(xmlTransformationEClass, XML_TRANSFORMATION__PROPERTIES);
-
-		xmlTransformationImplEClass = createEClass(XML_TRANSFORMATION_IMPL);
-
-		xmlVariableOneToOneEClass = createEClass(XML_VARIABLE_ONE_TO_ONE);
-		createEReference(xmlVariableOneToOneEClass, XML_VARIABLE_ONE_TO_ONE__PROPERTIES);
-
-		xmlVariableOneToOneImplEClass = createEClass(XML_VARIABLE_ONE_TO_ONE_IMPL);
-
-		attributesEClass = createEClass(ATTRIBUTES);
-		createEReference(attributesEClass, ATTRIBUTES__BASIC_COLLECTIONS);
-		createEReference(attributesEClass, ATTRIBUTES__BASIC_MAPS);
-		createEReference(attributesEClass, ATTRIBUTES__TRANSFORMATIONS);
-		createEReference(attributesEClass, ATTRIBUTES__VARIABLE_ONE_TO_ONES);
-
-		// Create enums
-		xmlDirectionEEnum = createEEnum(XML_DIRECTION);
-		xmlChangeTrackingTypeEEnum = createEEnum(XML_CHANGE_TRACKING_TYPE);
-		cacheTypeEEnum = createEEnum(CACHE_TYPE);
-		cacheCoordinationTypeEEnum = createEEnum(CACHE_COORDINATION_TYPE);
-		existenceTypeEEnum = createEEnum(EXISTENCE_TYPE);
-		xmlOptimisticLockingTypeEEnum = createEEnum(XML_OPTIMISTIC_LOCKING_TYPE);
-		xmlJoinFetchTypeEEnum = createEEnum(XML_JOIN_FETCH_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
-		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
-		xmlConverterEClass.getESuperTypes().add(this.getXmlNamedConverter());
-		xmlConverterImplEClass.getESuperTypes().add(this.getXmlConverter());
-		xmlTypeConverterEClass.getESuperTypes().add(this.getXmlNamedConverter());
-		xmlTypeConverterImplEClass.getESuperTypes().add(this.getXmlTypeConverter());
-		xmlConversionValueImplEClass.getESuperTypes().add(this.getXmlConversionValue());
-		xmlObjectTypeConverterEClass.getESuperTypes().add(this.getXmlNamedConverter());
-		xmlObjectTypeConverterImplEClass.getESuperTypes().add(this.getXmlObjectTypeConverter());
-		xmlStructConverterEClass.getESuperTypes().add(this.getXmlNamedConverter());
-		xmlStructConverterImplEClass.getESuperTypes().add(this.getXmlStructConverter());
-		xmlEntityMappingsEClass.getESuperTypes().add(theOrmPackage.getXmlEntityMappings());
-		xmlEntityMappingsEClass.getESuperTypes().add(this.getXmlConvertersHolder());
-		xmlPersistenceUnitMetadataEClass.getESuperTypes().add(theOrmPackage.getXmlPersistenceUnitMetadata());
-		xmlEmbeddableEClass.getESuperTypes().add(theOrmPackage.getXmlEmbeddable());
-		xmlEmbeddableEClass.getESuperTypes().add(this.getXmlCustomizerHolder());
-		xmlEmbeddableEClass.getESuperTypes().add(this.getXmlChangeTrackingHolder());
-		xmlEmbeddableEClass.getESuperTypes().add(this.getXmlConvertersHolder());
-		xmlEntityEClass.getESuperTypes().add(theOrmPackage.getXmlEntity());
-		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());
-		xmlMappedSuperclassEClass.getESuperTypes().add(theOrmPackage.getXmlMappedSuperclass());
-		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());
-		xmlConvertibleMappingEClass.getESuperTypes().add(theOrmPackage.getXmlConvertibleMapping());
-		xmlConvertibleMappingEClass.getESuperTypes().add(this.getXmlConverterHolder());
-		xmlIdEClass.getESuperTypes().add(theOrmPackage.getXmlId());
-		xmlIdEClass.getESuperTypes().add(this.getXmlMutable());
-		xmlIdEClass.getESuperTypes().add(this.getXmlConvertibleMapping());
-		xmlIdEClass.getESuperTypes().add(this.getXmlAccessMethodsHolder());
-		xmlIdImplEClass.getESuperTypes().add(theOrmPackage.getXmlIdImpl());
-		xmlIdImplEClass.getESuperTypes().add(this.getXmlId());
-		xmlEmbeddedIdEClass.getESuperTypes().add(theOrmPackage.getXmlEmbeddedId());
-		xmlEmbeddedIdEClass.getESuperTypes().add(this.getXmlAccessMethodsHolder());
-		xmlEmbeddedIdImplEClass.getESuperTypes().add(theOrmPackage.getXmlEmbeddedIdImpl());
-		xmlEmbeddedIdImplEClass.getESuperTypes().add(this.getXmlEmbeddedId());
-		xmlEmbeddedEClass.getESuperTypes().add(theOrmPackage.getXmlEmbedded());
-		xmlEmbeddedEClass.getESuperTypes().add(this.getXmlAccessMethodsHolder());
-		xmlEmbeddedImplEClass.getESuperTypes().add(theOrmPackage.getXmlEmbeddedImpl());
-		xmlEmbeddedImplEClass.getESuperTypes().add(this.getXmlEmbedded());
-		xmlBasicEClass.getESuperTypes().add(theOrmPackage.getXmlBasic());
-		xmlBasicEClass.getESuperTypes().add(this.getXmlMutable());
-		xmlBasicEClass.getESuperTypes().add(this.getXmlConvertibleMapping());
-		xmlBasicEClass.getESuperTypes().add(this.getXmlAccessMethodsHolder());
-		xmlBasicImplEClass.getESuperTypes().add(theOrmPackage.getXmlBasicImpl());
-		xmlBasicImplEClass.getESuperTypes().add(this.getXmlBasic());
-		xmlVersionEClass.getESuperTypes().add(theOrmPackage.getXmlVersion());
-		xmlVersionEClass.getESuperTypes().add(this.getXmlMutable());
-		xmlVersionEClass.getESuperTypes().add(this.getXmlConvertibleMapping());
-		xmlVersionEClass.getESuperTypes().add(this.getXmlAccessMethodsHolder());
-		xmlVersionImplEClass.getESuperTypes().add(theOrmPackage.getXmlVersionImpl());
-		xmlVersionImplEClass.getESuperTypes().add(this.getXmlVersion());
-		xmlOneToOneEClass.getESuperTypes().add(theOrmPackage.getXmlOneToOne());
-		xmlOneToOneEClass.getESuperTypes().add(this.getXmlPrivateOwned());
-		xmlOneToOneEClass.getESuperTypes().add(this.getXmlJoinFetch());
-		xmlOneToOneEClass.getESuperTypes().add(this.getXmlAccessMethodsHolder());
-		xmlOneToOneImplEClass.getESuperTypes().add(theOrmPackage.getXmlOneToOneImpl());
-		xmlOneToOneImplEClass.getESuperTypes().add(this.getXmlOneToOne());
-		xmlOneToManyEClass.getESuperTypes().add(theOrmPackage.getXmlOneToMany());
-		xmlOneToManyEClass.getESuperTypes().add(this.getXmlPrivateOwned());
-		xmlOneToManyEClass.getESuperTypes().add(this.getXmlJoinFetch());
-		xmlOneToManyEClass.getESuperTypes().add(this.getXmlAccessMethodsHolder());
-		xmlOneToManyImplEClass.getESuperTypes().add(theOrmPackage.getXmlOneToManyImpl());
-		xmlOneToManyImplEClass.getESuperTypes().add(this.getXmlOneToMany());
-		xmlManyToOneEClass.getESuperTypes().add(theOrmPackage.getXmlManyToOne());
-		xmlManyToOneEClass.getESuperTypes().add(this.getXmlJoinFetch());
-		xmlManyToOneEClass.getESuperTypes().add(this.getXmlAccessMethodsHolder());
-		xmlManyToOneImplEClass.getESuperTypes().add(theOrmPackage.getXmlManyToOneImpl());
-		xmlManyToOneImplEClass.getESuperTypes().add(this.getXmlManyToOne());
-		xmlManyToManyEClass.getESuperTypes().add(theOrmPackage.getXmlManyToMany());
-		xmlManyToManyEClass.getESuperTypes().add(this.getXmlJoinFetch());
-		xmlManyToManyEClass.getESuperTypes().add(this.getXmlAccessMethodsHolder());
-		xmlManyToManyImplEClass.getESuperTypes().add(theOrmPackage.getXmlManyToManyImpl());
-		xmlManyToManyImplEClass.getESuperTypes().add(this.getXmlManyToMany());
-		xmlBasicCollectionEClass.getESuperTypes().add(theOrmPackage.getXmlAttributeMapping());
-		xmlBasicCollectionEClass.getESuperTypes().add(this.getXmlAccessMethodsHolder());
-		xmlBasicCollectionImplEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping());
-		xmlBasicCollectionImplEClass.getESuperTypes().add(this.getXmlBasicCollection());
-		xmlBasicMapEClass.getESuperTypes().add(theOrmPackage.getXmlAttributeMapping());
-		xmlBasicMapEClass.getESuperTypes().add(this.getXmlAccessMethodsHolder());
-		xmlBasicMapImplEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping());
-		xmlBasicMapImplEClass.getESuperTypes().add(this.getXmlBasicMap());
-		xmlTransformationEClass.getESuperTypes().add(theOrmPackage.getXmlAttributeMapping());
-		xmlTransformationEClass.getESuperTypes().add(this.getXmlAccessMethodsHolder());
-		xmlTransformationImplEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping());
-		xmlTransformationImplEClass.getESuperTypes().add(this.getXmlTransformation());
-		xmlVariableOneToOneEClass.getESuperTypes().add(theOrmPackage.getXmlAttributeMapping());
-		xmlVariableOneToOneEClass.getESuperTypes().add(this.getXmlAccessMethodsHolder());
-		xmlVariableOneToOneImplEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping());
-		xmlVariableOneToOneImplEClass.getESuperTypes().add(this.getXmlVariableOneToOne());
-		attributesEClass.getESuperTypes().add(theOrmPackage.getAttributes());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(xmlNamedConverterEClass, XmlNamedConverter.class, "XmlNamedConverter", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlNamedConverter_Name(), ecorePackage.getEString(), "name", null, 0, 1, XmlNamedConverter.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(), ecorePackage.getEString(), "className", null, 0, 1, XmlConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlConverterImplEClass, XmlConverterImpl.class, "XmlConverterImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlTypeConverterEClass, XmlTypeConverter.class, "XmlTypeConverter", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlTypeConverter_DataType(), ecorePackage.getEString(), "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(), ecorePackage.getEString(), "objectType", null, 0, 1, XmlTypeConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlTypeConverterImplEClass, XmlTypeConverterImpl.class, "XmlTypeConverterImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlConversionValueEClass, XmlConversionValue.class, "XmlConversionValue", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlConversionValue_DataValue(), ecorePackage.getEString(), "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(), ecorePackage.getEString(), "objectValue", null, 0, 1, XmlConversionValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlConversionValueImplEClass, XmlConversionValueImpl.class, "XmlConversionValueImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlObjectTypeConverterEClass, XmlObjectTypeConverter.class, "XmlObjectTypeConverter", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlObjectTypeConverter_DataType(), ecorePackage.getEString(), "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(), ecorePackage.getEString(), "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(), ecorePackage.getEString(), "defaultObjectValue", null, 0, 1, XmlObjectTypeConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlObjectTypeConverterImplEClass, XmlObjectTypeConverterImpl.class, "XmlObjectTypeConverterImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlStructConverterEClass, XmlStructConverter.class, "XmlStructConverter", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlStructConverter_Converter(), ecorePackage.getEString(), "converter", null, 0, 1, XmlStructConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlStructConverterImplEClass, XmlStructConverterImpl.class, "XmlStructConverterImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		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(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(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(xmlEntityMappingsEClass, XmlEntityMappings.class, "XmlEntityMappings", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlEntityMappings_NamedStoredProcedureQueries(), this.getXmlNamedStoredProcedureQuery(), null, "namedStoredProcedureQueries", null, 0, -1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		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(xmlCustomizerEClass, XmlCustomizer.class, "XmlCustomizer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlCustomizer_CustomizerClassName(), ecorePackage.getEString(), "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(), this.getXmlCustomizer(), 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(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(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(xmlInstantiationPolicyEClass, XmlInstantiationPolicy.class, "XmlInstantiationPolicy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		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(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.getXmlCopyPolicy(), 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.getXmlCopyPolicy(), 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);
-		initEReference(getXmlEmbeddable_Properties(), this.getXmlProperty(), null, "properties", 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(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(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(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(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(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.getXmlCopyPolicy(), 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.getXmlCopyPolicy(), 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);
-		initEReference(getXmlEntity_NamedStoredProcedureQueries(), this.getXmlNamedStoredProcedureQuery(), null, "namedStoredProcedureQueries", 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_Properties(), this.getXmlProperty(), null, "properties", 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(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.getXmlCopyPolicy(), 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.getXmlCopyPolicy(), 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);
-		initEReference(getXmlMappedSuperclass_Properties(), this.getXmlProperty(), null, "properties", 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(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(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(xmlConvertibleMappingEClass, XmlConvertibleMapping.class, "XmlConvertibleMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlConvertibleMapping_Convert(), ecorePackage.getEString(), "convert", null, 0, 1, XmlConvertibleMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		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(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(xmlIdEClass, XmlId.class, "XmlId", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlId_Properties(), this.getXmlProperty(), null, "properties", null, 0, -1, XmlId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlIdImplEClass, XmlIdImpl.class, "XmlIdImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlEmbeddedIdEClass, XmlEmbeddedId.class, "XmlEmbeddedId", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlEmbeddedId_Properties(), this.getXmlProperty(), null, "properties", null, 0, -1, XmlEmbeddedId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlEmbeddedIdImplEClass, XmlEmbeddedIdImpl.class, "XmlEmbeddedIdImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlEmbeddedEClass, XmlEmbedded.class, "XmlEmbedded", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlEmbedded_Properties(), this.getXmlProperty(), null, "properties", null, 0, -1, XmlEmbedded.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlEmbeddedImplEClass, XmlEmbeddedImpl.class, "XmlEmbeddedImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlBasicEClass, XmlBasic.class, "XmlBasic", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlBasic_Properties(), this.getXmlProperty(), null, "properties", null, 0, -1, XmlBasic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlBasicImplEClass, XmlBasicImpl.class, "XmlBasicImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlVersionEClass, XmlVersion.class, "XmlVersion", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlVersion_Properties(), this.getXmlProperty(), null, "properties", null, 0, -1, XmlVersion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlVersionImplEClass, XmlVersionImpl.class, "XmlVersionImpl", !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(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(xmlOneToOneEClass, XmlOneToOne.class, "XmlOneToOne", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlOneToOne_Properties(), this.getXmlProperty(), null, "properties", null, 0, -1, XmlOneToOne.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlOneToOneImplEClass, XmlOneToOneImpl.class, "XmlOneToOneImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlOneToManyEClass, XmlOneToMany.class, "XmlOneToMany", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlOneToMany_Properties(), this.getXmlProperty(), null, "properties", null, 0, -1, XmlOneToMany.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlOneToManyImplEClass, XmlOneToManyImpl.class, "XmlOneToManyImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlManyToOneEClass, XmlManyToOne.class, "XmlManyToOne", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlManyToOne_Properties(), this.getXmlProperty(), null, "properties", null, 0, -1, XmlManyToOne.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlManyToOneImplEClass, XmlManyToOneImpl.class, "XmlManyToOneImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlManyToManyEClass, XmlManyToMany.class, "XmlManyToMany", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlManyToMany_Properties(), this.getXmlProperty(), null, "properties", null, 0, -1, XmlManyToMany.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlManyToManyImplEClass, XmlManyToManyImpl.class, "XmlManyToManyImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlBasicCollectionEClass, XmlBasicCollection.class, "XmlBasicCollection", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlBasicCollection_Properties(), this.getXmlProperty(), null, "properties", null, 0, -1, XmlBasicCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlBasicCollectionImplEClass, XmlBasicCollectionImpl.class, "XmlBasicCollectionImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlBasicMapEClass, XmlBasicMap.class, "XmlBasicMap", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlBasicMap_Properties(), this.getXmlProperty(), null, "properties", null, 0, -1, XmlBasicMap.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlBasicMapImplEClass, XmlBasicMapImpl.class, "XmlBasicMapImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlTransformationEClass, XmlTransformation.class, "XmlTransformation", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlTransformation_Properties(), this.getXmlProperty(), null, "properties", null, 0, -1, XmlTransformation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlTransformationImplEClass, XmlTransformationImpl.class, "XmlTransformationImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlVariableOneToOneEClass, XmlVariableOneToOne.class, "XmlVariableOneToOne", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlVariableOneToOne_Properties(), this.getXmlProperty(), null, "properties", null, 0, -1, XmlVariableOneToOne.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlVariableOneToOneImplEClass, XmlVariableOneToOneImpl.class, "XmlVariableOneToOneImpl", !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);
-
-		// Initialize enums and add enum literals
-		initEEnum(xmlDirectionEEnum, XmlDirection.class, "XmlDirection");
-		addEEnumLiteral(xmlDirectionEEnum, XmlDirection.IN);
-		addEEnumLiteral(xmlDirectionEEnum, XmlDirection.OUT);
-		addEEnumLiteral(xmlDirectionEEnum, XmlDirection.IN_OUT);
-		addEEnumLiteral(xmlDirectionEEnum, XmlDirection.OUT_CURSOR);
-
-		initEEnum(xmlChangeTrackingTypeEEnum, XmlChangeTrackingType.class, "XmlChangeTrackingType");
-		addEEnumLiteral(xmlChangeTrackingTypeEEnum, XmlChangeTrackingType.ATTRIBUTE);
-		addEEnumLiteral(xmlChangeTrackingTypeEEnum, XmlChangeTrackingType.OBJECT);
-		addEEnumLiteral(xmlChangeTrackingTypeEEnum, XmlChangeTrackingType.DEFERRED);
-		addEEnumLiteral(xmlChangeTrackingTypeEEnum, XmlChangeTrackingType.AUTO);
-
-		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(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(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(xmlOptimisticLockingTypeEEnum, XmlOptimisticLockingType.class, "XmlOptimisticLockingType");
-		addEEnumLiteral(xmlOptimisticLockingTypeEEnum, XmlOptimisticLockingType.ALL_COLUMNS);
-		addEEnumLiteral(xmlOptimisticLockingTypeEEnum, XmlOptimisticLockingType.CHANGED_COLUMNS);
-		addEEnumLiteral(xmlOptimisticLockingTypeEEnum, XmlOptimisticLockingType.SELECTED_COLUMNS);
-		addEEnumLiteral(xmlOptimisticLockingTypeEEnum, XmlOptimisticLockingType.VERSION_COLUMN);
-
-		initEEnum(xmlJoinFetchTypeEEnum, XmlJoinFetchType.class, "XmlJoinFetchType");
-		addEEnumLiteral(xmlJoinFetchTypeEEnum, XmlJoinFetchType.INNER);
-		addEEnumLiteral(xmlJoinFetchTypeEEnum, XmlJoinFetchType.OUTER);
-
-		// 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.eclipselink.core.resource.orm.XmlNamedConverter <em>Xml Named Converter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlNamedConverter
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlCustomizer <em>Xml Customizer</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlCustomizer
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlCustomizerHolder <em>Xml Customizer Holder</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlCustomizerHolder
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlChangeTracking <em>Xml Change Tracking</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlChangeTracking
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlChangeTrackingHolder <em>Xml Change Tracking Holder</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlChangeTrackingHolder
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlCopyPolicy <em>Xml Copy Policy</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlCopyPolicy
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlInstantiationPolicy <em>Xml Instantiation Policy</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlInstantiationPolicy
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlInstantiationPolicy()
-		 * @generated
-		 */
-		public static final EClass XML_INSTANTIATION_POLICY = eINSTANCE.getXmlInstantiationPolicy();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlCloneCopyPolicy <em>Xml Clone Copy Policy</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlCloneCopyPolicy
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlConvertersHolder <em>Xml Converters Holder</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertersHolder
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlStoredProcedureParameter <em>Xml Stored Procedure Parameter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlStoredProcedureParameter
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery <em>Xml Named Stored Procedure Query</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings()
-		 * @generated
-		 */
-		public static final EClass XML_ENTITY_MAPPINGS = eINSTANCE.getXmlEntityMappings();
-
-		/**
-		 * 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_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES = eINSTANCE.getXmlEntityMappings_NamedStoredProcedureQueries();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddable
-		 * @see org.eclipse.jpt.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>Properties</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_EMBEDDABLE__PROPERTIES = eINSTANCE.getXmlEmbeddable_Properties();
-
-		/**
-		 * 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.eclipselink.core.resource.orm.XmlReadOnly <em>Xml Read Only</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlReadOnly
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlTimeOfDay <em>Xml Time Of Day</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTimeOfDay
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlCache <em>Xml Cache</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlCache
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlCacheHolder <em>Xml Cache Holder</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlCacheHolder
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlOptimisticLocking <em>Xml Optimistic Locking</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlOptimisticLocking
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlEntity <em>Xml Entity</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity
-		 * @see org.eclipse.jpt.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>Named Stored Procedure Queries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES = eINSTANCE.getXmlEntity_NamedStoredProcedureQueries();
-
-		/**
-		 * 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_ENTITY__PROPERTIES = eINSTANCE.getXmlEntity_Properties();
-
-		/**
-		 * 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.eclipselink.core.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlMappedSuperclass
-		 * @see org.eclipse.jpt.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>Properties</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS__PROPERTIES = eINSTANCE.getXmlMappedSuperclass_Properties();
-
-		/**
-		 * 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.eclipselink.core.resource.orm.XmlMutable <em>Xml Mutable</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlMutable
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlConvertibleMapping <em>Xml Convertible Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertibleMapping
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlAccessMethods <em>Xml Access Methods</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlAccessMethodsHolder <em>Xml Access Methods Holder</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethodsHolder
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlId <em>Xml Id</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlId
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId()
-		 * @generated
-		 */
-		public static final EClass XML_ID = eINSTANCE.getXmlId();
-
-		/**
-		 * 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_ID__PROPERTIES = eINSTANCE.getXmlId_Properties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlIdImpl <em>Xml Id Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlIdImpl
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlIdImpl()
-		 * @generated
-		 */
-		public static final EClass XML_ID_IMPL = eINSTANCE.getXmlIdImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedId
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddedId()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDED_ID = eINSTANCE.getXmlEmbeddedId();
-
-		/**
-		 * 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_EMBEDDED_ID__PROPERTIES = eINSTANCE.getXmlEmbeddedId_Properties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedIdImpl <em>Xml Embedded Id Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedIdImpl
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddedIdImpl()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDED_ID_IMPL = eINSTANCE.getXmlEmbeddedIdImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbedded()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDED = eINSTANCE.getXmlEmbedded();
-
-		/**
-		 * 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_EMBEDDED__PROPERTIES = eINSTANCE.getXmlEmbedded_Properties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedImpl <em>Xml Embedded Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedImpl
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddedImpl()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDED_IMPL = eINSTANCE.getXmlEmbeddedImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic <em>Xml Basic</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC = eINSTANCE.getXmlBasic();
-
-		/**
-		 * 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_BASIC__PROPERTIES = eINSTANCE.getXmlBasic_Properties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicImpl <em>Xml Basic Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicImpl
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicImpl()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_IMPL = eINSTANCE.getXmlBasicImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion <em>Xml Version</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersion()
-		 * @generated
-		 */
-		public static final EClass XML_VERSION = eINSTANCE.getXmlVersion();
-
-		/**
-		 * 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_VERSION__PROPERTIES = eINSTANCE.getXmlVersion_Properties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersionImpl <em>Xml Version Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersionImpl
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersionImpl()
-		 * @generated
-		 */
-		public static final EClass XML_VERSION_IMPL = eINSTANCE.getXmlVersionImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlPrivateOwned <em>Xml Private Owned</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlPrivateOwned
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlJoinFetch <em>Xml Join Fetch</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetch
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOne()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_ONE = eINSTANCE.getXmlOneToOne();
-
-		/**
-		 * 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_ONE_TO_ONE__PROPERTIES = eINSTANCE.getXmlOneToOne_Properties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOneImpl <em>Xml One To One Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOneImpl
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOneImpl()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_ONE_IMPL = eINSTANCE.getXmlOneToOneImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToMany()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_MANY = eINSTANCE.getXmlOneToMany();
-
-		/**
-		 * 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_ONE_TO_MANY__PROPERTIES = eINSTANCE.getXmlOneToMany_Properties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToManyImpl <em>Xml One To Many Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToManyImpl
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToManyImpl()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_MANY_IMPL = eINSTANCE.getXmlOneToManyImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToOne()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_ONE = eINSTANCE.getXmlManyToOne();
-
-		/**
-		 * 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_MANY_TO_ONE__PROPERTIES = eINSTANCE.getXmlManyToOne_Properties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOneImpl <em>Xml Many To One Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOneImpl
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToOneImpl()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_ONE_IMPL = eINSTANCE.getXmlManyToOneImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToMany()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_MANY = eINSTANCE.getXmlManyToMany();
-
-		/**
-		 * 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_MANY_TO_MANY__PROPERTIES = eINSTANCE.getXmlManyToMany_Properties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToManyImpl <em>Xml Many To Many Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToManyImpl
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToManyImpl()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_MANY_IMPL = eINSTANCE.getXmlManyToManyImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.Attributes <em>Attributes</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.Attributes
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlBasicCollection <em>Xml Basic Collection</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicCollection()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_COLLECTION = eINSTANCE.getXmlBasicCollection();
-
-		/**
-		 * 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_BASIC_COLLECTION__PROPERTIES = eINSTANCE.getXmlBasicCollection_Properties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollectionImpl <em>Xml Basic Collection Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollectionImpl
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicCollectionImpl()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_COLLECTION_IMPL = eINSTANCE.getXmlBasicCollectionImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap <em>Xml Basic Map</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicMap()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_MAP = eINSTANCE.getXmlBasicMap();
-
-		/**
-		 * 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_BASIC_MAP__PROPERTIES = eINSTANCE.getXmlBasicMap_Properties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMapImpl <em>Xml Basic Map Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMapImpl
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicMapImpl()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_MAP_IMPL = eINSTANCE.getXmlBasicMapImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation <em>Xml Transformation</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransformation()
-		 * @generated
-		 */
-		public static final EClass XML_TRANSFORMATION = eINSTANCE.getXmlTransformation();
-
-		/**
-		 * 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_TRANSFORMATION__PROPERTIES = eINSTANCE.getXmlTransformation_Properties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformationImpl <em>Xml Transformation Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformationImpl
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransformationImpl()
-		 * @generated
-		 */
-		public static final EClass XML_TRANSFORMATION_IMPL = eINSTANCE.getXmlTransformationImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty <em>Xml Property</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlVariableOneToOne <em>Xml Variable One To One</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOne
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVariableOneToOne()
-		 * @generated
-		 */
-		public static final EClass XML_VARIABLE_ONE_TO_ONE = eINSTANCE.getXmlVariableOneToOne();
-
-		/**
-		 * 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_VARIABLE_ONE_TO_ONE__PROPERTIES = eINSTANCE.getXmlVariableOneToOne_Properties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOneImpl <em>Xml Variable One To One Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOneImpl
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVariableOneToOneImpl()
-		 * @generated
-		 */
-		public static final EClass XML_VARIABLE_ONE_TO_ONE_IMPL = eINSTANCE.getXmlVariableOneToOneImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlDirection <em>Xml Direction</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlDirection
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlChangeTrackingType <em>Xml Change Tracking Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlChangeTrackingType
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlConverter <em>Xml Converter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverter
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlConverterImpl <em>Xml Converter Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterImpl
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterImpl()
-		 * @generated
-		 */
-		public static final EClass XML_CONVERTER_IMPL = eINSTANCE.getXmlConverterImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter <em>Xml Type Converter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlTypeConverterImpl <em>Xml Type Converter Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverterImpl
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverterImpl()
-		 * @generated
-		 */
-		public static final EClass XML_TYPE_CONVERTER_IMPL = eINSTANCE.getXmlTypeConverterImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue <em>Xml Conversion Value</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlConversionValueImpl <em>Xml Conversion Value Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValueImpl
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValueImpl()
-		 * @generated
-		 */
-		public static final EClass XML_CONVERSION_VALUE_IMPL = eINSTANCE.getXmlConversionValueImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter <em>Xml Object Type Converter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter
-		 * @see org.eclipse.jpt.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 '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl <em>Xml Object Type Converter Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverterImpl()
-		 * @generated
-		 */
-		public static final EClass XML_OBJECT_TYPE_CONVERTER_IMPL = eINSTANCE.getXmlObjectTypeConverterImpl();
-
-		/**
-		 * 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.eclipselink.core.resource.orm.XmlStructConverter <em>Xml Struct Converter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlStructConverterImpl <em>Xml Struct Converter Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverterImpl
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverterImpl()
-		 * @generated
-		 */
-		public static final EClass XML_STRUCT_CONVERTER_IMPL = eINSTANCE.getXmlStructConverterImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterHolder <em>Xml Converter Holder</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterHolder
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.CacheType <em>Cache Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.CacheType
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.CacheCoordinationType <em>Cache Coordination Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.CacheCoordinationType
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlJoinFetchType <em>Xml Join Fetch Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.ExistenceType <em>Existence Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.ExistenceType
-		 * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlOptimisticLockingType <em>Xml Optimistic Locking Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlOptimisticLockingType
-		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLockingType()
-		 * @generated
-		 */
-		public static final EEnum XML_OPTIMISTIC_LOCKING_TYPE = eINSTANCE.getXmlOptimisticLockingType();
-
-	}
-
-} //EclipseLinkOrmPackage
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmXmlResourceFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmXmlResourceFactory.java
deleted file mode 100644
index c294522433..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/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.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkEntityMappingsTranslator;
-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, JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE, EclipseLinkEntityMappingsTranslator.INSTANCE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/ExistenceType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/ExistenceType.java
deleted file mode 100644
index b0ebe4c603..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/ExistenceType.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import java.util.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.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlAccessMethods.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlAccessMethods.java
deleted file mode 100644
index 2e4b64b11c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlAccessMethods.java
+++ /dev/null
@@ -1,267 +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.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.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Access Methods</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods#getGetMethod <em>Get Method</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods#getSetMethod <em>Set Method</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.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.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.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.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();
-	}
-
-} // XmlAccessMethods
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlAccessMethodsHolder.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlAccessMethodsHolder.java
deleted file mode 100644
index 22ff9a0a10..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlAccessMethodsHolder.java
+++ /dev/null
@@ -1,59 +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.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlAccessMethodsHolder#getAccessMethods <em>Access Methods</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlAccessMethods getAccessMethods();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasic.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasic.java
deleted file mode 100644
index 1e63e22682..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasic.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-
-
-/**
- * <!-- 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.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic#getProperties <em>Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic, XmlMutable, XmlConvertibleMapping, XmlAccessMethodsHolder
-{
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlProperty> getProperties();
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicCollection.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicCollection.java
deleted file mode 100644
index 87d9736487..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicCollection.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Basic 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. *
- *
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection#getProperties <em>Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicCollection()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlBasicCollection extends XmlAttributeMapping, XmlAccessMethodsHolder
-{
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicCollection_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlProperty> getProperties();
-} // XmlBasicCollection
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicCollectionImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicCollectionImpl.java
deleted file mode 100644
index 18512af8ad..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicCollectionImpl.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jpt.core.resource.orm.AbstractXmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicCollectionImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlBasicCollectionImpl extends AbstractXmlAttributeMapping implements XmlBasicCollection
-{
-	/**
-	 * 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 XmlBasicCollectionImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_BASIC_COLLECTION_IMPL;
-	}
-	
-	/**
-	 * 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.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_IMPL__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollectionImpl#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_IMPL__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC_COLLECTION_IMPL__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_IMPL__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.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicCollection_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_BASIC_COLLECTION_IMPL__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_BASIC_COLLECTION_IMPL__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION_IMPL__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_IMPL__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION_IMPL__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_BASIC_COLLECTION_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION_IMPL__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_BASIC_COLLECTION_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION_IMPL__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_BASIC_COLLECTION_IMPL__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION_IMPL__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_BASIC_COLLECTION_IMPL__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasicCollection.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC_COLLECTION_IMPL__PROPERTIES: return EclipseLinkOrmPackage.XML_BASIC_COLLECTION__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_BASIC_COLLECTION_IMPL__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasicCollection.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC_COLLECTION__PROPERTIES: return EclipseLinkOrmPackage.XML_BASIC_COLLECTION_IMPL__PROPERTIES;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	public String getMappingKey() {
-		return EclipseLinkMappingKeys.BASIC_COLLECTION_ATTRIBUTE_MAPPING_KEY;
-	}
-} // XmlBasicCollectionImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicImpl.java
deleted file mode 100644
index 7e521a9ed0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicImpl.java
+++ /dev/null
@@ -1,853 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkOrmXmlMapper;
-
-/**
- * <!-- 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.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlBasicImpl extends org.eclipse.jpt.core.resource.orm.XmlBasicImpl implements XmlBasic
-{
-	/**
-	 * 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;
-
-	/**
-	 * 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 XmlBasicImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_BASIC_IMPL;
-	}
-
-	/**
-	 * 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.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.eclipselink.core.resource.orm.XmlBasicImpl#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_IMPL__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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertibleMapping_Convert()
-	 * @model
-	 * @generated
-	 */
-	public String getConvert()
-	{
-		return convert;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicImpl#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_IMPL__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.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_IMPL__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicImpl#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_IMPL__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC_IMPL__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_IMPL__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.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_BASIC_IMPL__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.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_IMPL__CONVERTER, oldConverter, newConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicImpl#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_IMPL__CONVERTER, null, msgs);
-			if (newConverter != null)
-				msgs = ((InternalEObject)newConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERTER, null, msgs);
-			msgs = basicSetConverter(newConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC_IMPL__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.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_IMPL__TYPE_CONVERTER, oldTypeConverter, newTypeConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicImpl#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_IMPL__TYPE_CONVERTER, null, msgs);
-			if (newTypeConverter != null)
-				msgs = ((InternalEObject)newTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC_IMPL__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_IMPL__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.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_IMPL__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.eclipselink.core.resource.orm.XmlBasicImpl#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_IMPL__OBJECT_TYPE_CONVERTER, null, msgs);
-			if (newObjectTypeConverter != null)
-				msgs = ((InternalEObject)newObjectTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC_IMPL__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_IMPL__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.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_IMPL__STRUCT_CONVERTER, oldStructConverter, newStructConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicImpl#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_IMPL__STRUCT_CONVERTER, null, msgs);
-			if (newStructConverter != null)
-				msgs = ((InternalEObject)newStructConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC_IMPL__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_IMPL__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_IMPL__CONVERTER:
-				return basicSetConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__TYPE_CONVERTER:
-				return basicSetTypeConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__OBJECT_TYPE_CONVERTER:
-				return basicSetObjectTypeConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__STRUCT_CONVERTER:
-				return basicSetStructConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__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_IMPL__MUTABLE:
-				return getMutable();
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERTER:
-				return getConverter();
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__TYPE_CONVERTER:
-				return getTypeConverter();
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__OBJECT_TYPE_CONVERTER:
-				return getObjectTypeConverter();
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__STRUCT_CONVERTER:
-				return getStructConverter();
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT:
-				return getConvert();
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__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_BASIC_IMPL__MUTABLE:
-				setMutable((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERTER:
-				setConverter((XmlConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__TYPE_CONVERTER:
-				setTypeConverter((XmlTypeConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__OBJECT_TYPE_CONVERTER:
-				setObjectTypeConverter((XmlObjectTypeConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__STRUCT_CONVERTER:
-				setStructConverter((XmlStructConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT:
-				setConvert((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__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_BASIC_IMPL__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERTER:
-				setConverter((XmlConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__TYPE_CONVERTER:
-				setTypeConverter((XmlTypeConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__OBJECT_TYPE_CONVERTER:
-				setObjectTypeConverter((XmlObjectTypeConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__STRUCT_CONVERTER:
-				setStructConverter((XmlStructConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT:
-				setConvert(CONVERT_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__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_BASIC_IMPL__MUTABLE:
-				return MUTABLE_EDEFAULT == null ? mutable != null : !MUTABLE_EDEFAULT.equals(mutable);
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERTER:
-				return converter != null;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__TYPE_CONVERTER:
-				return typeConverter != null;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__OBJECT_TYPE_CONVERTER:
-				return objectTypeConverter != null;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__STRUCT_CONVERTER:
-				return structConverter != null;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT:
-				return CONVERT_EDEFAULT == null ? convert != null : !CONVERT_EDEFAULT.equals(convert);
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__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 == XmlMutable.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC_IMPL__MUTABLE: return EclipseLinkOrmPackage.XML_MUTABLE__MUTABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConverterHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER;
-				case EclipseLinkOrmPackage.XML_BASIC_IMPL__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_BASIC_IMPL__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_BASIC_IMPL__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertibleMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT: return EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC_IMPL__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasic.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC_IMPL__PROPERTIES: return EclipseLinkOrmPackage.XML_BASIC__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 == XmlMutable.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MUTABLE__MUTABLE: return EclipseLinkOrmPackage.XML_BASIC_IMPL__MUTABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConverterHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_BASIC_IMPL__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_BASIC_IMPL__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_BASIC_IMPL__STRUCT_CONVERTER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertibleMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT: return EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_BASIC_IMPL__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasic.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC__PROPERTIES: return EclipseLinkOrmPackage.XML_BASIC_IMPL__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(" (mutable: ");
-		result.append(mutable);
-		result.append(", convert: ");
-		result.append(convert);
-		result.append(')');
-		return result.toString();
-	}
-
-	public TextRange getMutableTextRange() {
-		return getAttributeTextRange(EclipseLinkOrmXmlMapper.MUTABLE);
-	}
-	
-	public TextRange getConvertTextRange() {
-		return getElementTextRange(EclipseLinkOrmXmlMapper.CONVERT);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicMap.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicMap.java
deleted file mode 100644
index 002abd39ec..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicMap.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Basic Map</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.eclipselink.core.resource.orm.XmlBasicMap#getProperties <em>Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicMap()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlBasicMap extends XmlAttributeMapping, XmlAccessMethodsHolder
-{
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicMap_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlProperty> getProperties();
-} // XmlBasicMap
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicMapImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicMapImpl.java
deleted file mode 100644
index d9ccdf633e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicMapImpl.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jpt.core.resource.orm.AbstractXmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicMapImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlBasicMapImpl extends AbstractXmlAttributeMapping implements XmlBasicMap
-{
-	/**
-	 * 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 XmlBasicMapImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_BASIC_MAP_IMPL;
-	}
-	
-	/**
-	 * 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.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_IMPL__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMapImpl#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_IMPL__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC_MAP_IMPL__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_IMPL__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.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicMap_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_BASIC_MAP_IMPL__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_BASIC_MAP_IMPL__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC_MAP_IMPL__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_IMPL__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_BASIC_MAP_IMPL__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_BASIC_MAP_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_MAP_IMPL__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_BASIC_MAP_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_MAP_IMPL__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_BASIC_MAP_IMPL__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_BASIC_MAP_IMPL__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_BASIC_MAP_IMPL__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasicMap.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC_MAP_IMPL__PROPERTIES: return EclipseLinkOrmPackage.XML_BASIC_MAP__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_BASIC_MAP_IMPL__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasicMap.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC_MAP__PROPERTIES: return EclipseLinkOrmPackage.XML_BASIC_MAP_IMPL__PROPERTIES;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	public String getMappingKey() {
-		return EclipseLinkMappingKeys.BASIC_MAP_ATTRIBUTE_MAPPING_KEY;
-	}
-} // XmlBasicMapImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCache.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCache.java
deleted file mode 100644
index b3b557a1e4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCache.java
+++ /dev/null
@@ -1,781 +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.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.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlCache#getExpiry <em>Expiry</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlCache#getSize <em>Size</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlCache#getShared <em>Shared</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlCache#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlCache#getAlwaysRefresh <em>Always Refresh</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlCache#getRefreshOnlyIfNewer <em>Refresh Only If Newer</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlCache#getDisableHits <em>Disable Hits</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlCache#getCoordinationType <em>Coordination Type</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlCache#getExpiryTimeOfDay <em>Expiry Time Of Day</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.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.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.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.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.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.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.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.eclipselink.core.resource.orm.CacheType
-	 * @see #setType(CacheType)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCache_Type()
-	 * @model
-	 * @generated
-	 */
-	public CacheType getType()
-	{
-		return type;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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.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.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.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.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.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.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.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.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.eclipselink.core.resource.orm.CacheCoordinationType
-	 * @see #setCoordinationType(CacheCoordinationType)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCache_CoordinationType()
-	 * @model default=""
-	 * @generated
-	 */
-	public CacheCoordinationType getCoordinationType()
-	{
-		return coordinationType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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.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.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.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();
-	}
-
-} // XmlCache
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCacheHolder.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCacheHolder.java
deleted file mode 100644
index 1423b24ad5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCacheHolder.java
+++ /dev/null
@@ -1,101 +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.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlCacheHolder#getCache <em>Cache</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlCacheHolder#getExistenceChecking <em>Existence Checking</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheHolder_Cache()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlCache getCache();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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.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.eclipselink.core.resource.orm.ExistenceType
-	 * @see #setExistenceChecking(ExistenceType)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheHolder_ExistenceChecking()
-	 * @model default=""
-	 * @generated
-	 */
-	ExistenceType getExistenceChecking();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.ExistenceType
-	 * @see #getExistenceChecking()
-	 * @generated
-	 */
-	void setExistenceChecking(ExistenceType value);
-
-} // XmlCacheHolder
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlChangeTracking.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlChangeTracking.java
deleted file mode 100644
index d487541d3d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlChangeTracking.java
+++ /dev/null
@@ -1,206 +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.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.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlChangeTracking#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.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.eclipselink.core.resource.orm.XmlChangeTrackingType
-	 * @see #setType(XmlChangeTrackingType)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTracking_Type()
-	 * @model
-	 * @generated
-	 */
-	public XmlChangeTrackingType getType()
-	{
-		return type;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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.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();
-	}
-
-} // XmlChangeTracking
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlChangeTrackingHolder.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlChangeTrackingHolder.java
deleted file mode 100644
index 6b7a68770d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlChangeTrackingHolder.java
+++ /dev/null
@@ -1,70 +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.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlChangeTrackingHolder#getChangeTracking <em>Change Tracking</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingHolder_ChangeTracking()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlChangeTracking getChangeTracking();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlChangeTrackingType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlChangeTrackingType.java
deleted file mode 100644
index 98544f17bc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlChangeTrackingType.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: XmlChangeTrackingType.java,v 1.3 2009/01/05 21:39:49 kmoore Exp $
- */
-package org.eclipse.jpt.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.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCloneCopyPolicy.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCloneCopyPolicy.java
deleted file mode 100644
index d58c4fd6c8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCloneCopyPolicy.java
+++ /dev/null
@@ -1,277 +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.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.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlCloneCopyPolicy#getMethod <em>Method</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlCloneCopyPolicy#getWorkingCopyMethod <em>Working Copy Method</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.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.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.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.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();
-	}
-
-} // XmlCloneCopyPolicy
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConversionValue.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConversionValue.java
deleted file mode 100644
index 2c781d542c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConversionValue.java
+++ /dev/null
@@ -1,108 +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.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlConversionValue#getDataValue <em>Data Value</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue#getObjectValue <em>Object Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlConversionValue extends JpaEObject
-{
-	/**
-	 * 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue_DataValue()
-	 * @model
-	 * @generated
-	 */
-	String getDataValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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
-	 */
-	void setDataValue(String value);
-
-	/**
-	 * 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue_ObjectValue()
-	 * @model
-	 * @generated
-	 */
-	String getObjectValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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
-	 */
-	void setObjectValue(String value);
-	
-	/**
-	 * Return the {@link TextRange} for the data-value attribute.
-	 */
-	public TextRange getDataValueTextRange();
-	
-	/**
-	 * Return the {@link TextRange} for the object-value attribute.
-	 */
-	public TextRange getObjectValueTextRange();
-
-} // XmlConversionValue
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConversionValueImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConversionValueImpl.java
deleted file mode 100644
index b479d792cf..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConversionValueImpl.java
+++ /dev/null
@@ -1,275 +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.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.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkOrmXmlMapper;
-
-/**
- * <!-- 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 -->
- *
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValueImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlConversionValueImpl extends AbstractJpaEObject implements XmlConversionValue
-{
-	/**
-	 * 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 XmlConversionValueImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_CONVERSION_VALUE_IMPL;
-	}
-
-	/**
-	 * 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue_DataValue()
-	 * @model
-	 * @generated
-	 */
-	public String getDataValue()
-	{
-		return dataValue;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValueImpl#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_IMPL__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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue_ObjectValue()
-	 * @model
-	 * @generated
-	 */
-	public String getObjectValue()
-	{
-		return objectValue;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValueImpl#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_IMPL__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_IMPL__DATA_VALUE:
-				return getDataValue();
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE_IMPL__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_IMPL__DATA_VALUE:
-				setDataValue((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE_IMPL__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_IMPL__DATA_VALUE:
-				setDataValue(DATA_VALUE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE_IMPL__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_IMPL__DATA_VALUE:
-				return DATA_VALUE_EDEFAULT == null ? dataValue != null : !DATA_VALUE_EDEFAULT.equals(dataValue);
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE_IMPL__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(EclipseLinkOrmXmlMapper.CONVERSION_VALUE__DATA_VALUE);
-	}
-	
-	public TextRange getObjectValueTextRange() {
-		return getAttributeTextRange(EclipseLinkOrmXmlMapper.CONVERSION_VALUE__OBJECT_VALUE);
-	}	
-} // XmlConversionValue
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConverter.java
deleted file mode 100644
index 35636a7a52..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConverter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlConverter#getClassName <em>Class Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverter()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlConverter extends XmlNamedConverter
-{
-	/**
-	 * 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverter_ClassName()
-	 * @model
-	 * @generated
-	 */
-	String getClassName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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
-	 */
-	void setClassName(String value);
-
-} // XmlConverter
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConverterHolder.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConverterHolder.java
deleted file mode 100644
index ea455ec870..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConverterHolder.java
+++ /dev/null
@@ -1,151 +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.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlConverterHolder#getConverter <em>Converter</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterHolder#getTypeConverter <em>Type Converter</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterHolder#getObjectTypeConverter <em>Object Type Converter</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterHolder#getStructConverter <em>Struct Converter</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlConverterHolder extends JpaEObject
-{
-	/**
-	 * 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_Converter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlConverter getConverter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_TypeConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlTypeConverter getTypeConverter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_ObjectTypeConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlObjectTypeConverter getObjectTypeConverter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_StructConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlStructConverter getStructConverter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConverterImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConverterImpl.java
deleted file mode 100644
index ac3a2e317b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConverterImpl.java
+++ /dev/null
@@ -1,266 +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.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.core.resource.xml.AbstractJpaEObject;
-
-/**
- * <!-- 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 -->
- *
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlConverterImpl extends AbstractJpaEObject implements XmlConverter
-{
-	/**
-	 * 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 #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 XmlConverterImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_CONVERTER_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedConverter_Name()
-	 * @model
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterImpl#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_CONVERTER_IMPL__NAME, oldName, name));
-	}
-
-	/**
-	 * 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverter_ClassName()
-	 * @model
-	 * @generated
-	 */
-	public String getClassName()
-	{
-		return className;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterImpl#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_IMPL__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_IMPL__NAME:
-				return getName();
-			case EclipseLinkOrmPackage.XML_CONVERTER_IMPL__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_IMPL__NAME:
-				setName((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_CONVERTER_IMPL__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_IMPL__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_CONVERTER_IMPL__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_IMPL__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EclipseLinkOrmPackage.XML_CONVERTER_IMPL__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(" (name: ");
-		result.append(name);
-		result.append(", className: ");
-		result.append(className);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlConverter
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConvertersHolder.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConvertersHolder.java
deleted file mode 100644
index 17cf81b4a5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConvertersHolder.java
+++ /dev/null
@@ -1,112 +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.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlConvertersHolder#getConverters <em>Converters</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertersHolder#getTypeConverters <em>Type Converters</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertersHolder#getObjectTypeConverters <em>Object Type Converters</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertersHolder#getStructConverters <em>Struct Converters</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.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.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.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.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.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.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.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_StructConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlStructConverter> getStructConverters();
-
-} // XmlConvertersHolder
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConvertibleMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConvertibleMapping.java
deleted file mode 100644
index 9fd20b4734..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConvertibleMapping.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlConvertibleMapping#getConvert <em>Convert</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertibleMapping()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlConvertibleMapping extends org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertibleMapping_Convert()
-	 * @model
-	 * @generated
-	 */
-	String getConvert();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCopyPolicy.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCopyPolicy.java
deleted file mode 100644
index 0da8372516..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCopyPolicy.java
+++ /dev/null
@@ -1,209 +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.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.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlCopyPolicy#getClass_ <em>Class</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.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.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();
-	}
-
-} // XmlCopyPolicy
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCustomizer.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCustomizer.java
deleted file mode 100644
index 11ccadbeff..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCustomizer.java
+++ /dev/null
@@ -1,213 +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.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.core.internal.resource.orm.translators.OrmXmlMapper;
-import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlCustomizer#getCustomizerClassName <em>Customizer Class Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizer_CustomizerClassName()
-	 * @model
-	 * @generated
-	 */
-	public String getCustomizerClassName()
-	{
-		return customizerClassName;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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();
-	}
-
-	public TextRange getCustomizerClassNameTextRange() {
-		return getAttributeTextRange(OrmXmlMapper.CLASS);
-	}
-
-} // XmlCustomizer
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCustomizerHolder.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCustomizerHolder.java
deleted file mode 100644
index ca07de3281..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCustomizerHolder.java
+++ /dev/null
@@ -1,70 +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.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlCustomizerHolder#getCustomizer <em>Customizer</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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(XmlCustomizer)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizerHolder_Customizer()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlCustomizer getCustomizer();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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(XmlCustomizer value);
-
-} // XmlCustomizerHolder
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlDirection.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlDirection.java
deleted file mode 100644
index 5dba109b89..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/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.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.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddable.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddable.java
deleted file mode 100644
index 9d1e62f3b6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddable.java
+++ /dev/null
@@ -1,945 +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.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.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- 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.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddable#getCopyPolicy <em>Copy Policy</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddable#getInstantiationCopyPolicy <em>Instantiation Copy Policy</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddable#getCloneCopyPolicy <em>Clone Copy Policy</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddable#getProperties <em>Properties</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddable#getExcludeDefaultMappings <em>Exclude Default Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable()
- * @model kind="class"
- * @generated
- */
-public class XmlEmbeddable extends org.eclipse.jpt.core.resource.orm.XmlEmbeddable implements XmlCustomizerHolder, XmlChangeTrackingHolder, XmlConvertersHolder
-{
-	/**
-	 * The cached value of the '{@link #getCustomizer() <em>Customizer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomizer()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlCustomizer 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 #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 XmlCopyPolicy 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 XmlCopyPolicy cloneCopyPolicy;
-
-	/**
-	 * 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 #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>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(XmlCustomizer)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizerHolder_Customizer()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCustomizer getCustomizer()
-	{
-		return customizer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCustomizer(XmlCustomizer newCustomizer, NotificationChain msgs)
-	{
-		XmlCustomizer 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.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(XmlCustomizer 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.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.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.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.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.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.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.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.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.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.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.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.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(XmlCopyPolicy)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable_InstantiationCopyPolicy()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCopyPolicy getInstantiationCopyPolicy()
-	{
-		return instantiationCopyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetInstantiationCopyPolicy(XmlCopyPolicy newInstantiationCopyPolicy, NotificationChain msgs)
-	{
-		XmlCopyPolicy 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.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(XmlCopyPolicy 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(XmlCopyPolicy)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable_CloneCopyPolicy()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCopyPolicy getCloneCopyPolicy()
-	{
-		return cloneCopyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCloneCopyPolicy(XmlCopyPolicy newCloneCopyPolicy, NotificationChain msgs)
-	{
-		XmlCopyPolicy 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.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(XmlCopyPolicy 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.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable_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.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.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__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__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);
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__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_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__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__PROPERTIES:
-				return getProperties();
-			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__CUSTOMIZER:
-				setCustomizer((XmlCustomizer)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__COPY_POLICY:
-				setCopyPolicy((XmlCopyPolicy)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY:
-				setInstantiationCopyPolicy((XmlCopyPolicy)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CLONE_COPY_POLICY:
-				setCloneCopyPolicy((XmlCopyPolicy)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)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__CUSTOMIZER:
-				setCustomizer((XmlCustomizer)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__COPY_POLICY:
-				setCopyPolicy((XmlCopyPolicy)null);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY:
-				setInstantiationCopyPolicy((XmlCopyPolicy)null);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CLONE_COPY_POLICY:
-				setCloneCopyPolicy((XmlCopyPolicy)null);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PROPERTIES:
-				getProperties().clear();
-				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__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__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__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			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 == 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;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
-	{
-		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;
-			}
-		}
-		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(" (excludeDefaultMappings: ");
-		result.append(excludeDefaultMappings);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlEmbeddable
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbedded.java
deleted file mode 100644
index 9f8082833b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbedded.java
+++ /dev/null
@@ -1,49 +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.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Embedded</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded#getProperties <em>Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbedded()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlEmbedded extends org.eclipse.jpt.core.resource.orm.XmlEmbedded, XmlAccessMethodsHolder
-{
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbedded_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlProperty> getProperties();
-} // XmlEmbedded
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddedId.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddedId.java
deleted file mode 100644
index c8f8d1b893..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddedId.java
+++ /dev/null
@@ -1,49 +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.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Embedded Id</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedId#getProperties <em>Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddedId()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlEmbeddedId extends org.eclipse.jpt.core.resource.orm.XmlEmbeddedId, XmlAccessMethodsHolder
-{
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddedId_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlProperty> getProperties();
-} // XmlEmbeddedId
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddedIdImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddedIdImpl.java
deleted file mode 100644
index 271de1516e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddedIdImpl.java
+++ /dev/null
@@ -1,310 +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.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.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Embedded Id Impl</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddedIdImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlEmbeddedIdImpl extends org.eclipse.jpt.core.resource.orm.XmlEmbeddedIdImpl implements XmlEmbeddedId
-{
-	/**
-	 * 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 XmlEmbeddedIdImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_EMBEDDED_ID_IMPL;
-	}
-
-	/**
-	 * 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.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_IMPL__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedIdImpl#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_IMPL__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDED_ID_IMPL__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_IMPL__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.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddedId_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_EMBEDDED_ID_IMPL__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_IMPL__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID_IMPL__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_IMPL__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID_IMPL__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_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID_IMPL__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_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID_IMPL__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_IMPL__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID_IMPL__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_EMBEDDED_ID_IMPL__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEmbeddedId.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDED_ID_IMPL__PROPERTIES: return EclipseLinkOrmPackage.XML_EMBEDDED_ID__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_EMBEDDED_ID_IMPL__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEmbeddedId.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDED_ID__PROPERTIES: return EclipseLinkOrmPackage.XML_EMBEDDED_ID_IMPL__PROPERTIES;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-} // XmlEmbeddedIdImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddedImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddedImpl.java
deleted file mode 100644
index b100959172..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddedImpl.java
+++ /dev/null
@@ -1,310 +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.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.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Embedded Impl</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddedImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlEmbeddedImpl extends org.eclipse.jpt.core.resource.orm.XmlEmbeddedImpl implements XmlEmbedded
-{
-	/**
-	 * 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 XmlEmbeddedImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_EMBEDDED_IMPL;
-	}
-
-	/**
-	 * 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.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_IMPL__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedImpl#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_IMPL__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDED_IMPL__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_IMPL__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.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbedded_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_EMBEDDED_IMPL__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_IMPL__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDED_IMPL__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_IMPL__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_EMBEDDED_IMPL__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_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDED_IMPL__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_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDED_IMPL__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_IMPL__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_EMBEDDED_IMPL__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_EMBEDDED_IMPL__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEmbedded.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDED_IMPL__PROPERTIES: return EclipseLinkOrmPackage.XML_EMBEDDED__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_EMBEDDED_IMPL__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEmbedded.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDED__PROPERTIES: return EclipseLinkOrmPackage.XML_EMBEDDED_IMPL__PROPERTIES;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-} // XmlEmbeddedImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntity.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntity.java
deleted file mode 100644
index a2eb438448..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntity.java
+++ /dev/null
@@ -1,1331 +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.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.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkOrmXmlMapper;
-
-/**
- * <!-- 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.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity#getOptimisticLocking <em>Optimistic Locking</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity#getCopyPolicy <em>Copy Policy</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity#getInstantiationCopyPolicy <em>Instantiation Copy Policy</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity#getCloneCopyPolicy <em>Clone Copy Policy</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity#getNamedStoredProcedureQueries <em>Named Stored Procedure Queries</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity#getProperties <em>Properties</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity#getExcludeDefaultMappings <em>Exclude Default Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity()
- * @model kind="class"
- * @generated
- */
-public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity implements XmlReadOnly, XmlCustomizerHolder, XmlChangeTrackingHolder, XmlCacheHolder, XmlConvertersHolder
-{
-	/**
-	 * 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 XmlCustomizer 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 #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 XmlCopyPolicy 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 XmlCopyPolicy cloneCopyPolicy;
-
-	/**
-	 * 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 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.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.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(XmlCustomizer)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizerHolder_Customizer()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCustomizer getCustomizer()
-	{
-		return customizer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCustomizer(XmlCustomizer newCustomizer, NotificationChain msgs)
-	{
-		XmlCustomizer 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.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(XmlCustomizer 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.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.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.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.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.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.eclipselink.core.resource.orm.ExistenceType
-	 * @see #setExistenceChecking(ExistenceType)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheHolder_ExistenceChecking()
-	 * @model default=""
-	 * @generated
-	 */
-	public ExistenceType getExistenceChecking()
-	{
-		return existenceChecking;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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.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.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.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.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.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.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.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.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.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.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.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.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.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(XmlCopyPolicy)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_InstantiationCopyPolicy()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCopyPolicy getInstantiationCopyPolicy()
-	{
-		return instantiationCopyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetInstantiationCopyPolicy(XmlCopyPolicy newInstantiationCopyPolicy, NotificationChain msgs)
-	{
-		XmlCopyPolicy 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.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(XmlCopyPolicy 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(XmlCopyPolicy)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_CloneCopyPolicy()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCopyPolicy getCloneCopyPolicy()
-	{
-		return cloneCopyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCloneCopyPolicy(XmlCopyPolicy newCloneCopyPolicy, NotificationChain msgs)
-	{
-		XmlCopyPolicy 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.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(XmlCopyPolicy 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.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Stored Procedure Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Stored Procedure Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_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.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_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>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.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.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__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__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);
-			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);
-		}
-		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__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__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__NAMED_STORED_PROCEDURE_QUERIES:
-				return getNamedStoredProcedureQueries();
-			case EclipseLinkOrmPackage.XML_ENTITY__PROPERTIES:
-				return getProperties();
-			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__READ_ONLY:
-				setReadOnly((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER:
-				setCustomizer((XmlCustomizer)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__OPTIMISTIC_LOCKING:
-				setOptimisticLocking((XmlOptimisticLocking)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__COPY_POLICY:
-				setCopyPolicy((XmlCopyPolicy)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__INSTANTIATION_COPY_POLICY:
-				setInstantiationCopyPolicy((XmlCopyPolicy)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CLONE_COPY_POLICY:
-				setCloneCopyPolicy((XmlCopyPolicy)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__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__READ_ONLY:
-				setReadOnly(READ_ONLY_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER:
-				setCustomizer((XmlCustomizer)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__OPTIMISTIC_LOCKING:
-				setOptimisticLocking((XmlOptimisticLocking)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__COPY_POLICY:
-				setCopyPolicy((XmlCopyPolicy)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__INSTANTIATION_COPY_POLICY:
-				setInstantiationCopyPolicy((XmlCopyPolicy)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CLONE_COPY_POLICY:
-				setCloneCopyPolicy((XmlCopyPolicy)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES:
-				getNamedStoredProcedureQueries().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__PROPERTIES:
-				getProperties().clear();
-				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__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__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__NAMED_STORED_PROCEDURE_QUERIES:
-				return namedStoredProcedureQueries != null && !namedStoredProcedureQueries.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			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 == 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;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlReadOnly.class)
-		{
-			switch (baseFeatureID)
-			{
-				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;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (readOnly: ");
-		result.append(readOnly);
-		result.append(", existenceChecking: ");
-		result.append(existenceChecking);
-		result.append(", excludeDefaultMappings: ");
-		result.append(excludeDefaultMappings);
-		result.append(')');
-		return result.toString();
-	}
-
-	public TextRange getReadOnlyTextRange() {
-		return getAttributeTextRange(EclipseLinkOrmXmlMapper.READ_ONLY);
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntityMappings.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntityMappings.java
deleted file mode 100644
index 5fe9886a7e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntityMappings.java
+++ /dev/null
@@ -1,415 +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.eclipselink.core.resource.orm;
-
-import java.util.Collection;
-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.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- 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.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings#getNamedStoredProcedureQueries <em>Named Stored Procedure Queries</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings()
- * @model kind="class"
- * @generated
- */
-public class XmlEntityMappings extends org.eclipse.jpt.core.resource.orm.XmlEntityMappings implements XmlConvertersHolder
-{
-	/**
-	 * 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>Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.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.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.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.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.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.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.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.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.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Stored Procedure Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Stored Procedure Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_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__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__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__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__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__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 == 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;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
-	{
-		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;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-} // XmlEntityMappings
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlId.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlId.java
deleted file mode 100644
index 388162705e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlId.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-
-
-/**
- * <!-- 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.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlId#getProperties <em>Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlId extends org.eclipse.jpt.core.resource.orm.XmlId, XmlMutable, XmlConvertibleMapping, XmlAccessMethodsHolder
-{
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlProperty> getProperties();
-} // XmlId
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlIdImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlIdImpl.java
deleted file mode 100644
index 87adaa9b39..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlIdImpl.java
+++ /dev/null
@@ -1,859 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkOrmXmlMapper;
-
-/**
- * <!-- 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.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlIdImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlIdImpl extends org.eclipse.jpt.core.resource.orm.XmlIdImpl implements XmlId
-{
-	/**
-	 * 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;
-
-	/**
-	 * 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 XmlIdImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_ID_IMPL;
-	}
-
-	/**
-	 * 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.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.eclipselink.core.resource.orm.XmlIdImpl#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_IMPL__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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertibleMapping_Convert()
-	 * @model
-	 * @generated
-	 */
-	public String getConvert()
-	{
-		return convert;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlIdImpl#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_IMPL__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.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_IMPL__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlIdImpl#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_IMPL__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID_IMPL__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_IMPL__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.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_ID_IMPL__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.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_IMPL__CONVERTER, oldConverter, newConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlIdImpl#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_IMPL__CONVERTER, null, msgs);
-			if (newConverter != null)
-				msgs = ((InternalEObject)newConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID_IMPL__CONVERTER, null, msgs);
-			msgs = basicSetConverter(newConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID_IMPL__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.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_IMPL__TYPE_CONVERTER, oldTypeConverter, newTypeConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlIdImpl#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_IMPL__TYPE_CONVERTER, null, msgs);
-			if (newTypeConverter != null)
-				msgs = ((InternalEObject)newTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID_IMPL__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_IMPL__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.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_IMPL__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.eclipselink.core.resource.orm.XmlIdImpl#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_IMPL__OBJECT_TYPE_CONVERTER, null, msgs);
-			if (newObjectTypeConverter != null)
-				msgs = ((InternalEObject)newObjectTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID_IMPL__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_IMPL__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.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_IMPL__STRUCT_CONVERTER, oldStructConverter, newStructConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlIdImpl#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_IMPL__STRUCT_CONVERTER, null, msgs);
-			if (newStructConverter != null)
-				msgs = ((InternalEObject)newStructConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID_IMPL__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_IMPL__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_IMPL__CONVERTER:
-				return basicSetConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_ID_IMPL__TYPE_CONVERTER:
-				return basicSetTypeConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_ID_IMPL__OBJECT_TYPE_CONVERTER:
-				return basicSetObjectTypeConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_ID_IMPL__STRUCT_CONVERTER:
-				return basicSetStructConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_ID_IMPL__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_ID_IMPL__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_ID_IMPL__MUTABLE:
-				return getMutable();
-			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERTER:
-				return getConverter();
-			case EclipseLinkOrmPackage.XML_ID_IMPL__TYPE_CONVERTER:
-				return getTypeConverter();
-			case EclipseLinkOrmPackage.XML_ID_IMPL__OBJECT_TYPE_CONVERTER:
-				return getObjectTypeConverter();
-			case EclipseLinkOrmPackage.XML_ID_IMPL__STRUCT_CONVERTER:
-				return getStructConverter();
-			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT:
-				return getConvert();
-			case EclipseLinkOrmPackage.XML_ID_IMPL__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_ID_IMPL__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_ID_IMPL__MUTABLE:
-				setMutable((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERTER:
-				setConverter((XmlConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__TYPE_CONVERTER:
-				setTypeConverter((XmlTypeConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__OBJECT_TYPE_CONVERTER:
-				setObjectTypeConverter((XmlObjectTypeConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__STRUCT_CONVERTER:
-				setStructConverter((XmlStructConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT:
-				setConvert((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__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_ID_IMPL__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERTER:
-				setConverter((XmlConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__TYPE_CONVERTER:
-				setTypeConverter((XmlTypeConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__OBJECT_TYPE_CONVERTER:
-				setObjectTypeConverter((XmlObjectTypeConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__STRUCT_CONVERTER:
-				setStructConverter((XmlStructConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT:
-				setConvert(CONVERT_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__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_ID_IMPL__MUTABLE:
-				return MUTABLE_EDEFAULT == null ? mutable != null : !MUTABLE_EDEFAULT.equals(mutable);
-			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERTER:
-				return converter != null;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__TYPE_CONVERTER:
-				return typeConverter != null;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__OBJECT_TYPE_CONVERTER:
-				return objectTypeConverter != null;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__STRUCT_CONVERTER:
-				return structConverter != null;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT:
-				return CONVERT_EDEFAULT == null ? convert != null : !CONVERT_EDEFAULT.equals(convert);
-			case EclipseLinkOrmPackage.XML_ID_IMPL__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__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 == XmlMutable.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ID_IMPL__MUTABLE: return EclipseLinkOrmPackage.XML_MUTABLE__MUTABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConverterHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER;
-				case EclipseLinkOrmPackage.XML_ID_IMPL__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_ID_IMPL__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_ID_IMPL__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertibleMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT: return EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ID_IMPL__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlId.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ID_IMPL__PROPERTIES: return EclipseLinkOrmPackage.XML_ID__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 == XmlMutable.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MUTABLE__MUTABLE: return EclipseLinkOrmPackage.XML_ID_IMPL__MUTABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConverterHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_ID_IMPL__CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_ID_IMPL__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_ID_IMPL__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_ID_IMPL__STRUCT_CONVERTER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertibleMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT: return EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ID_IMPL__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlId.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ID__PROPERTIES: return EclipseLinkOrmPackage.XML_ID_IMPL__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(" (mutable: ");
-		result.append(mutable);
-		result.append(", convert: ");
-		result.append(convert);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getMutableTextRange() {
-		return getAttributeTextRange(EclipseLinkOrmXmlMapper.MUTABLE);
-	}
-	
-	public TextRange getConvertTextRange() {
-		return getElementTextRange(EclipseLinkOrmXmlMapper.CONVERT);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlInstantiationPolicy.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlInstantiationPolicy.java
deleted file mode 100644
index 52364a9497..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlInstantiationPolicy.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.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlInstantiationPolicy()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlInstantiationPolicy extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlInstantiationPolicy()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_INSTANTIATION_POLICY;
-	}
-
-} // XmlInstantiationPolicy
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlJoinFetch.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlJoinFetch.java
deleted file mode 100644
index d75f4df4b4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlJoinFetch.java
+++ /dev/null
@@ -1,78 +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.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlJoinFetch#getJoinFetch <em>Join Fetch</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.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.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see #setJoinFetch(XmlJoinFetchType)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch_JoinFetch()
-	 * @model
-	 * @generated
-	 */
-	XmlJoinFetchType getJoinFetch();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlJoinFetchType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlJoinFetchType.java
deleted file mode 100644
index 58b690ea4d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlJoinFetchType.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: XmlJoinFetchType.java,v 1.3 2009/01/05 21:39:49 kmoore Exp $
- */
-package org.eclipse.jpt.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.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToMany.java
deleted file mode 100644
index 97e072a79c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToMany.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-
-
-/**
- * <!-- 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.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany#getProperties <em>Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToMany()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMany, XmlJoinFetch, XmlAccessMethodsHolder
-{
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToMany_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlProperty> getProperties();
-} // XmlManyToMany
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToManyImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToManyImpl.java
deleted file mode 100644
index e1bf1ef086..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToManyImpl.java
+++ /dev/null
@@ -1,421 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkOrmXmlMapper;
-
-/**
- * <!-- 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.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToManyImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlManyToManyImpl extends org.eclipse.jpt.core.resource.orm.XmlManyToManyImpl implements XmlManyToMany
-{
-	/**
-	 * 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 #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 XmlManyToManyImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_MANY_TO_MANY_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Join Fetch</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see #setJoinFetch(XmlJoinFetchType)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch_JoinFetch()
-	 * @model
-	 * @generated
-	 */
-	public XmlJoinFetchType getJoinFetch()
-	{
-		return joinFetch;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToManyImpl#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.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_IMPL__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.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_IMPL__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToManyImpl#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_IMPL__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__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_IMPL__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.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToMany_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__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_IMPL__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__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_IMPL__JOIN_FETCH:
-				return getJoinFetch();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__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_MANY_TO_MANY_IMPL__JOIN_FETCH:
-				setJoinFetch((XmlJoinFetchType)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__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_MANY_TO_MANY_IMPL__JOIN_FETCH:
-				setJoinFetch(JOIN_FETCH_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__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_MANY_TO_MANY_IMPL__JOIN_FETCH:
-				return joinFetch != JOIN_FETCH_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__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 == XmlJoinFetch.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__JOIN_FETCH: return EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlManyToMany.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__PROPERTIES: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__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 == XmlJoinFetch.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH: return EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__JOIN_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlManyToMany.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES: return EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__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(" (joinFetch: ");
-		result.append(joinFetch);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getJoinFetchTextRange() {
-		return getElementTextRange(EclipseLinkOrmXmlMapper.JOIN_FETCH);
-	}
-} // XmlManyToMany
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToOne.java
deleted file mode 100644
index 606b8bc7f9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToOne.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-
-
-/**
- * <!-- 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.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne#getProperties <em>Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToOne()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne, XmlJoinFetch, XmlAccessMethodsHolder
-{
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToOne_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlProperty> getProperties();
-} // XmlManyToOne
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToOneImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToOneImpl.java
deleted file mode 100644
index 7c1ae0fb2c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToOneImpl.java
+++ /dev/null
@@ -1,421 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkOrmXmlMapper;
-
-/**
- * <!-- 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.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToOneImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlManyToOneImpl extends org.eclipse.jpt.core.resource.orm.XmlManyToOneImpl implements XmlManyToOne
-{
-	/**
-	 * 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 #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 XmlManyToOneImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_MANY_TO_ONE_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Join Fetch</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.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.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see #setJoinFetch(XmlJoinFetchType)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch_JoinFetch()
-	 * @model
-	 * @generated
-	 */
-	public XmlJoinFetchType getJoinFetch()
-	{
-		return joinFetch;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOneImpl#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.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_IMPL__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.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_IMPL__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOneImpl#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_IMPL__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__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_IMPL__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.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToOne_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__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_IMPL__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__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_IMPL__JOIN_FETCH:
-				return getJoinFetch();
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__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_MANY_TO_ONE_IMPL__JOIN_FETCH:
-				setJoinFetch((XmlJoinFetchType)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__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_MANY_TO_ONE_IMPL__JOIN_FETCH:
-				setJoinFetch(JOIN_FETCH_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__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_MANY_TO_ONE_IMPL__JOIN_FETCH:
-				return joinFetch != JOIN_FETCH_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__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 == XmlJoinFetch.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_FETCH: return EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlManyToOne.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__PROPERTIES: return EclipseLinkOrmPackage.XML_MANY_TO_ONE__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 == XmlJoinFetch.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH: return EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlManyToOne.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PROPERTIES: return EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__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(" (joinFetch: ");
-		result.append(joinFetch);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getJoinFetchTextRange() {
-		return getElementTextRange(EclipseLinkOrmXmlMapper.JOIN_FETCH);
-	}
-} // XmlManyToOne
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java
deleted file mode 100644
index ea1cd21dc2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java
+++ /dev/null
@@ -1,1283 +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.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.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkOrmXmlMapper;
-
-/**
- * <!-- 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.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMappedSuperclass#getOptimisticLocking <em>Optimistic Locking</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMappedSuperclass#getCopyPolicy <em>Copy Policy</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMappedSuperclass#getInstantiationCopyPolicy <em>Instantiation Copy Policy</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMappedSuperclass#getCloneCopyPolicy <em>Clone Copy Policy</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMappedSuperclass#getProperties <em>Properties</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMappedSuperclass#getExcludeDefaultMappings <em>Exclude Default Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass()
- * @model kind="class"
- * @generated
- */
-public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass implements XmlReadOnly, XmlCustomizerHolder, XmlChangeTrackingHolder, XmlCacheHolder, XmlConvertersHolder
-{
-	/**
-	 * 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 XmlCustomizer 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 #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 XmlCopyPolicy 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 XmlCopyPolicy cloneCopyPolicy;
-
-	/**
-	 * 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 #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.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.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(XmlCustomizer)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizerHolder_Customizer()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCustomizer getCustomizer()
-	{
-		return customizer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCustomizer(XmlCustomizer newCustomizer, NotificationChain msgs)
-	{
-		XmlCustomizer 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.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(XmlCustomizer 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.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.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.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.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.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.eclipselink.core.resource.orm.ExistenceType
-	 * @see #setExistenceChecking(ExistenceType)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheHolder_ExistenceChecking()
-	 * @model default=""
-	 * @generated
-	 */
-	public ExistenceType getExistenceChecking()
-	{
-		return existenceChecking;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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.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.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.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.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.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.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.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.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.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.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.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.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.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(XmlCopyPolicy)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_InstantiationCopyPolicy()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCopyPolicy getInstantiationCopyPolicy()
-	{
-		return instantiationCopyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetInstantiationCopyPolicy(XmlCopyPolicy newInstantiationCopyPolicy, NotificationChain msgs)
-	{
-		XmlCopyPolicy 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.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(XmlCopyPolicy 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(XmlCopyPolicy)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_CloneCopyPolicy()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCopyPolicy getCloneCopyPolicy()
-	{
-		return cloneCopyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCloneCopyPolicy(XmlCopyPolicy newCloneCopyPolicy, NotificationChain msgs)
-	{
-		XmlCopyPolicy 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.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(XmlCopyPolicy 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.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_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>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.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.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__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__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);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__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_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__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__PROPERTIES:
-				return getProperties();
-			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__READ_ONLY:
-				setReadOnly((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER:
-				setCustomizer((XmlCustomizer)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__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((XmlCopyPolicy)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY:
-				setCloneCopyPolicy((XmlCopyPolicy)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)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__READ_ONLY:
-				setReadOnly(READ_ONLY_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER:
-				setCustomizer((XmlCustomizer)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__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((XmlCopyPolicy)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY:
-				setCloneCopyPolicy((XmlCopyPolicy)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PROPERTIES:
-				getProperties().clear();
-				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__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__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__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			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 == 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;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlReadOnly.class)
-		{
-			switch (baseFeatureID)
-			{
-				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;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (readOnly: ");
-		result.append(readOnly);
-		result.append(", existenceChecking: ");
-		result.append(existenceChecking);
-		result.append(", excludeDefaultMappings: ");
-		result.append(excludeDefaultMappings);
-		result.append(')');
-		return result.toString();
-	}
-
-	public TextRange getReadOnlyTextRange() {
-		return getAttributeTextRange(EclipseLinkOrmXmlMapper.READ_ONLY);
-	}
-} // XmlMappedSuperclass
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMutable.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMutable.java
deleted file mode 100644
index 2527893793..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMutable.java
+++ /dev/null
@@ -1,75 +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.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlMutable#getMutable <em>Mutable</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.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.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlNamedConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlNamedConverter.java
deleted file mode 100644
index ab49c4d49f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlNamedConverter.java
+++ /dev/null
@@ -1,70 +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.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlNamedConverter#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedConverter()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlNamedConverter extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedConverter_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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
-	 */
-	void setName(String value);
-
-} // XmlNamedConverter
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlNamedStoredProcedureQuery.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlNamedStoredProcedureQuery.java
deleted file mode 100644
index 0032a5670c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlNamedStoredProcedureQuery.java
+++ /dev/null
@@ -1,601 +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.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.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-
-import org.eclipse.jpt.core.resource.orm.XmlQueryHint;
-import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getResultClass <em>Result Class</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getResultSetMapping <em>Result Set Mapping</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getProcedureName <em>Procedure Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getReturnsResultSet <em>Returns Result Set</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getHints <em>Hints</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getParameters <em>Parameters</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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();
-	}
-
-} // XmlNamedStoredProcedureQuery
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlObjectTypeConverter.java
deleted file mode 100644
index 2809208aad..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlObjectTypeConverter.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlObjectTypeConverter#getDataType <em>Data Type</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter#getObjectType <em>Object Type</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter#getConversionValues <em>Conversion Values</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter#getDefaultObjectValue <em>Default Object Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlObjectTypeConverter extends XmlNamedConverter
-{
-	/**
-	 * Returns the value of the '<em><b>Conversion Values</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_ConversionValues()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlConversionValue> getConversionValues();
-
-	/**
-	 * 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_DefaultObjectValue()
-	 * @model
-	 * @generated
-	 */
-	String getDefaultObjectValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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
-	 */
-	void setDefaultObjectValue(String value);
-
-	/**
-	 * 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_DataType()
-	 * @model
-	 * @generated
-	 */
-	String getDataType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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
-	 */
-	void setDataType(String value);
-
-	/**
-	 * 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_ObjectType()
-	 * @model
-	 * @generated
-	 */
-	String getObjectType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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
-	 */
-	void setObjectType(String value);
-
-} // XmlObjectTypeConverter
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlObjectTypeConverterImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlObjectTypeConverterImpl.java
deleted file mode 100644
index 7cb9332b91..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlObjectTypeConverterImpl.java
+++ /dev/null
@@ -1,467 +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.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.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject;
-
-/**
- * <!-- 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 -->
- *
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverterImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlObjectTypeConverterImpl extends AbstractJpaEObject implements XmlObjectTypeConverter
-{
-	/**
-	 * 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 #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 XmlObjectTypeConverterImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_OBJECT_TYPE_CONVERTER_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedConverter_Name()
-	 * @model
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl#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_OBJECT_TYPE_CONVERTER_IMPL__NAME, oldName, name));
-	}
-
-	/**
-	 * 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_DataType()
-	 * @model
-	 * @generated
-	 */
-	public String getDataType()
-	{
-		return dataType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl#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_IMPL__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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_ObjectType()
-	 * @model
-	 * @generated
-	 */
-	public String getObjectType()
-	{
-		return objectType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl#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_IMPL__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.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.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_IMPL__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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_DefaultObjectValue()
-	 * @model
-	 * @generated
-	 */
-	public String getDefaultObjectValue()
-	{
-		return defaultObjectValue;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl#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_IMPL__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_IMPL__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_IMPL__NAME:
-				return getName();
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__DATA_TYPE:
-				return getDataType();
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__OBJECT_TYPE:
-				return getObjectType();
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__CONVERSION_VALUES:
-				return getConversionValues();
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__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_IMPL__NAME:
-				setName((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__DATA_TYPE:
-				setDataType((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__OBJECT_TYPE:
-				setObjectType((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__CONVERSION_VALUES:
-				getConversionValues().clear();
-				getConversionValues().addAll((Collection<? extends XmlConversionValue>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__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_IMPL__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__DATA_TYPE:
-				setDataType(DATA_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__OBJECT_TYPE:
-				setObjectType(OBJECT_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__CONVERSION_VALUES:
-				getConversionValues().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__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_IMPL__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__DATA_TYPE:
-				return DATA_TYPE_EDEFAULT == null ? dataType != null : !DATA_TYPE_EDEFAULT.equals(dataType);
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__OBJECT_TYPE:
-				return OBJECT_TYPE_EDEFAULT == null ? objectType != null : !OBJECT_TYPE_EDEFAULT.equals(objectType);
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__CONVERSION_VALUES:
-				return conversionValues != null && !conversionValues.isEmpty();
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__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(" (name: ");
-		result.append(name);
-		result.append(", dataType: ");
-		result.append(dataType);
-		result.append(", objectType: ");
-		result.append(objectType);
-		result.append(", defaultObjectValue: ");
-		result.append(defaultObjectValue);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlObjectTypeConverter
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToMany.java
deleted file mode 100644
index cad74716f2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToMany.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-
-
-/**
- * <!-- 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.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany#getProperties <em>Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToMany()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany, XmlPrivateOwned, XmlJoinFetch, XmlAccessMethodsHolder
-{
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToMany_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlProperty> getProperties();
-} // XmlOneToMany
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToManyImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToManyImpl.java
deleted file mode 100644
index 9d06e5a2a4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToManyImpl.java
+++ /dev/null
@@ -1,508 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkOrmXmlMapper;
-
-/**
- * <!-- 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.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToManyImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlOneToManyImpl extends org.eclipse.jpt.core.resource.orm.XmlOneToManyImpl implements XmlOneToMany
-{
-	/**
-	 * 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;
-
-	/**
-	 * 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 XmlOneToManyImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_ONE_TO_MANY_IMPL;
-	}
-
-	/**
-	 * 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.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.eclipselink.core.resource.orm.XmlOneToManyImpl#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_IMPL__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.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.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see #setJoinFetch(XmlJoinFetchType)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch_JoinFetch()
-	 * @model
-	 * @generated
-	 */
-	public XmlJoinFetchType getJoinFetch()
-	{
-		return joinFetch;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToManyImpl#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.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_IMPL__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.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_IMPL__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToManyImpl#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_IMPL__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__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_IMPL__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.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToMany_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__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_IMPL__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__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_IMPL__PRIVATE_OWNED:
-				return isPrivateOwned() ? Boolean.TRUE : Boolean.FALSE;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_FETCH:
-				return getJoinFetch();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__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_ONE_TO_MANY_IMPL__PRIVATE_OWNED:
-				setPrivateOwned(((Boolean)newValue).booleanValue());
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_FETCH:
-				setJoinFetch((XmlJoinFetchType)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__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_ONE_TO_MANY_IMPL__PRIVATE_OWNED:
-				setPrivateOwned(PRIVATE_OWNED_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_FETCH:
-				setJoinFetch(JOIN_FETCH_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__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_ONE_TO_MANY_IMPL__PRIVATE_OWNED:
-				return privateOwned != PRIVATE_OWNED_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_FETCH:
-				return joinFetch != JOIN_FETCH_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__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 == XmlPrivateOwned.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__PRIVATE_OWNED: return EclipseLinkOrmPackage.XML_PRIVATE_OWNED__PRIVATE_OWNED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlJoinFetch.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_FETCH: return EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToMany.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__PROPERTIES: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__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 == XmlPrivateOwned.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PRIVATE_OWNED__PRIVATE_OWNED: return EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__PRIVATE_OWNED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlJoinFetch.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH: return EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToMany.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES: return EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__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(" (privateOwned: ");
-		result.append(privateOwned);
-		result.append(", joinFetch: ");
-		result.append(joinFetch);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getPrivateOwnedTextRange() {
-		return getElementTextRange(EclipseLinkOrmXmlMapper.PRIVATE_OWNED);
-	}
-	
-	public TextRange getJoinFetchTextRange() {
-		return getElementTextRange(EclipseLinkOrmXmlMapper.JOIN_FETCH);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToOne.java
deleted file mode 100644
index 8d89a819e2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToOne.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-
-
-/**
- * <!-- 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.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne#getProperties <em>Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOne()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne, XmlPrivateOwned, XmlJoinFetch, XmlAccessMethodsHolder
-{
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOne_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlProperty> getProperties();
-} // XmlOneToOne
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToOneImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToOneImpl.java
deleted file mode 100644
index 5a0dc409df..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToOneImpl.java
+++ /dev/null
@@ -1,508 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkOrmXmlMapper;
-
-/**
- * <!-- 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.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOneImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlOneToOneImpl extends org.eclipse.jpt.core.resource.orm.XmlOneToOneImpl implements XmlOneToOne
-{
-	/**
-	 * 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;
-
-	/**
-	 * 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 XmlOneToOneImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_ONE_TO_ONE_IMPL;
-	}
-
-	/**
-	 * 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.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.eclipselink.core.resource.orm.XmlOneToOneImpl#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_IMPL__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.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.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see #setJoinFetch(XmlJoinFetchType)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch_JoinFetch()
-	 * @model
-	 * @generated
-	 */
-	public XmlJoinFetchType getJoinFetch()
-	{
-		return joinFetch;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOneImpl#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.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_IMPL__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.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_IMPL__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOneImpl#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_IMPL__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__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_IMPL__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.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOne_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__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_IMPL__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__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_IMPL__PRIVATE_OWNED:
-				return isPrivateOwned() ? Boolean.TRUE : Boolean.FALSE;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_FETCH:
-				return getJoinFetch();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__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_ONE_TO_ONE_IMPL__PRIVATE_OWNED:
-				setPrivateOwned(((Boolean)newValue).booleanValue());
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_FETCH:
-				setJoinFetch((XmlJoinFetchType)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__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_ONE_TO_ONE_IMPL__PRIVATE_OWNED:
-				setPrivateOwned(PRIVATE_OWNED_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_FETCH:
-				setJoinFetch(JOIN_FETCH_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__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_ONE_TO_ONE_IMPL__PRIVATE_OWNED:
-				return privateOwned != PRIVATE_OWNED_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_FETCH:
-				return joinFetch != JOIN_FETCH_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__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 == XmlPrivateOwned.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__PRIVATE_OWNED: return EclipseLinkOrmPackage.XML_PRIVATE_OWNED__PRIVATE_OWNED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlJoinFetch.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_FETCH: return EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToOne.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__PROPERTIES: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__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 == XmlPrivateOwned.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PRIVATE_OWNED__PRIVATE_OWNED: return EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__PRIVATE_OWNED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlJoinFetch.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH: return EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToOne.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PROPERTIES: return EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__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(" (privateOwned: ");
-		result.append(privateOwned);
-		result.append(", joinFetch: ");
-		result.append(joinFetch);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getPrivateOwnedTextRange() {
-		return getElementTextRange(EclipseLinkOrmXmlMapper.PRIVATE_OWNED);
-	}
-	
-	public TextRange getJoinFetchTextRange() {
-		return getElementTextRange(EclipseLinkOrmXmlMapper.JOIN_FETCH);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOptimisticLocking.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOptimisticLocking.java
deleted file mode 100644
index 3d8a56ad11..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOptimisticLocking.java
+++ /dev/null
@@ -1,349 +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.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.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-
-import org.eclipse.jpt.core.resource.orm.XmlColumn;
-import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlOptimisticLocking#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOptimisticLocking#getCascade <em>Cascade</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOptimisticLocking#getSelectedColumns <em>Selected Columns</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.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.eclipselink.core.resource.orm.XmlOptimisticLockingType
-	 * @see #setType(XmlOptimisticLockingType)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLocking_Type()
-	 * @model
-	 * @generated
-	 */
-	public XmlOptimisticLockingType getType()
-	{
-		return type;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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.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.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.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.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.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();
-	}
-
-} // XmlOptimisticLocking
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOptimisticLockingType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOptimisticLockingType.java
deleted file mode 100644
index 0a7b985f78..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/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.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.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlPersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlPersistenceUnitMetadata.java
deleted file mode 100644
index 366f7f1c56..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlPersistenceUnitMetadata.java
+++ /dev/null
@@ -1,205 +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.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>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.2
- * @since 2.2
- *
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata#isExcludeDefaultMappings <em>Exclude Default Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitMetadata()
- * @model kind="class"
- * @generated
- */
-public class XmlPersistenceUnitMetadata extends org.eclipse.jpt.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.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.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() ? Boolean.TRUE : Boolean.FALSE;
-		}
-		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).booleanValue());
-				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();
-	}
-
-} // XmlPersistenceUnitMetadata
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlPrivateOwned.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlPrivateOwned.java
deleted file mode 100644
index bc65b16ce6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlPrivateOwned.java
+++ /dev/null
@@ -1,75 +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.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlPrivateOwned#isPrivateOwned <em>Private Owned</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.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.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlProperty.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlProperty.java
deleted file mode 100644
index 70d62856fb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlProperty.java
+++ /dev/null
@@ -1,335 +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.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.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlProperty#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty#getValueType <em>Value Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.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.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.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.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.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.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();
-	}
-
-} // XmlProperty
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlReadOnly.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlReadOnly.java
deleted file mode 100644
index 41955e16b5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlReadOnly.java
+++ /dev/null
@@ -1,75 +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.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlReadOnly#getReadOnly <em>Read Only</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.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.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.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlStoredProcedureParameter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlStoredProcedureParameter.java
deleted file mode 100644
index 95cc29090e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlStoredProcedureParameter.java
+++ /dev/null
@@ -1,548 +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.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.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getDirection <em>Direction</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getQueryParameter <em>Query Parameter</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getJdbcType <em>Jdbc Type</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getJdbcTypeName <em>Jdbc Type Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.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.eclipselink.core.resource.orm.XmlDirection
-	 * @see #setDirection(XmlDirection)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter_Direction()
-	 * @model
-	 * @generated
-	 */
-	public XmlDirection getDirection()
-	{
-		return direction;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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.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.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.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.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.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.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.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.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.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.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.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();
-	}
-
-} // XmlStoredProcedureParameter
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlStructConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlStructConverter.java
deleted file mode 100644
index 4e4d8510db..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlStructConverter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlStructConverter#getConverter <em>Converter</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverter()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlStructConverter extends XmlNamedConverter
-{
-	/**
-	 * 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverter_Converter()
-	 * @model
-	 * @generated
-	 */
-	String getConverter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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
-	 */
-	void setConverter(String value);
-
-} // XmlStructConverter
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlStructConverterImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlStructConverterImpl.java
deleted file mode 100644
index f626293a16..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlStructConverterImpl.java
+++ /dev/null
@@ -1,266 +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.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.core.resource.xml.AbstractJpaEObject;
-
-/**
- * <!-- 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 -->
- *
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverterImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlStructConverterImpl extends AbstractJpaEObject implements XmlStructConverter
-{
-	/**
-	 * 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 #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 XmlStructConverterImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_STRUCT_CONVERTER_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedConverter_Name()
-	 * @model
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverterImpl#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_CONVERTER_IMPL__NAME, oldName, name));
-	}
-
-	/**
-	 * 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverter_Converter()
-	 * @model
-	 * @generated
-	 */
-	public String getConverter()
-	{
-		return converter;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverterImpl#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_IMPL__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_IMPL__NAME:
-				return getName();
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER_IMPL__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_IMPL__NAME:
-				setName((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER_IMPL__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_IMPL__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER_IMPL__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_IMPL__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER_IMPL__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(" (name: ");
-		result.append(name);
-		result.append(", converter: ");
-		result.append(converter);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlStructConverter
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTimeOfDay.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTimeOfDay.java
deleted file mode 100644
index 9244f42a4a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTimeOfDay.java
+++ /dev/null
@@ -1,411 +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.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.core.resource.xml.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlTimeOfDay#getHour <em>Hour</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTimeOfDay#getMinute <em>Minute</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTimeOfDay#getSecond <em>Second</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTimeOfDay#getMillisecond <em>Millisecond</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.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.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.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.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.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.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.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.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.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();
-	}
-
-} // XmlTimeOfDay
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTransformation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTransformation.java
deleted file mode 100644
index 5f7dbcb993..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTransformation.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Transformation</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.eclipselink.core.resource.orm.XmlTransformation#getProperties <em>Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransformation()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlTransformation extends XmlAttributeMapping, XmlAccessMethodsHolder
-{
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransformation_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlProperty> getProperties();
-} // XmlTransformation
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTransformationImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTransformationImpl.java
deleted file mode 100644
index 542ccead94..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTransformationImpl.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jpt.core.resource.orm.AbstractXmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransformationImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlTransformationImpl extends AbstractXmlAttributeMapping implements XmlTransformation
-{
-	/**
-	 * 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 XmlTransformationImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_TRANSFORMATION_IMPL;
-	}
-	
-	/**
-	 * 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.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_IMPL__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformationImpl#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_IMPL__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_TRANSFORMATION_IMPL__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_IMPL__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.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransformation_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_TRANSFORMATION_IMPL__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_IMPL__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION_IMPL__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_IMPL__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION_IMPL__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_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION_IMPL__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_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION_IMPL__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_IMPL__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION_IMPL__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_TRANSFORMATION_IMPL__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlTransformation.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_TRANSFORMATION_IMPL__PROPERTIES: return EclipseLinkOrmPackage.XML_TRANSFORMATION__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_TRANSFORMATION_IMPL__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlTransformation.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_TRANSFORMATION__PROPERTIES: return EclipseLinkOrmPackage.XML_TRANSFORMATION_IMPL__PROPERTIES;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	public String getMappingKey() {
-		return EclipseLinkMappingKeys.TRANSFORMATION_ATTRIBUTE_MAPPING_KEY;
-	}
-} // XmlTransformationImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTypeConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTypeConverter.java
deleted file mode 100644
index 0961865166..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTypeConverter.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.XmlTypeConverter#getDataType <em>Data Type</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter#getObjectType <em>Object Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlTypeConverter extends XmlNamedConverter
-{
-	/**
-	 * 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter_DataType()
-	 * @model
-	 * @generated
-	 */
-	String getDataType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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
-	 */
-	void setDataType(String value);
-
-	/**
-	 * 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter_ObjectType()
-	 * @model
-	 * @generated
-	 */
-	String getObjectType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.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
-	 */
-	void setObjectType(String value);
-
-} // XmlTypeConverter
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTypeConverterImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTypeConverterImpl.java
deleted file mode 100644
index 382dfa0e0a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTypeConverterImpl.java
+++ /dev/null
@@ -1,333 +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.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.core.resource.xml.AbstractJpaEObject;
-
-/**
- * <!-- 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 -->
- *
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverterImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlTypeConverterImpl extends AbstractJpaEObject implements XmlTypeConverter
-{
-	/**
-	 * 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 #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 XmlTypeConverterImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_TYPE_CONVERTER_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedConverter_Name()
-	 * @model
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverterImpl#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_TYPE_CONVERTER_IMPL__NAME, oldName, name));
-	}
-
-	/**
-	 * 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter_DataType()
-	 * @model
-	 * @generated
-	 */
-	public String getDataType()
-	{
-		return dataType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverterImpl#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_IMPL__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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter_ObjectType()
-	 * @model
-	 * @generated
-	 */
-	public String getObjectType()
-	{
-		return objectType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverterImpl#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_IMPL__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_IMPL__NAME:
-				return getName();
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__DATA_TYPE:
-				return getDataType();
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__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_IMPL__NAME:
-				setName((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__DATA_TYPE:
-				setDataType((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__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_IMPL__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__DATA_TYPE:
-				setDataType(DATA_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__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_IMPL__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__DATA_TYPE:
-				return DATA_TYPE_EDEFAULT == null ? dataType != null : !DATA_TYPE_EDEFAULT.equals(dataType);
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__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(" (name: ");
-		result.append(name);
-		result.append(", dataType: ");
-		result.append(dataType);
-		result.append(", objectType: ");
-		result.append(objectType);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlTypeConverter
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVariableOneToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVariableOneToOne.java
deleted file mode 100644
index fd53b42636..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVariableOneToOne.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.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Variable 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.2
- * @since 2.2
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOne#getProperties <em>Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVariableOneToOne()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlVariableOneToOne extends XmlAttributeMapping, XmlAccessMethodsHolder
-{
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVariableOneToOne_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlProperty> getProperties();
-
-} // XmlVariableOneToOne
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVariableOneToOneImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVariableOneToOneImpl.java
deleted file mode 100644
index 87021c921c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVariableOneToOneImpl.java
+++ /dev/null
@@ -1,329 +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.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.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jpt.core.resource.orm.AbstractXmlAttributeMapping;
-import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-
-/**
- * <!-- 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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVariableOneToOneImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlVariableOneToOneImpl extends AbstractXmlAttributeMapping implements XmlVariableOneToOne
-{
-	/**
-	 * 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 XmlVariableOneToOneImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_VARIABLE_ONE_TO_ONE_IMPL;
-	}
-
-	/**
-	 * 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.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_IMPL__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOneImpl#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_IMPL__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL__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_IMPL__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.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVariableOneToOne_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_IMPL__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_VARIABLE_ONE_TO_ONE_IMPL__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL__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_VARIABLE_ONE_TO_ONE_IMPL__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL__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_VARIABLE_ONE_TO_ONE_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL__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_VARIABLE_ONE_TO_ONE_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL__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_VARIABLE_ONE_TO_ONE_IMPL__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL__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_VARIABLE_ONE_TO_ONE_IMPL__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlVariableOneToOne.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL__PROPERTIES: return EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__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_VARIABLE_ONE_TO_ONE_IMPL__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlVariableOneToOne.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PROPERTIES: return EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL__PROPERTIES;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	public String getMappingKey() {
-		return EclipseLinkMappingKeys.VARIABLE_ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-} // XmlVariableOneToOneImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVersion.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVersion.java
deleted file mode 100644
index 73e295a5d0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVersion.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-
-
-/**
- * <!-- 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.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion#getProperties <em>Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersion()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlVersion extends org.eclipse.jpt.core.resource.orm.XmlVersion, XmlMutable, XmlConvertibleMapping, XmlAccessMethodsHolder
-{
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersion_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlProperty> getProperties();
-} // XmlVersion
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVersionImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVersionImpl.java
deleted file mode 100644
index b6d9706180..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVersionImpl.java
+++ /dev/null
@@ -1,859 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkOrmXmlMapper;
-
-/**
- * <!-- 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.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersionImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlVersionImpl extends org.eclipse.jpt.core.resource.orm.XmlVersionImpl implements XmlVersion
-{
-	/**
-	 * 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;
-
-	/**
-	 * 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 XmlVersionImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_VERSION_IMPL;
-	}
-
-	/**
-	 * 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.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.eclipselink.core.resource.orm.XmlVersionImpl#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_IMPL__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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertibleMapping_Convert()
-	 * @model
-	 * @generated
-	 */
-	public String getConvert()
-	{
-		return convert;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersionImpl#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_IMPL__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.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_IMPL__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersionImpl#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_IMPL__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VERSION_IMPL__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_IMPL__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.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.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersion_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_VERSION_IMPL__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.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_IMPL__CONVERTER, oldConverter, newConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersionImpl#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_IMPL__CONVERTER, null, msgs);
-			if (newConverter != null)
-				msgs = ((InternalEObject)newConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERTER, null, msgs);
-			msgs = basicSetConverter(newConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VERSION_IMPL__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.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_IMPL__TYPE_CONVERTER, oldTypeConverter, newTypeConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersionImpl#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_IMPL__TYPE_CONVERTER, null, msgs);
-			if (newTypeConverter != null)
-				msgs = ((InternalEObject)newTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VERSION_IMPL__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_IMPL__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.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_IMPL__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.eclipselink.core.resource.orm.XmlVersionImpl#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_IMPL__OBJECT_TYPE_CONVERTER, null, msgs);
-			if (newObjectTypeConverter != null)
-				msgs = ((InternalEObject)newObjectTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VERSION_IMPL__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_IMPL__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.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_IMPL__STRUCT_CONVERTER, oldStructConverter, newStructConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersionImpl#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_IMPL__STRUCT_CONVERTER, null, msgs);
-			if (newStructConverter != null)
-				msgs = ((InternalEObject)newStructConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VERSION_IMPL__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_IMPL__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_IMPL__CONVERTER:
-				return basicSetConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__TYPE_CONVERTER:
-				return basicSetTypeConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__OBJECT_TYPE_CONVERTER:
-				return basicSetObjectTypeConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__STRUCT_CONVERTER:
-				return basicSetStructConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__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_VERSION_IMPL__MUTABLE:
-				return getMutable();
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERTER:
-				return getConverter();
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__TYPE_CONVERTER:
-				return getTypeConverter();
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__OBJECT_TYPE_CONVERTER:
-				return getObjectTypeConverter();
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__STRUCT_CONVERTER:
-				return getStructConverter();
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT:
-				return getConvert();
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__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_VERSION_IMPL__MUTABLE:
-				setMutable((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERTER:
-				setConverter((XmlConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__TYPE_CONVERTER:
-				setTypeConverter((XmlTypeConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__OBJECT_TYPE_CONVERTER:
-				setObjectTypeConverter((XmlObjectTypeConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__STRUCT_CONVERTER:
-				setStructConverter((XmlStructConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT:
-				setConvert((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__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_VERSION_IMPL__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERTER:
-				setConverter((XmlConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__TYPE_CONVERTER:
-				setTypeConverter((XmlTypeConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__OBJECT_TYPE_CONVERTER:
-				setObjectTypeConverter((XmlObjectTypeConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__STRUCT_CONVERTER:
-				setStructConverter((XmlStructConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT:
-				setConvert(CONVERT_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__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_VERSION_IMPL__MUTABLE:
-				return MUTABLE_EDEFAULT == null ? mutable != null : !MUTABLE_EDEFAULT.equals(mutable);
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERTER:
-				return converter != null;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__TYPE_CONVERTER:
-				return typeConverter != null;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__OBJECT_TYPE_CONVERTER:
-				return objectTypeConverter != null;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__STRUCT_CONVERTER:
-				return structConverter != null;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT:
-				return CONVERT_EDEFAULT == null ? convert != null : !CONVERT_EDEFAULT.equals(convert);
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__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 == XmlMutable.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VERSION_IMPL__MUTABLE: return EclipseLinkOrmPackage.XML_MUTABLE__MUTABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConverterHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER;
-				case EclipseLinkOrmPackage.XML_VERSION_IMPL__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_VERSION_IMPL__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_VERSION_IMPL__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertibleMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT: return EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VERSION_IMPL__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlVersion.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VERSION_IMPL__PROPERTIES: return EclipseLinkOrmPackage.XML_VERSION__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 == XmlMutable.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MUTABLE__MUTABLE: return EclipseLinkOrmPackage.XML_VERSION_IMPL__MUTABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConverterHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_VERSION_IMPL__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_VERSION_IMPL__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_VERSION_IMPL__STRUCT_CONVERTER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertibleMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT: return EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_VERSION_IMPL__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlVersion.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VERSION__PROPERTIES: return EclipseLinkOrmPackage.XML_VERSION_IMPL__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(" (mutable: ");
-		result.append(mutable);
-		result.append(", convert: ");
-		result.append(convert);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getMutableTextRange() {
-		return getAttributeTextRange(EclipseLinkOrmXmlMapper.MUTABLE);
-	}
-	
-	public TextRange getConvertTextRange() {
-		return getElementTextRange(EclipseLinkOrmXmlMapper.CONVERT);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLink1_1OrmXmlMapper.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLink1_1OrmXmlMapper.java
deleted file mode 100644
index c87aff045f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLink1_1OrmXmlMapper.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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkOrmXmlMapper;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage;
-
-public interface EclipseLink1_1OrmXmlMapper
-	extends EclipseLinkOrmXmlMapper
-{
-	EclipseLink1_1OrmPackage ECLIPSELINK1_1_ORM_PKG = EclipseLink1_1OrmPackage.eINSTANCE;
-	
-	String PRIMARY_KEY = "primary-key";  //$NON-NLS-1$
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkAttributesTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkAttributesTranslator.java
deleted file mode 100644
index f5e882185f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkAttributesTranslator.java
+++ /dev/null
@@ -1,100 +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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkAttributesTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkAttributesTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-	public EclipseLinkAttributesTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLinkOrmFactory.eINSTANCE.createAttributes();
-		
-	}
-	
-	@Override
-	protected Translator createIdTranslator() {
-		return new EclipseLinkIdTranslator(ID, ORM_PKG.getAttributes_Ids());
-	}
-	
-	@Override
-	protected Translator createEmbeddedIdTranslator() {
-		return new EclipseLinkEmbeddedIdTranslator(EMBEDDED_ID, ORM_PKG.getAttributes_EmbeddedIds());
-	}
-	
-	@Override
-	protected Translator createBasicTranslator() {
-		return new EclipseLinkBasicTranslator(BASIC, ORM_PKG.getAttributes_Basics());
-	}
-	
-	@Override
-	protected Translator createVersionTranslator() {
-		return new EclipseLinkVersionTranslator(VERSION, ORM_PKG.getAttributes_Versions());
-	}
-	
-	@Override
-	protected Translator createManyToOneTranslator() {
-		return new EclipseLinkManyToOneTranslator(MANY_TO_ONE, ORM_PKG.getAttributes_ManyToOnes());
-	}
-	
-	@Override
-	protected Translator createOneToOneTranslator() {
-		return new EclipseLinkOneToOneTranslator(ONE_TO_ONE, ORM_PKG.getAttributes_OneToOnes());
-	}
-	
-	@Override
-	protected Translator createOneToManyTranslator() {
-		return new EclipseLinkOneToManyTranslator(ONE_TO_MANY, ORM_PKG.getAttributes_OneToManys());
-	}
-	
-	@Override
-	protected Translator createManyToManyTranslator() {
-		return new EclipseLinkManyToManyTranslator(MANY_TO_MANY, ORM_PKG.getAttributes_ManyToManys());
-	}
-	
-	@Override
-	protected Translator createEmbeddedTranslator() {
-		return new EclipseLinkEmbeddedTranslator(EMBEDDED, ORM_PKG.getAttributes_Embeddeds());
-	}
-	
-	@Override
-	protected Translator createVariableOneToOneTranslator() {
-		return new EclipseLinkVariableOneToOneTranslator(VARIABLE_ONE_TO_ONE, ECLIPSELINK_ORM_PKG.getAttributes_VariableOneToOnes());
-	}
-
-	@Override
-	protected Translator createBasicCollectionTranslator() {
-		return new EclipseLinkBasicCollectionTranslator(BASIC_COLLECTION, ECLIPSELINK_ORM_PKG.getAttributes_BasicCollections());
-	}
-	
-	@Override
-	protected Translator createBasicMapTranslator() {
-		return new EclipseLinkBasicMapTranslator(BASIC_MAP, ECLIPSELINK_ORM_PKG.getAttributes_BasicMaps());
-	}
-	
-	@Override
-	protected Translator createTransformationTranslator() {
-		return new EclipseLinkTransformationTranslator(TRANSFORMATION, ECLIPSELINK_ORM_PKG.getAttributes_Transformations());
-	}
-	
-	@Override
-	protected Translator createTransientTranslator() {
-		return new EclipseLinkTransientTranslator(TRANSIENT, ORM_PKG.getAttributes_Transients());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkBasicCollectionTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkBasicCollectionTranslator.java
deleted file mode 100644
index 8ccd141665..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkBasicCollectionTranslator.java
+++ /dev/null
@@ -1,43 +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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkBasicCollectionTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.BasicCollectionTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-
-	public EclipseLinkBasicCollectionTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlBasicCollectionImpl();
-	}
-
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createAccessTranslator()
-		};
-	}
-	
-	protected Translator createAccessTranslator() {
-		return new Translator(ACCESS, ECLIPSELINK1_1_ORM_PKG.getXmlAttributeMapping_Access(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkBasicMapTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkBasicMapTranslator.java
deleted file mode 100644
index 0e15ad2039..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkBasicMapTranslator.java
+++ /dev/null
@@ -1,42 +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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkBasicMapTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.BasicMapTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-
-	public EclipseLinkBasicMapTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlBasicMapImpl();
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createAccessTranslator()
-		};
-	}
-	
-	protected Translator createAccessTranslator() {
-		return new Translator(ACCESS, ECLIPSELINK1_1_ORM_PKG.getXmlAttributeMapping_Access(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkBasicTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkBasicTranslator.java
deleted file mode 100644
index 8dd2bb4f79..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkBasicTranslator.java
+++ /dev/null
@@ -1,73 +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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.orm.translators.GeneratedValueTranslator;
-import org.eclipse.jpt.core.internal.resource.orm.translators.SequenceGeneratorTranslator;
-import org.eclipse.jpt.core.internal.resource.orm.translators.TableGeneratorTranslator;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkBasicTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkBasicTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-	public EclipseLinkBasicTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-		
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlBasicImpl();
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createFetchTranslator(),
-			createOptionalTranslator(),
-			createAccessTranslator(),
-			createMutableTranslator(),
-			createColumnTranslator(), 
-			createGeneratedValueTranslator(), 
-			createLobTranslator(),
-			createTemporalTranslator(),
-			createEnumeratedTranslator(),
-			createConvertTranslator(),
-			createConverterTranslator(),
-			createTypeConverterTranslator(),
-			createObjectTypeConverterTranslator(),
-			createStructConverterTranslator(),
-			createTableGeneratorTranslator(),
-			createSequenceGeneratorTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()			
-		};
-	}
-	
-	protected Translator createAccessTranslator() {
-		return new Translator(ACCESS, ECLIPSELINK1_1_ORM_PKG.getXmlAttributeMapping_Access(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createGeneratedValueTranslator() {
-		return new GeneratedValueTranslator(GENERATED_VALUE, ECLIPSELINK1_1_ORM_PKG.getXmlBasic_GeneratedValue());
-	}
-	
-	protected Translator createTableGeneratorTranslator() {
-		return new TableGeneratorTranslator(TABLE_GENERATOR, ECLIPSELINK1_1_ORM_PKG.getXmlBasic_TableGenerator());
-	}
-	
-	protected Translator createSequenceGeneratorTranslator() {
-		return new SequenceGeneratorTranslator(SEQUENCE_GENERATOR, ECLIPSELINK1_1_ORM_PKG.getXmlBasic_SequenceGenerator());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkEmbeddableTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkEmbeddableTranslator.java
deleted file mode 100644
index 6611afc5a9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkEmbeddableTranslator.java
+++ /dev/null
@@ -1,25 +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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkEmbeddableTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkEmbeddableTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-	public EclipseLinkEmbeddableTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-
-	@Override
-	protected Translator createAttributesTranslator() {
-		return new EclipseLinkAttributesTranslator(ATTRIBUTES, ORM_PKG.getXmlTypeMapping_Attributes());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkEmbeddedIdTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkEmbeddedIdTranslator.java
deleted file mode 100644
index bb064c20b2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkEmbeddedIdTranslator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009  Oracle. 
- *  All rights reserve9.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkEmbeddedIdTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkEmbeddedIdTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-	public EclipseLinkEmbeddedIdTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlEmbeddedIdImpl();
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createAccessTranslator(),
-			createAttributeOverrideTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()
-		};
-	}
-		
-	protected Translator createAccessTranslator() {
-		return new Translator(ACCESS, ECLIPSELINK1_1_ORM_PKG.getXmlAttributeMapping_Access(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkEmbeddedTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkEmbeddedTranslator.java
deleted file mode 100644
index 4724c3b781..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkEmbeddedTranslator.java
+++ /dev/null
@@ -1,43 +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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkEmbeddedTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkEmbeddedTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-	public EclipseLinkEmbeddedTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlEmbeddedImpl();
-	}
-		
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createAccessTranslator(),
-			createAttributeOverrideTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()
-		};
-	}
-	
-	protected Translator createAccessTranslator() {
-		return new Translator(ACCESS, ECLIPSELINK1_1_ORM_PKG.getXmlAttributeMapping_Access(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkEntityMappingsTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkEntityMappingsTranslator.java
deleted file mode 100644
index b5af057814..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkEntityMappingsTranslator.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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.jpt.core.resource.xml.XML;
-import org.eclipse.wst.common.internal.emf.resource.ConstantAttributeTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkEntityMappingsTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkEntityMappingsTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-	public static EclipseLinkEntityMappingsTranslator INSTANCE = new EclipseLinkEntityMappingsTranslator();
-	
-	
-	public EclipseLinkEntityMappingsTranslator() {
-		super(ENTITY_MAPPINGS, ECLIPSELINK1_1_ORM_PKG.getXmlEntityMappings());
-	}
-	
-	@Override
-	protected Translator createNamespaceTranslator() {
-		return new ConstantAttributeTranslator(XML.NAMESPACE, ECLIPSELINK_ORM_NS_URL);
-	}
-	
-	@Override
-	protected Translator createSchemaLocationTranslator() {
-		return new ConstantAttributeTranslator(XML.XSI_SCHEMA_LOCATION, ECLIPSELINK_ORM_NS_URL + ' ' + ECLIPSELINK_ORM_SCHEMA_LOC_1_1);
-	}
-	
-	@Override
-	protected Translator createEmbeddableTranslator() {
-		return new EclipseLinkEmbeddableTranslator(EMBEDDABLE, ORM_PKG.getXmlEntityMappings_Embeddables());
-	}
-	
-	@Override
-	protected Translator createEntityTranslator() {
-		return new EclipseLinkEntityTranslator(ENTITY, ORM_PKG.getXmlEntityMappings_Entities());
-	}
-	
-	@Override
-	protected Translator createMappedSuperclassTranslator() {
-		return new EclipseLinkMappedSuperclassTranslator(MAPPED_SUPERCLASS, ORM_PKG.getXmlEntityMappings_MappedSuperclasses());
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkEntityTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkEntityTranslator.java
deleted file mode 100644
index 1cb55e6acb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkEntityTranslator.java
+++ /dev/null
@@ -1,85 +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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkEntityTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkEntityTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-	public EclipseLinkEntityTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createClassTranslator(),
-			createAccessTranslator(),
-			createMetadataCompleteTranslator(),
-			createReadOnlyTranslator(),
-			createExistenceCheckingTranslator(),
-			createExcludeDefaultMappingsTranslator(),
-			createDescriptionTranslator(),
-			createCustomizerTranslator(),
-			createChangeTrackingTranslator(),
-			createTableTranslator(),
-			createSecondaryTableTranslator(),
-			createPrimaryKeyJoinColumnTranslator(),
-			createIdClassTranslator(),
-			createPrimaryKeyTranslator(),
-			createInheritanceTranslator(),
-			createDiscriminatorValueTranslator(),
-			createDiscriminatorColumnTranslator(),
-			createOptimisticLockingTranslator(),
-			createCacheTranslator(),
-			createConverterTranslator(),
-			createTypeConverterTranslator(),
-			createObjectTypeConverterTranslator(),
-			createStructConverterTranslator(),
-			createCopyPolicyTranslator(),
-			createInstantiationCopyPolicyTranslator(),
-			createCloneCopyPolicyTranslator(),
-			createSequenceGeneratorTranslator(),
-			createTableGeneratorTranslator(),
-			createNamedQueryTranslator(),
-			createNamedNativeQueryTranslator(),
-			createNamedStoredProcedureQueryTranslator(),
-			createSqlResultSetMappingTranslator(),
-			createExcludeDefaultListenersTranslator(),
-			createExcludeSuperclassListenersTranslator(),
-			createEntityListenersTranslator(),
-			createPrePersistTranslator(),
-			createPostPersistTranslator(),
-			createPreRemoveTranslator(),
-			createPostRemoveTranslator(),
-			createPreUpdateTranslator(),
-			createPostUpdateTranslator(),
-			createPostLoadTranslator(),
-			createPropertyTranslator(),
-			createAttributeOverrideTranslator(),
-			createAssociationOverrideTranslator(),
-			createAttributesTranslator(),
-		};
-	}
-
-	@Override
-	protected Translator createAttributesTranslator() {
-		return new EclipseLinkAttributesTranslator(ATTRIBUTES, ORM_PKG.getXmlTypeMapping_Attributes());
-	}
-	
-	//placeholder
-	protected Translator createPrimaryKeyTranslator() {
-		return new Translator(PRIMARY_KEY, (EClass) null);
-	}	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkIdTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkIdTranslator.java
deleted file mode 100644
index dbef2f3c59..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkIdTranslator.java
+++ /dev/null
@@ -1,54 +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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkIdTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkIdTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-	public EclipseLinkIdTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlIdImpl();
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createAccessTranslator(),
-			createMutableTranslator(),
-			createColumnTranslator(),
-			createGeneratedValueTranslator(),
-			createTemporalTranslator(),
-			createConvertTranslator(),
-			createConverterTranslator(),
-			createTypeConverterTranslator(),
-			createObjectTypeConverterTranslator(),
-			createStructConverterTranslator(),
-			createTableGeneratorTranslator(),
-			createSequenceGeneratorTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()
-		};
-	}
-	
-	protected Translator createAccessTranslator() {
-		return new Translator(ACCESS, ECLIPSELINK1_1_ORM_PKG.getXmlAttributeMapping_Access(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkManyToManyTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkManyToManyTranslator.java
deleted file mode 100644
index cf6ef0dc70..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkManyToManyTranslator.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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkManyToManyTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkManyToManyTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-	public EclipseLinkManyToManyTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlManyToManyImpl();
-	}
-		
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createTargetEntityTranslator(),
-			createFetchTranslator(),
-			createAccessTranslator(),
-			createMappedByTranslator(),
-			createOrderByTranslator(),
-			createMapKeyTranslator(),
-			createJoinTableTranslator(),
-			createCascadeTranslator(),
-			createJoinFetchTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()
-		};
-	}
-	protected Translator createAccessTranslator() {
-		return new Translator(ACCESS, ECLIPSELINK1_1_ORM_PKG.getXmlAttributeMapping_Access(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkManyToOneTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkManyToOneTranslator.java
deleted file mode 100644
index 09ce5b6074..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkManyToOneTranslator.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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkManyToOneTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkManyToOneTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-	public EclipseLinkManyToOneTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlManyToOneImpl();
-	}
-		
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createTargetEntityTranslator(),
-			createFetchTranslator(),
-			createOptionalTranslator(),
-			createAccessTranslator(),
-			createJoinColumnTranslator(),
-			createJoinTableTranslator(),
-			createCascadeTranslator(),
-			createJoinFetchTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()
-		};
-	}
-	
-	protected Translator createAccessTranslator() {
-		return new Translator(ACCESS, ECLIPSELINK1_1_ORM_PKG.getXmlAttributeMapping_Access(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkMappedSuperclassTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkMappedSuperclassTranslator.java
deleted file mode 100644
index 2d4f7fa178..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkMappedSuperclassTranslator.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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkMappedSuperclassTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkMappedSuperclassTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-	public EclipseLinkMappedSuperclassTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createClassTranslator(),
-			createAccessTranslator(),
-			createMetadataCompleteTranslator(),
-			createReadOnlyTranslator(),
-			createExistenceCheckingTranslator(),
-			createExcludeDefaultMappingsTranslator(),
-			createDescriptionTranslator(),
-			createCustomizerTranslator(),
-			createChangeTrackingTranslator(),
-			createIdClassTranslator(),
-			createPrimaryKeyTranslator(),
-			createOptimisticLockingTranslator(),
-			createCacheTranslator(),
-			createConverterTranslator(),
-			createTypeConverterTranslator(),
-			createObjectTypeConverterTranslator(),
-			createStructConverterTranslator(),
-			createCopyPolicyTranslator(),
-			createInstantiationCopyPolicyTranslator(),
-			createCloneCopyPolicyTranslator(),
-			createExcludeDefaultListenersTranslator(),
-			createExcludeSuperclassListenersTranslator(),
-			createEntityListenersTranslator(),
-			createPrePersistTranslator(),
-			createPostPersistTranslator(),
-			createPreRemoveTranslator(),
-			createPostRemoveTranslator(),
-			createPreUpdateTranslator(),
-			createPostUpdateTranslator(),
-			createPostLoadTranslator(),
-			createPropertyTranslator(),
-			createAttributesTranslator()
-		};
-	}
-	
-	@Override
-	protected Translator createAttributesTranslator() {
-		return new EclipseLinkAttributesTranslator(ATTRIBUTES, ORM_PKG.getXmlTypeMapping_Attributes());
-	}
-	
-	//placeholder
-	protected Translator createPrimaryKeyTranslator() {
-		return new Translator(PRIMARY_KEY, (EClass) null);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkOneToManyTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkOneToManyTranslator.java
deleted file mode 100644
index b4eccb068a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkOneToManyTranslator.java
+++ /dev/null
@@ -1,53 +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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkOneToManyTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkOneToManyTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-	public EclipseLinkOneToManyTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlOneToManyImpl();
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createTargetEntityTranslator(),
-			createFetchTranslator(),
-			createAccessTranslator(),
-			createMappedByTranslator(),
-			createOrderByTranslator(),
-			createMapKeyTranslator(),
-			createJoinTableTranslator(),
-			createJoinColumnTranslator(),
-			createCascadeTranslator(),
-			createPrivateOwnedTranslator(),
-			createJoinFetchTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()
-		};
-	}
-	
-	protected Translator createAccessTranslator() {
-		return new Translator(ACCESS, ECLIPSELINK1_1_ORM_PKG.getXmlAttributeMapping_Access(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkOneToOneTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkOneToOneTranslator.java
deleted file mode 100644
index 9eec925093..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkOneToOneTranslator.java
+++ /dev/null
@@ -1,54 +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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkOneToOneTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkOneToOneTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-	public EclipseLinkOneToOneTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlOneToOneImpl();
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createTargetEntityTranslator(),
-			createFetchTranslator(),
-			createOptionalTranslator(),
-			createAccessTranslator(),
-			createMappedByTranslator(),
-			createPrimaryKeyJoinColumnTranslator(),
-			createJoinColumnTranslator(),
-			createJoinTableTranslator(),
-			createCascadeTranslator(),
-			createPrivateOwnedTranslator(),
-			createJoinFetchTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()
-		};
-	}
-	
-	protected Translator createAccessTranslator() {
-		return new Translator(ACCESS, ECLIPSELINK1_1_ORM_PKG.getXmlAttributeMapping_Access(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkTransformationTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkTransformationTranslator.java
deleted file mode 100644
index bdaf8fb9d5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkTransformationTranslator.java
+++ /dev/null
@@ -1,50 +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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkTransformationTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.TransformationTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-
-	public EclipseLinkTransformationTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlTransformationImpl();
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-//			createFetchTranslator(),
-//			createOptionalTranslator(),
-			createAccessTranslator(),
-//			createMutableTranslator(),
-//			createReadTransformerTranslator(),
-//			createWriteTransformerTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()
-		};
-	}
-	
-	protected Translator createAccessTranslator() {
-		return new Translator(ACCESS, ECLIPSELINK1_1_ORM_PKG.getXmlAttributeMapping_Access(), DOM_ATTRIBUTE);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkTransientTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkTransientTranslator.java
deleted file mode 100644
index 27ae535390..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkTransientTranslator.java
+++ /dev/null
@@ -1,41 +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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkTransientTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkBasicTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-	public EclipseLinkTransientTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-		
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlTransientImpl();
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator()
-		};
-	}
-	
-	@Override
-	protected Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlAttributeMapping_Name(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkVariableOneToOneTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkVariableOneToOneTranslator.java
deleted file mode 100644
index 3a9b7543f5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkVariableOneToOneTranslator.java
+++ /dev/null
@@ -1,42 +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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkVariableOneToOneTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.VariableOneToOneTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-	public EclipseLinkVariableOneToOneTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlVariableOneToOneImpl();
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createAccessTranslator()
-		};
-	}
-	//263957 - access is missing from the schema for variable 1-1, but i will just go ahead and add support
-	protected Translator createAccessTranslator() {
-		return new Translator(ACCESS, ECLIPSELINK1_1_ORM_PKG.getXmlAttributeMapping_Access(), DOM_ATTRIBUTE);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkVersionTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkVersionTranslator.java
deleted file mode 100644
index 7c6f365395..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/translators/EclipseLinkVersionTranslator.java
+++ /dev/null
@@ -1,50 +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.eclipselink1_1.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EclipseLinkVersionTranslator extends org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkVersionTranslator
-	implements EclipseLink1_1OrmXmlMapper
-{
-	public EclipseLinkVersionTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EclipseLink1_1OrmFactory.eINSTANCE.createXmlVersionImpl();
-	}
-	
-	@Override
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createMutableTranslator(),
-			createColumnTranslator(), 
-			createTemporalTranslator(),
-			createConvertTranslator(),
-			createConverterTranslator(),
-			createTypeConverterTranslator(),
-			createObjectTypeConverterTranslator(),
-			createStructConverterTranslator(),
-			createPropertyTranslator(),
-			createAccessMethodsTranslator()
-		};
-	}
-	
-	protected Translator createAccessTranslator() {
-		return new Translator(ACCESS, ECLIPSELINK1_1_ORM_PKG.getXmlAttributeMapping_Access(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/EclipseLink1_1OrmFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/EclipseLink1_1OrmFactory.java
deleted file mode 100644
index 43fab98a3f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/EclipseLink1_1OrmFactory.java
+++ /dev/null
@@ -1,289 +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.eclipselink1_1.core.resource.orm;
-
-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.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage
- * @generated
- */
-public class EclipseLink1_1OrmFactory extends EFactoryImpl
-{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final EclipseLink1_1OrmFactory eINSTANCE = init();
-
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EclipseLink1_1OrmFactory init()
-	{
-		try
-		{
-			EclipseLink1_1OrmFactory theEclipseLink1_1OrmFactory = (EclipseLink1_1OrmFactory)EPackage.Registry.INSTANCE.getEFactory("jpt.eclipselink1_1.orm.xmi"); 
-			if (theEclipseLink1_1OrmFactory != null)
-			{
-				return theEclipseLink1_1OrmFactory;
-			}
-		}
-		catch (Exception exception)
-		{
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new EclipseLink1_1OrmFactory();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseLink1_1OrmFactory()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass)
-	{
-		switch (eClass.getClassifierID())
-		{
-			case EclipseLink1_1OrmPackage.XML_ENTITY_MAPPINGS: return (EObject)createXmlEntityMappings();
-			case EclipseLink1_1OrmPackage.XML_ID_IMPL: return (EObject)createXmlIdImpl();
-			case EclipseLink1_1OrmPackage.XML_EMBEDDED_ID_IMPL: return (EObject)createXmlEmbeddedIdImpl();
-			case EclipseLink1_1OrmPackage.XML_EMBEDDED_IMPL: return (EObject)createXmlEmbeddedImpl();
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL: return (EObject)createXmlBasicImpl();
-			case EclipseLink1_1OrmPackage.XML_VERSION_IMPL: return (EObject)createXmlVersionImpl();
-			case EclipseLink1_1OrmPackage.XML_ONE_TO_ONE_IMPL: return (EObject)createXmlOneToOneImpl();
-			case EclipseLink1_1OrmPackage.XML_ONE_TO_MANY_IMPL: return (EObject)createXmlOneToManyImpl();
-			case EclipseLink1_1OrmPackage.XML_MANY_TO_ONE_IMPL: return (EObject)createXmlManyToOneImpl();
-			case EclipseLink1_1OrmPackage.XML_MANY_TO_MANY_IMPL: return (EObject)createXmlManyToManyImpl();
-			case EclipseLink1_1OrmPackage.XML_BASIC_COLLECTION_IMPL: return (EObject)createXmlBasicCollectionImpl();
-			case EclipseLink1_1OrmPackage.XML_BASIC_MAP_IMPL: return (EObject)createXmlBasicMapImpl();
-			case EclipseLink1_1OrmPackage.XML_TRANSFORMATION_IMPL: return (EObject)createXmlTransformationImpl();
-			case EclipseLink1_1OrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL: return (EObject)createXmlVariableOneToOneImpl();
-			case EclipseLink1_1OrmPackage.XML_TRANSIENT_IMPL: return (EObject)createXmlTransientImpl();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlEntityMappings createXmlEntityMappings()
-	{
-		XmlEntityMappings xmlEntityMappings = new XmlEntityMappings();
-		return xmlEntityMappings;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlIdImpl createXmlIdImpl()
-	{
-		XmlIdImpl xmlIdImpl = new XmlIdImpl();
-		return xmlIdImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlEmbeddedIdImpl createXmlEmbeddedIdImpl()
-	{
-		XmlEmbeddedIdImpl xmlEmbeddedIdImpl = new XmlEmbeddedIdImpl();
-		return xmlEmbeddedIdImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlEmbeddedImpl createXmlEmbeddedImpl()
-	{
-		XmlEmbeddedImpl xmlEmbeddedImpl = new XmlEmbeddedImpl();
-		return xmlEmbeddedImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlBasicImpl createXmlBasicImpl()
-	{
-		XmlBasicImpl xmlBasicImpl = new XmlBasicImpl();
-		return xmlBasicImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlVersionImpl createXmlVersionImpl()
-	{
-		XmlVersionImpl xmlVersionImpl = new XmlVersionImpl();
-		return xmlVersionImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlOneToOneImpl createXmlOneToOneImpl()
-	{
-		XmlOneToOneImpl xmlOneToOneImpl = new XmlOneToOneImpl();
-		return xmlOneToOneImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlOneToManyImpl createXmlOneToManyImpl()
-	{
-		XmlOneToManyImpl xmlOneToManyImpl = new XmlOneToManyImpl();
-		return xmlOneToManyImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlManyToOneImpl createXmlManyToOneImpl()
-	{
-		XmlManyToOneImpl xmlManyToOneImpl = new XmlManyToOneImpl();
-		return xmlManyToOneImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlManyToManyImpl createXmlManyToManyImpl()
-	{
-		XmlManyToManyImpl xmlManyToManyImpl = new XmlManyToManyImpl();
-		return xmlManyToManyImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlBasicCollectionImpl createXmlBasicCollectionImpl()
-	{
-		XmlBasicCollectionImpl xmlBasicCollectionImpl = new XmlBasicCollectionImpl();
-		return xmlBasicCollectionImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlBasicMapImpl createXmlBasicMapImpl()
-	{
-		XmlBasicMapImpl xmlBasicMapImpl = new XmlBasicMapImpl();
-		return xmlBasicMapImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlTransformationImpl createXmlTransformationImpl()
-	{
-		XmlTransformationImpl xmlTransformationImpl = new XmlTransformationImpl();
-		return xmlTransformationImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlVariableOneToOneImpl createXmlVariableOneToOneImpl()
-	{
-		XmlVariableOneToOneImpl xmlVariableOneToOneImpl = new XmlVariableOneToOneImpl();
-		return xmlVariableOneToOneImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlTransientImpl createXmlTransientImpl()
-	{
-		XmlTransientImpl xmlTransientImpl = new XmlTransientImpl();
-		return xmlTransientImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseLink1_1OrmPackage getEclipseLink1_1OrmPackage()
-	{
-		return (EclipseLink1_1OrmPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static EclipseLink1_1OrmPackage getPackage()
-	{
-		return EclipseLink1_1OrmPackage.eINSTANCE;
-	}
-
-} //EclipseLink1_1OrmFactory
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/EclipseLink1_1OrmPackage.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/EclipseLink1_1OrmPackage.java
deleted file mode 100644
index cc471c91c0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/EclipseLink1_1OrmPackage.java
+++ /dev/null
@@ -1,4509 +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.eclipselink1_1.core.resource.orm;
-
-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.jpt.core.resource.orm.OrmPackage;
-
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
-
-/**
- * <!-- 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.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory
- * @model kind="package"
- * @generated
- */
-public class EclipseLink1_1OrmPackage 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.eclipselink1_1.orm.xmi";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNS_PREFIX = "org.eclipse.jpt.eclipselink1_1.core.resource.orm";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final EclipseLink1_1OrmPackage eINSTANCE = org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntityMappings
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEntityMappings()
-	 * @generated
-	 */
-	public static final int XML_ENTITY_MAPPINGS = 0;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__VERSION;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__CATALOG;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TABLE_GENERATORS;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__EMBEDDABLES;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TYPE_CONVERTERS;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__OBJECT_TYPE_CONVERTERS;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__STRUCT_CONVERTERS;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping()
-	 * @generated
-	 */
-	public static final int XML_ATTRIBUTE_MAPPING = 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_ATTRIBUTE_MAPPING__NAME = OrmPackage.XML_ATTRIBUTE_MAPPING__NAME;
-
-	/**
-	 * 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_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlId <em>Xml Id</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlId
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlId()
-	 * @generated
-	 */
-	public static final int XML_ID = 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_ID__NAME = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.XML_ID__ENUMERATED;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ID__GENERATED_VALUE;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ID__TABLE_GENERATOR;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ID__SEQUENCE_GENERATOR;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ID__MUTABLE;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ID__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_ID__TYPE_CONVERTER = EclipseLinkOrmPackage.XML_ID__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_ID__OBJECT_TYPE_CONVERTER = EclipseLinkOrmPackage.XML_ID__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_ID__STRUCT_CONVERTER = EclipseLinkOrmPackage.XML_ID__STRUCT_CONVERTER;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ID__CONVERT;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ID__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_ID__PROPERTIES = EclipseLinkOrmPackage.XML_ID__PROPERTIES;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ID_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ID_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlIdImpl <em>Xml Id Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlIdImpl
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlIdImpl()
-	 * @generated
-	 */
-	public static final int XML_ID_IMPL = 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID_IMPL__NAME = EclipseLinkOrmPackage.XML_ID_IMPL__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_IMPL__COLUMN = EclipseLinkOrmPackage.XML_ID_IMPL__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_IMPL__LOB = EclipseLinkOrmPackage.XML_ID_IMPL__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_IMPL__TEMPORAL = EclipseLinkOrmPackage.XML_ID_IMPL__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_IMPL__ENUMERATED = EclipseLinkOrmPackage.XML_ID_IMPL__ENUMERATED;
-
-	/**
-	 * 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_IMPL__GENERATED_VALUE = EclipseLinkOrmPackage.XML_ID_IMPL__GENERATED_VALUE;
-
-	/**
-	 * 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_IMPL__TABLE_GENERATOR = EclipseLinkOrmPackage.XML_ID_IMPL__TABLE_GENERATOR;
-
-	/**
-	 * 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_IMPL__SEQUENCE_GENERATOR = EclipseLinkOrmPackage.XML_ID_IMPL__SEQUENCE_GENERATOR;
-
-	/**
-	 * 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_IMPL__MUTABLE = EclipseLinkOrmPackage.XML_ID_IMPL__MUTABLE;
-
-	/**
-	 * 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_IMPL__CONVERTER = EclipseLinkOrmPackage.XML_ID_IMPL__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_ID_IMPL__TYPE_CONVERTER = EclipseLinkOrmPackage.XML_ID_IMPL__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_ID_IMPL__OBJECT_TYPE_CONVERTER = EclipseLinkOrmPackage.XML_ID_IMPL__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_ID_IMPL__STRUCT_CONVERTER = EclipseLinkOrmPackage.XML_ID_IMPL__STRUCT_CONVERTER;
-
-	/**
-	 * 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_IMPL__CONVERT = EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT;
-
-	/**
-	 * 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_IMPL__ACCESS_METHODS = EclipseLinkOrmPackage.XML_ID_IMPL__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_ID_IMPL__PROPERTIES = EclipseLinkOrmPackage.XML_ID_IMPL__PROPERTIES;
-
-	/**
-	 * 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_IMPL__ACCESS = EclipseLinkOrmPackage.XML_ID_IMPL_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Id Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID_IMPL_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ID_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedId
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddedId()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDED_ID = 4;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.XML_EMBEDDED_ID__ATTRIBUTE_OVERRIDES;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_EMBEDDED_ID__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_EMBEDDED_ID__PROPERTIES = EclipseLinkOrmPackage.XML_EMBEDDED_ID__PROPERTIES;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_EMBEDDED_ID_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_EMBEDDED_ID_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedIdImpl <em>Xml Embedded Id Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedIdImpl
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddedIdImpl()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDED_ID_IMPL = 5;
-
-	/**
-	 * 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_IMPL__NAME = EclipseLinkOrmPackage.XML_EMBEDDED_ID_IMPL__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_IMPL__ATTRIBUTE_OVERRIDES = EclipseLinkOrmPackage.XML_EMBEDDED_ID_IMPL__ATTRIBUTE_OVERRIDES;
-
-	/**
-	 * 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_IMPL__ACCESS_METHODS = EclipseLinkOrmPackage.XML_EMBEDDED_ID_IMPL__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_EMBEDDED_ID_IMPL__PROPERTIES = EclipseLinkOrmPackage.XML_EMBEDDED_ID_IMPL__PROPERTIES;
-
-	/**
-	 * 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_IMPL__ACCESS = EclipseLinkOrmPackage.XML_EMBEDDED_ID_IMPL_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Embedded Id Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED_ID_IMPL_FEATURE_COUNT = EclipseLinkOrmPackage.XML_EMBEDDED_ID_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbedded
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbedded()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDED = 6;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.XML_EMBEDDED__ATTRIBUTE_OVERRIDES;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_EMBEDDED__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_EMBEDDED__PROPERTIES = EclipseLinkOrmPackage.XML_EMBEDDED__PROPERTIES;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_EMBEDDED_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_EMBEDDED_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedImpl <em>Xml Embedded Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedImpl
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddedImpl()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDED_IMPL = 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_EMBEDDED_IMPL__NAME = EclipseLinkOrmPackage.XML_EMBEDDED_IMPL__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_IMPL__ATTRIBUTE_OVERRIDES = EclipseLinkOrmPackage.XML_EMBEDDED_IMPL__ATTRIBUTE_OVERRIDES;
-
-	/**
-	 * 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_IMPL__ACCESS_METHODS = EclipseLinkOrmPackage.XML_EMBEDDED_IMPL__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_EMBEDDED_IMPL__PROPERTIES = EclipseLinkOrmPackage.XML_EMBEDDED_IMPL__PROPERTIES;
-
-	/**
-	 * 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_IMPL__ACCESS = EclipseLinkOrmPackage.XML_EMBEDDED_IMPL_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Embedded Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED_IMPL_FEATURE_COUNT = EclipseLinkOrmPackage.XML_EMBEDDED_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic <em>Xml Basic</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasic()
-	 * @generated
-	 */
-	public static final int XML_BASIC = 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_BASIC__NAME = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.XML_BASIC__OPTIONAL;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_BASIC__MUTABLE;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_BASIC__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_BASIC__TYPE_CONVERTER = EclipseLinkOrmPackage.XML_BASIC__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_BASIC__OBJECT_TYPE_CONVERTER = EclipseLinkOrmPackage.XML_BASIC__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_BASIC__STRUCT_CONVERTER = EclipseLinkOrmPackage.XML_BASIC__STRUCT_CONVERTER;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_BASIC__CONVERT;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_BASIC__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_BASIC__PROPERTIES = EclipseLinkOrmPackage.XML_BASIC__PROPERTIES;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_BASIC_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_BASIC_FEATURE_COUNT + 1;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_BASIC_FEATURE_COUNT + 2;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_BASIC_FEATURE_COUNT + 3;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_BASIC_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicImpl <em>Xml Basic Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicImpl
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicImpl()
-	 * @generated
-	 */
-	public static final int XML_BASIC_IMPL = 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_BASIC_IMPL__NAME = EclipseLinkOrmPackage.XML_BASIC_IMPL__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_IMPL__COLUMN = EclipseLinkOrmPackage.XML_BASIC_IMPL__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_IMPL__LOB = EclipseLinkOrmPackage.XML_BASIC_IMPL__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_IMPL__TEMPORAL = EclipseLinkOrmPackage.XML_BASIC_IMPL__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_IMPL__ENUMERATED = EclipseLinkOrmPackage.XML_BASIC_IMPL__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_IMPL__FETCH = EclipseLinkOrmPackage.XML_BASIC_IMPL__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_IMPL__OPTIONAL = EclipseLinkOrmPackage.XML_BASIC_IMPL__OPTIONAL;
-
-	/**
-	 * 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_IMPL__MUTABLE = EclipseLinkOrmPackage.XML_BASIC_IMPL__MUTABLE;
-
-	/**
-	 * 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_IMPL__CONVERTER = EclipseLinkOrmPackage.XML_BASIC_IMPL__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_BASIC_IMPL__TYPE_CONVERTER = EclipseLinkOrmPackage.XML_BASIC_IMPL__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_BASIC_IMPL__OBJECT_TYPE_CONVERTER = EclipseLinkOrmPackage.XML_BASIC_IMPL__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_BASIC_IMPL__STRUCT_CONVERTER = EclipseLinkOrmPackage.XML_BASIC_IMPL__STRUCT_CONVERTER;
-
-	/**
-	 * 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_IMPL__CONVERT = EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT;
-
-	/**
-	 * 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_IMPL__ACCESS_METHODS = EclipseLinkOrmPackage.XML_BASIC_IMPL__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_BASIC_IMPL__PROPERTIES = EclipseLinkOrmPackage.XML_BASIC_IMPL__PROPERTIES;
-
-	/**
-	 * 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_IMPL__ACCESS = EclipseLinkOrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 0;
-
-	/**
-	 * 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_IMPL__GENERATED_VALUE = EclipseLinkOrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * 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_IMPL__TABLE_GENERATOR = EclipseLinkOrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 2;
-
-	/**
-	 * 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_IMPL__SEQUENCE_GENERATOR = EclipseLinkOrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Xml Basic Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_IMPL_FEATURE_COUNT = EclipseLinkOrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersion <em>Xml Version</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersion
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlVersion()
-	 * @generated
-	 */
-	public static final int XML_VERSION = 10;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.XML_VERSION__ENUMERATED;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_VERSION__MUTABLE;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_VERSION__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_VERSION__TYPE_CONVERTER = EclipseLinkOrmPackage.XML_VERSION__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_VERSION__OBJECT_TYPE_CONVERTER = EclipseLinkOrmPackage.XML_VERSION__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_VERSION__STRUCT_CONVERTER = EclipseLinkOrmPackage.XML_VERSION__STRUCT_CONVERTER;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_VERSION__CONVERT;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_VERSION__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_VERSION__PROPERTIES = EclipseLinkOrmPackage.XML_VERSION__PROPERTIES;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_VERSION_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_VERSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersionImpl <em>Xml Version Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersionImpl
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlVersionImpl()
-	 * @generated
-	 */
-	public static final int XML_VERSION_IMPL = 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_VERSION_IMPL__NAME = EclipseLinkOrmPackage.XML_VERSION_IMPL__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_IMPL__COLUMN = EclipseLinkOrmPackage.XML_VERSION_IMPL__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_IMPL__LOB = EclipseLinkOrmPackage.XML_VERSION_IMPL__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_IMPL__TEMPORAL = EclipseLinkOrmPackage.XML_VERSION_IMPL__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_IMPL__ENUMERATED = EclipseLinkOrmPackage.XML_VERSION_IMPL__ENUMERATED;
-
-	/**
-	 * 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_IMPL__MUTABLE = EclipseLinkOrmPackage.XML_VERSION_IMPL__MUTABLE;
-
-	/**
-	 * 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_IMPL__CONVERTER = EclipseLinkOrmPackage.XML_VERSION_IMPL__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_VERSION_IMPL__TYPE_CONVERTER = EclipseLinkOrmPackage.XML_VERSION_IMPL__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_VERSION_IMPL__OBJECT_TYPE_CONVERTER = EclipseLinkOrmPackage.XML_VERSION_IMPL__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_VERSION_IMPL__STRUCT_CONVERTER = EclipseLinkOrmPackage.XML_VERSION_IMPL__STRUCT_CONVERTER;
-
-	/**
-	 * 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_IMPL__CONVERT = EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT;
-
-	/**
-	 * 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_IMPL__ACCESS_METHODS = EclipseLinkOrmPackage.XML_VERSION_IMPL__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_VERSION_IMPL__PROPERTIES = EclipseLinkOrmPackage.XML_VERSION_IMPL__PROPERTIES;
-
-	/**
-	 * 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_IMPL__ACCESS = EclipseLinkOrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Version Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION_IMPL_FEATURE_COUNT = EclipseLinkOrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOne
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToOne()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_ONE = 12;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_COLUMNS;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_JOIN_COLUMNS;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ONE_TO_ONE__PRIVATE_OWNED;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FETCH;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ONE_TO_ONE__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_ONE_TO_ONE__PROPERTIES = EclipseLinkOrmPackage.XML_ONE_TO_ONE__PROPERTIES;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOneImpl <em>Xml One To One Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOneImpl
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToOneImpl()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_ONE_IMPL = 13;
-
-	/**
-	 * 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_IMPL__NAME = EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__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_IMPL__TARGET_ENTITY = EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__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_IMPL__FETCH = EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__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_IMPL__CASCADE = EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__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_IMPL__JOIN_TABLE = EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__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_IMPL__JOIN_COLUMNS = EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_COLUMNS;
-
-	/**
-	 * 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_IMPL__OPTIONAL = EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__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_IMPL__MAPPED_BY = EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__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_IMPL__PRIMARY_KEY_JOIN_COLUMNS = EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__PRIMARY_KEY_JOIN_COLUMNS;
-
-	/**
-	 * 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_IMPL__PRIVATE_OWNED = EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__PRIVATE_OWNED;
-
-	/**
-	 * 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_IMPL__JOIN_FETCH = EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_FETCH;
-
-	/**
-	 * 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_IMPL__ACCESS_METHODS = EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__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_ONE_TO_ONE_IMPL__PROPERTIES = EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL__PROPERTIES;
-
-	/**
-	 * 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_IMPL__ACCESS = EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml One To One Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE_IMPL_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ONE_TO_ONE_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToMany
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToMany()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_MANY = 14;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__NAME = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_TABLE;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ONE_TO_MANY__ORDER_BY;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_COLUMNS;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ONE_TO_MANY__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_ONE_TO_MANY__PROPERTIES = EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToManyImpl <em>Xml One To Many Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToManyImpl
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToManyImpl()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_MANY_IMPL = 15;
-
-	/**
-	 * 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_IMPL__NAME = EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__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_IMPL__TARGET_ENTITY = EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__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_IMPL__FETCH = EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__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_IMPL__CASCADE = EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__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_IMPL__MAPPED_BY = EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__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_IMPL__JOIN_TABLE = EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_TABLE;
-
-	/**
-	 * 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_IMPL__ORDER_BY = EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__ORDER_BY;
-
-	/**
-	 * 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_IMPL__MAP_KEY = EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__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_IMPL__JOIN_COLUMNS = EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_COLUMNS;
-
-	/**
-	 * 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_IMPL__PRIVATE_OWNED = EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__PRIVATE_OWNED;
-
-	/**
-	 * 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_IMPL__JOIN_FETCH = EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_FETCH;
-
-	/**
-	 * 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_IMPL__ACCESS_METHODS = EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__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_ONE_TO_MANY_IMPL__PROPERTIES = EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL__PROPERTIES;
-
-	/**
-	 * 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_IMPL__ACCESS = EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml One To Many Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_IMPL_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ONE_TO_MANY_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOne
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToOne()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_ONE = 16;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.XML_MANY_TO_ONE__JOIN_COLUMNS;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_MANY_TO_ONE__OPTIONAL;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_MANY_TO_ONE__JOIN_FETCH;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_MANY_TO_ONE__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_MANY_TO_ONE__PROPERTIES = EclipseLinkOrmPackage.XML_MANY_TO_ONE__PROPERTIES;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOneImpl <em>Xml Many To One Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOneImpl
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToOneImpl()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_ONE_IMPL = 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_MANY_TO_ONE_IMPL__NAME = EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__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_IMPL__TARGET_ENTITY = EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__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_IMPL__FETCH = EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__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_IMPL__CASCADE = EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__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_IMPL__JOIN_TABLE = EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__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_IMPL__JOIN_COLUMNS = EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_COLUMNS;
-
-	/**
-	 * 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_IMPL__OPTIONAL = EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__OPTIONAL;
-
-	/**
-	 * 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_IMPL__JOIN_FETCH = EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_FETCH;
-
-	/**
-	 * 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_IMPL__ACCESS_METHODS = EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__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_MANY_TO_ONE_IMPL__PROPERTIES = EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL__PROPERTIES;
-
-	/**
-	 * 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_IMPL__ACCESS = EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Many To One Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE_IMPL_FEATURE_COUNT = EclipseLinkOrmPackage.XML_MANY_TO_ONE_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToMany
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToMany()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_MANY = 18;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.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 = EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_TABLE;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_MANY_TO_MANY__ORDER_BY;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_MANY_TO_MANY__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_MANY_TO_MANY__PROPERTIES = EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToManyImpl <em>Xml Many To Many Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToManyImpl
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToManyImpl()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_MANY_IMPL = 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_MANY_TO_MANY_IMPL__NAME = EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__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_IMPL__TARGET_ENTITY = EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__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_IMPL__FETCH = EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__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_IMPL__CASCADE = EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__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_IMPL__MAPPED_BY = EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__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_IMPL__JOIN_TABLE = EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__JOIN_TABLE;
-
-	/**
-	 * 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_IMPL__ORDER_BY = EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__ORDER_BY;
-
-	/**
-	 * 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_IMPL__MAP_KEY = EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__MAP_KEY;
-
-	/**
-	 * 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_IMPL__JOIN_FETCH = EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__JOIN_FETCH;
-
-	/**
-	 * 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_IMPL__ACCESS_METHODS = EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__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_MANY_TO_MANY_IMPL__PROPERTIES = EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL__PROPERTIES;
-
-	/**
-	 * 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_IMPL__ACCESS = EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Many To Many Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_IMPL_FEATURE_COUNT = EclipseLinkOrmPackage.XML_MANY_TO_MANY_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollection <em>Xml Basic Collection</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollection
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicCollection()
-	 * @generated
-	 */
-	public static final int XML_BASIC_COLLECTION = 20;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_BASIC_COLLECTION__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 = EclipseLinkOrmPackage.XML_BASIC_COLLECTION__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_BASIC_COLLECTION__PROPERTIES = EclipseLinkOrmPackage.XML_BASIC_COLLECTION__PROPERTIES;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_BASIC_COLLECTION_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_BASIC_COLLECTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollectionImpl <em>Xml Basic Collection Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollectionImpl
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicCollectionImpl()
-	 * @generated
-	 */
-	public static final int XML_BASIC_COLLECTION_IMPL = 21;
-
-	/**
-	 * 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_IMPL__NAME = EclipseLinkOrmPackage.XML_BASIC_COLLECTION_IMPL__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_IMPL__ACCESS_METHODS = EclipseLinkOrmPackage.XML_BASIC_COLLECTION_IMPL__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_BASIC_COLLECTION_IMPL__PROPERTIES = EclipseLinkOrmPackage.XML_BASIC_COLLECTION_IMPL__PROPERTIES;
-
-	/**
-	 * 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_IMPL__ACCESS = EclipseLinkOrmPackage.XML_BASIC_COLLECTION_IMPL_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Basic Collection Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_COLLECTION_IMPL_FEATURE_COUNT = EclipseLinkOrmPackage.XML_BASIC_COLLECTION_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMap <em>Xml Basic Map</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMap
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicMap()
-	 * @generated
-	 */
-	public static final int XML_BASIC_MAP = 22;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_BASIC_MAP__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 = EclipseLinkOrmPackage.XML_BASIC_MAP__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_BASIC_MAP__PROPERTIES = EclipseLinkOrmPackage.XML_BASIC_MAP__PROPERTIES;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_BASIC_MAP_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_BASIC_MAP_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMapImpl <em>Xml Basic Map Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMapImpl
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicMapImpl()
-	 * @generated
-	 */
-	public static final int XML_BASIC_MAP_IMPL = 23;
-
-	/**
-	 * 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_IMPL__NAME = EclipseLinkOrmPackage.XML_BASIC_MAP_IMPL__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_IMPL__ACCESS_METHODS = EclipseLinkOrmPackage.XML_BASIC_MAP_IMPL__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_BASIC_MAP_IMPL__PROPERTIES = EclipseLinkOrmPackage.XML_BASIC_MAP_IMPL__PROPERTIES;
-
-	/**
-	 * 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_IMPL__ACCESS = EclipseLinkOrmPackage.XML_BASIC_MAP_IMPL_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Basic Map Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_MAP_IMPL_FEATURE_COUNT = EclipseLinkOrmPackage.XML_BASIC_MAP_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformation <em>Xml Transformation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformation
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlTransformation()
-	 * @generated
-	 */
-	public static final int XML_TRANSFORMATION = 24;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_TRANSFORMATION__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_TRANSFORMATION__ACCESS_METHODS = EclipseLinkOrmPackage.XML_TRANSFORMATION__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_TRANSFORMATION__PROPERTIES = EclipseLinkOrmPackage.XML_TRANSFORMATION__PROPERTIES;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_TRANSFORMATION_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_TRANSFORMATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformationImpl <em>Xml Transformation Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformationImpl
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlTransformationImpl()
-	 * @generated
-	 */
-	public static final int XML_TRANSFORMATION_IMPL = 25;
-
-	/**
-	 * 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_IMPL__NAME = EclipseLinkOrmPackage.XML_TRANSFORMATION_IMPL__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_TRANSFORMATION_IMPL__ACCESS_METHODS = EclipseLinkOrmPackage.XML_TRANSFORMATION_IMPL__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_TRANSFORMATION_IMPL__PROPERTIES = EclipseLinkOrmPackage.XML_TRANSFORMATION_IMPL__PROPERTIES;
-
-	/**
-	 * 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_IMPL__ACCESS = EclipseLinkOrmPackage.XML_TRANSFORMATION_IMPL_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Transformation Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TRANSFORMATION_IMPL_FEATURE_COUNT = EclipseLinkOrmPackage.XML_TRANSFORMATION_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOne <em>Xml Variable One To One</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOne
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlVariableOneToOne()
-	 * @generated
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE = 26;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__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 = EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__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_VARIABLE_ONE_TO_ONE__PROPERTIES = EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PROPERTIES;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOneImpl <em>Xml Variable One To One Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOneImpl
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlVariableOneToOneImpl()
-	 * @generated
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE_IMPL = 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_VARIABLE_ONE_TO_ONE_IMPL__NAME = EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL__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_IMPL__ACCESS_METHODS = EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL__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_VARIABLE_ONE_TO_ONE_IMPL__PROPERTIES = EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL__PROPERTIES;
-
-	/**
-	 * 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_IMPL__ACCESS = EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Variable One To One Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE_IMPL_FEATURE_COUNT = EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransient <em>Xml Transient</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransient
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlTransient()
-	 * @generated
-	 */
-	public static final int XML_TRANSIENT = 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_TRANSIENT__NAME = OrmPackage.XML_TRANSIENT__NAME;
-
-	/**
-	 * 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_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransientImpl <em>Xml Transient Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransientImpl
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlTransientImpl()
-	 * @generated
-	 */
-	public static final int XML_TRANSIENT_IMPL = 29;
-
-	/**
-	 * 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_IMPL__NAME = OrmPackage.XML_TRANSIENT_IMPL__NAME;
-
-	/**
-	 * 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_IMPL__ACCESS = OrmPackage.XML_TRANSIENT_IMPL_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Transient Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TRANSIENT_IMPL_FEATURE_COUNT = OrmPackage.XML_TRANSIENT_IMPL_FEATURE_COUNT + 1;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEntityMappingsEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlAttributeMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlIdEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlIdImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbeddedIdEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbeddedIdImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbeddedEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbeddedImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasicEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasicImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlVersionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlVersionImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOneToOneEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOneToOneImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOneToManyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOneToManyImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlManyToOneEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlManyToOneImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlManyToManyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlManyToManyImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasicCollectionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasicCollectionImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasicMapEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasicMapImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTransformationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTransformationImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlVariableOneToOneEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlVariableOneToOneImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTransientEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTransientImplEClass = 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.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private EclipseLink1_1OrmPackage()
-	{
-		super(eNS_URI, EclipseLink1_1OrmFactory.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.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static EclipseLink1_1OrmPackage init()
-	{
-		if (isInited) return (EclipseLink1_1OrmPackage)EPackage.Registry.INSTANCE.getEPackage(EclipseLink1_1OrmPackage.eNS_URI);
-
-		// Obtain or create and register package
-		EclipseLink1_1OrmPackage theEclipseLink1_1OrmPackage = (EclipseLink1_1OrmPackage)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EclipseLink1_1OrmPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EclipseLink1_1OrmPackage());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		OrmPackage.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);
-
-		// Create package meta-data objects
-		theEclipseLink1_1OrmPackage.createPackageContents();
-		theEclipseLinkOrmPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theEclipseLink1_1OrmPackage.initializePackageContents();
-		theEclipseLinkOrmPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theEclipseLink1_1OrmPackage.freeze();
-
-		return theEclipseLink1_1OrmPackage;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.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.eclipselink1_1.core.resource.orm.XmlEntityMappings
-	 * @generated
-	 */
-	public EClass getXmlEntityMappings()
-	{
-		return xmlEntityMappingsEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.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.eclipselink1_1.core.resource.orm.XmlAttributeMapping
-	 * @generated
-	 */
-	public EClass getXmlAttributeMapping()
-	{
-		return xmlAttributeMappingEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping#getAccess <em>Access</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Access</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping#getAccess()
-	 * @see #getXmlAttributeMapping()
-	 * @generated
-	 */
-	public EAttribute getXmlAttributeMapping_Access()
-	{
-		return (EAttribute)xmlAttributeMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.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.eclipselink1_1.core.resource.orm.XmlId
-	 * @generated
-	 */
-	public EClass getXmlId()
-	{
-		return xmlIdEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlIdImpl <em>Xml Id Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Id Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlIdImpl
-	 * @generated
-	 */
-	public EClass getXmlIdImpl()
-	{
-		return xmlIdImplEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.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.eclipselink1_1.core.resource.orm.XmlEmbeddedId
-	 * @generated
-	 */
-	public EClass getXmlEmbeddedId()
-	{
-		return xmlEmbeddedIdEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedIdImpl <em>Xml Embedded Id Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Embedded Id Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedIdImpl
-	 * @generated
-	 */
-	public EClass getXmlEmbeddedIdImpl()
-	{
-		return xmlEmbeddedIdImplEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.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.eclipselink1_1.core.resource.orm.XmlEmbedded
-	 * @generated
-	 */
-	public EClass getXmlEmbedded()
-	{
-		return xmlEmbeddedEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedImpl <em>Xml Embedded Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Embedded Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedImpl
-	 * @generated
-	 */
-	public EClass getXmlEmbeddedImpl()
-	{
-		return xmlEmbeddedImplEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.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.eclipselink1_1.core.resource.orm.XmlBasic
-	 * @generated
-	 */
-	public EClass getXmlBasic()
-	{
-		return xmlBasicEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic#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.eclipselink1_1.core.resource.orm.XmlBasic#getGeneratedValue()
-	 * @see #getXmlBasic()
-	 * @generated
-	 */
-	public EReference getXmlBasic_GeneratedValue()
-	{
-		return (EReference)xmlBasicEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic#getTableGenerator <em>Table Generator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Table Generator</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic#getTableGenerator()
-	 * @see #getXmlBasic()
-	 * @generated
-	 */
-	public EReference getXmlBasic_TableGenerator()
-	{
-		return (EReference)xmlBasicEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic#getSequenceGenerator <em>Sequence Generator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Sequence Generator</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic#getSequenceGenerator()
-	 * @see #getXmlBasic()
-	 * @generated
-	 */
-	public EReference getXmlBasic_SequenceGenerator()
-	{
-		return (EReference)xmlBasicEClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicImpl <em>Xml Basic Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Basic Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicImpl
-	 * @generated
-	 */
-	public EClass getXmlBasicImpl()
-	{
-		return xmlBasicImplEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.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.eclipselink1_1.core.resource.orm.XmlVersion
-	 * @generated
-	 */
-	public EClass getXmlVersion()
-	{
-		return xmlVersionEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersionImpl <em>Xml Version Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Version Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersionImpl
-	 * @generated
-	 */
-	public EClass getXmlVersionImpl()
-	{
-		return xmlVersionImplEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.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.eclipselink1_1.core.resource.orm.XmlOneToOne
-	 * @generated
-	 */
-	public EClass getXmlOneToOne()
-	{
-		return xmlOneToOneEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOneImpl <em>Xml One To One Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml One To One Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOneImpl
-	 * @generated
-	 */
-	public EClass getXmlOneToOneImpl()
-	{
-		return xmlOneToOneImplEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.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.eclipselink1_1.core.resource.orm.XmlOneToMany
-	 * @generated
-	 */
-	public EClass getXmlOneToMany()
-	{
-		return xmlOneToManyEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToManyImpl <em>Xml One To Many Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml One To Many Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToManyImpl
-	 * @generated
-	 */
-	public EClass getXmlOneToManyImpl()
-	{
-		return xmlOneToManyImplEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.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.eclipselink1_1.core.resource.orm.XmlManyToOne
-	 * @generated
-	 */
-	public EClass getXmlManyToOne()
-	{
-		return xmlManyToOneEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOneImpl <em>Xml Many To One Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Many To One Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOneImpl
-	 * @generated
-	 */
-	public EClass getXmlManyToOneImpl()
-	{
-		return xmlManyToOneImplEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.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.eclipselink1_1.core.resource.orm.XmlManyToMany
-	 * @generated
-	 */
-	public EClass getXmlManyToMany()
-	{
-		return xmlManyToManyEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToManyImpl <em>Xml Many To Many Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Many To Many Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToManyImpl
-	 * @generated
-	 */
-	public EClass getXmlManyToManyImpl()
-	{
-		return xmlManyToManyImplEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.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.eclipselink1_1.core.resource.orm.XmlBasicCollection
-	 * @generated
-	 */
-	public EClass getXmlBasicCollection()
-	{
-		return xmlBasicCollectionEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollectionImpl <em>Xml Basic Collection Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Basic Collection Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollectionImpl
-	 * @generated
-	 */
-	public EClass getXmlBasicCollectionImpl()
-	{
-		return xmlBasicCollectionImplEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.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.eclipselink1_1.core.resource.orm.XmlBasicMap
-	 * @generated
-	 */
-	public EClass getXmlBasicMap()
-	{
-		return xmlBasicMapEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMapImpl <em>Xml Basic Map Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Basic Map Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMapImpl
-	 * @generated
-	 */
-	public EClass getXmlBasicMapImpl()
-	{
-		return xmlBasicMapImplEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.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.eclipselink1_1.core.resource.orm.XmlTransformation
-	 * @generated
-	 */
-	public EClass getXmlTransformation()
-	{
-		return xmlTransformationEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformationImpl <em>Xml Transformation Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Transformation Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformationImpl
-	 * @generated
-	 */
-	public EClass getXmlTransformationImpl()
-	{
-		return xmlTransformationImplEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.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.eclipselink1_1.core.resource.orm.XmlVariableOneToOne
-	 * @generated
-	 */
-	public EClass getXmlVariableOneToOne()
-	{
-		return xmlVariableOneToOneEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOneImpl <em>Xml Variable One To One Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Variable One To One Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOneImpl
-	 * @generated
-	 */
-	public EClass getXmlVariableOneToOneImpl()
-	{
-		return xmlVariableOneToOneImplEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.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.eclipselink1_1.core.resource.orm.XmlTransient
-	 * @generated
-	 */
-	public EClass getXmlTransient()
-	{
-		return xmlTransientEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransientImpl <em>Xml Transient Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Transient Impl</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransientImpl
-	 * @generated
-	 */
-	public EClass getXmlTransientImpl()
-	{
-		return xmlTransientImplEClass;
-	}
-
-
-	/**
-	 * 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 EclipseLink1_1OrmFactory getEclipseLink1_1OrmFactory()
-	{
-		return (EclipseLink1_1OrmFactory)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
-		xmlEntityMappingsEClass = createEClass(XML_ENTITY_MAPPINGS);
-
-		xmlAttributeMappingEClass = createEClass(XML_ATTRIBUTE_MAPPING);
-		createEAttribute(xmlAttributeMappingEClass, XML_ATTRIBUTE_MAPPING__ACCESS);
-
-		xmlIdEClass = createEClass(XML_ID);
-
-		xmlIdImplEClass = createEClass(XML_ID_IMPL);
-
-		xmlEmbeddedIdEClass = createEClass(XML_EMBEDDED_ID);
-
-		xmlEmbeddedIdImplEClass = createEClass(XML_EMBEDDED_ID_IMPL);
-
-		xmlEmbeddedEClass = createEClass(XML_EMBEDDED);
-
-		xmlEmbeddedImplEClass = createEClass(XML_EMBEDDED_IMPL);
-
-		xmlBasicEClass = createEClass(XML_BASIC);
-		createEReference(xmlBasicEClass, XML_BASIC__GENERATED_VALUE);
-		createEReference(xmlBasicEClass, XML_BASIC__TABLE_GENERATOR);
-		createEReference(xmlBasicEClass, XML_BASIC__SEQUENCE_GENERATOR);
-
-		xmlBasicImplEClass = createEClass(XML_BASIC_IMPL);
-
-		xmlVersionEClass = createEClass(XML_VERSION);
-
-		xmlVersionImplEClass = createEClass(XML_VERSION_IMPL);
-
-		xmlOneToOneEClass = createEClass(XML_ONE_TO_ONE);
-
-		xmlOneToOneImplEClass = createEClass(XML_ONE_TO_ONE_IMPL);
-
-		xmlOneToManyEClass = createEClass(XML_ONE_TO_MANY);
-
-		xmlOneToManyImplEClass = createEClass(XML_ONE_TO_MANY_IMPL);
-
-		xmlManyToOneEClass = createEClass(XML_MANY_TO_ONE);
-
-		xmlManyToOneImplEClass = createEClass(XML_MANY_TO_ONE_IMPL);
-
-		xmlManyToManyEClass = createEClass(XML_MANY_TO_MANY);
-
-		xmlManyToManyImplEClass = createEClass(XML_MANY_TO_MANY_IMPL);
-
-		xmlBasicCollectionEClass = createEClass(XML_BASIC_COLLECTION);
-
-		xmlBasicCollectionImplEClass = createEClass(XML_BASIC_COLLECTION_IMPL);
-
-		xmlBasicMapEClass = createEClass(XML_BASIC_MAP);
-
-		xmlBasicMapImplEClass = createEClass(XML_BASIC_MAP_IMPL);
-
-		xmlTransformationEClass = createEClass(XML_TRANSFORMATION);
-
-		xmlTransformationImplEClass = createEClass(XML_TRANSFORMATION_IMPL);
-
-		xmlVariableOneToOneEClass = createEClass(XML_VARIABLE_ONE_TO_ONE);
-
-		xmlVariableOneToOneImplEClass = createEClass(XML_VARIABLE_ONE_TO_ONE_IMPL);
-
-		xmlTransientEClass = createEClass(XML_TRANSIENT);
-
-		xmlTransientImplEClass = createEClass(XML_TRANSIENT_IMPL);
-	}
-
-	/**
-	 * <!-- 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);
-		OrmPackage theOrmPackage = (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		xmlEntityMappingsEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlEntityMappings());
-		xmlAttributeMappingEClass.getESuperTypes().add(theOrmPackage.getXmlAttributeMapping());
-		xmlIdEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlId());
-		xmlIdEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlIdImplEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlIdImpl());
-		xmlIdImplEClass.getESuperTypes().add(this.getXmlId());
-		xmlEmbeddedIdEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlEmbeddedId());
-		xmlEmbeddedIdEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlEmbeddedIdImplEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlEmbeddedIdImpl());
-		xmlEmbeddedIdImplEClass.getESuperTypes().add(this.getXmlEmbeddedId());
-		xmlEmbeddedEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlEmbedded());
-		xmlEmbeddedEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlEmbeddedImplEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlEmbeddedImpl());
-		xmlEmbeddedImplEClass.getESuperTypes().add(this.getXmlEmbedded());
-		xmlBasicEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlBasic());
-		xmlBasicEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlBasicImplEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlBasicImpl());
-		xmlBasicImplEClass.getESuperTypes().add(this.getXmlBasic());
-		xmlVersionEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlVersion());
-		xmlVersionEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlVersionImplEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlVersionImpl());
-		xmlVersionImplEClass.getESuperTypes().add(this.getXmlVersion());
-		xmlOneToOneEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlOneToOne());
-		xmlOneToOneEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlOneToOneImplEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlOneToOneImpl());
-		xmlOneToOneImplEClass.getESuperTypes().add(this.getXmlOneToOne());
-		xmlOneToManyEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlOneToMany());
-		xmlOneToManyEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlOneToManyImplEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlOneToManyImpl());
-		xmlOneToManyImplEClass.getESuperTypes().add(this.getXmlOneToMany());
-		xmlManyToOneEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlManyToOne());
-		xmlManyToOneEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlManyToOneImplEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlManyToOneImpl());
-		xmlManyToOneImplEClass.getESuperTypes().add(this.getXmlManyToOne());
-		xmlManyToManyEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlManyToMany());
-		xmlManyToManyEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlManyToManyImplEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlManyToManyImpl());
-		xmlManyToManyImplEClass.getESuperTypes().add(this.getXmlManyToMany());
-		xmlBasicCollectionEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlBasicCollection());
-		xmlBasicCollectionEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlBasicCollectionImplEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlBasicCollectionImpl());
-		xmlBasicCollectionImplEClass.getESuperTypes().add(this.getXmlBasicCollection());
-		xmlBasicMapEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlBasicMap());
-		xmlBasicMapEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlBasicMapImplEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlBasicMapImpl());
-		xmlBasicMapImplEClass.getESuperTypes().add(this.getXmlBasicMap());
-		xmlTransformationEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlTransformation());
-		xmlTransformationEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlTransformationImplEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlTransformationImpl());
-		xmlTransformationImplEClass.getESuperTypes().add(this.getXmlTransformation());
-		xmlVariableOneToOneEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlVariableOneToOne());
-		xmlVariableOneToOneEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlVariableOneToOneImplEClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlVariableOneToOneImpl());
-		xmlVariableOneToOneImplEClass.getESuperTypes().add(this.getXmlVariableOneToOne());
-		xmlTransientEClass.getESuperTypes().add(theOrmPackage.getXmlTransient());
-		xmlTransientEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlTransientImplEClass.getESuperTypes().add(theOrmPackage.getXmlTransientImpl());
-		xmlTransientImplEClass.getESuperTypes().add(this.getXmlTransient());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(xmlEntityMappingsEClass, XmlEntityMappings.class, "XmlEntityMappings", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlAttributeMappingEClass, XmlAttributeMapping.class, "XmlAttributeMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlAttributeMapping_Access(), theOrmPackage.getAccessType(), "access", "PROPERTY", 0, 1, XmlAttributeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlIdEClass, XmlId.class, "XmlId", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlIdImplEClass, XmlIdImpl.class, "XmlIdImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlEmbeddedIdEClass, XmlEmbeddedId.class, "XmlEmbeddedId", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlEmbeddedIdImplEClass, XmlEmbeddedIdImpl.class, "XmlEmbeddedIdImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlEmbeddedEClass, XmlEmbedded.class, "XmlEmbedded", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlEmbeddedImplEClass, XmlEmbeddedImpl.class, "XmlEmbeddedImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlBasicEClass, XmlBasic.class, "XmlBasic", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlBasic_GeneratedValue(), theOrmPackage.getXmlGeneratedValue(), null, "generatedValue", null, 0, 1, XmlBasic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlBasic_TableGenerator(), theOrmPackage.getXmlTableGenerator(), null, "tableGenerator", null, 0, 1, XmlBasic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlBasic_SequenceGenerator(), theOrmPackage.getXmlSequenceGenerator(), null, "sequenceGenerator", null, 0, 1, XmlBasic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlBasicImplEClass, XmlBasicImpl.class, "XmlBasicImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlVersionEClass, XmlVersion.class, "XmlVersion", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlVersionImplEClass, XmlVersionImpl.class, "XmlVersionImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlOneToOneEClass, XmlOneToOne.class, "XmlOneToOne", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlOneToOneImplEClass, XmlOneToOneImpl.class, "XmlOneToOneImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlOneToManyEClass, XmlOneToMany.class, "XmlOneToMany", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlOneToManyImplEClass, XmlOneToManyImpl.class, "XmlOneToManyImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlManyToOneEClass, XmlManyToOne.class, "XmlManyToOne", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlManyToOneImplEClass, XmlManyToOneImpl.class, "XmlManyToOneImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlManyToManyEClass, XmlManyToMany.class, "XmlManyToMany", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlManyToManyImplEClass, XmlManyToManyImpl.class, "XmlManyToManyImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlBasicCollectionEClass, XmlBasicCollection.class, "XmlBasicCollection", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlBasicCollectionImplEClass, XmlBasicCollectionImpl.class, "XmlBasicCollectionImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlBasicMapEClass, XmlBasicMap.class, "XmlBasicMap", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlBasicMapImplEClass, XmlBasicMapImpl.class, "XmlBasicMapImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlTransformationEClass, XmlTransformation.class, "XmlTransformation", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlTransformationImplEClass, XmlTransformationImpl.class, "XmlTransformationImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlVariableOneToOneEClass, XmlVariableOneToOne.class, "XmlVariableOneToOne", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlVariableOneToOneImplEClass, XmlVariableOneToOneImpl.class, "XmlVariableOneToOneImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlTransientEClass, XmlTransient.class, "XmlTransient", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlTransientImplEClass, XmlTransientImpl.class, "XmlTransientImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// 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.eclipselink1_1.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntityMappings
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEntityMappings()
-		 * @generated
-		 */
-		public static final EClass XML_ENTITY_MAPPINGS = eINSTANCE.getXmlEntityMappings();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping()
-		 * @generated
-		 */
-		public static final EClass XML_ATTRIBUTE_MAPPING = eINSTANCE.getXmlAttributeMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Access</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ATTRIBUTE_MAPPING__ACCESS = eINSTANCE.getXmlAttributeMapping_Access();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlId <em>Xml Id</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlId
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlId()
-		 * @generated
-		 */
-		public static final EClass XML_ID = eINSTANCE.getXmlId();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlIdImpl <em>Xml Id Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlIdImpl
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlIdImpl()
-		 * @generated
-		 */
-		public static final EClass XML_ID_IMPL = eINSTANCE.getXmlIdImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedId
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddedId()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDED_ID = eINSTANCE.getXmlEmbeddedId();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedIdImpl <em>Xml Embedded Id Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedIdImpl
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddedIdImpl()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDED_ID_IMPL = eINSTANCE.getXmlEmbeddedIdImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbedded
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbedded()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDED = eINSTANCE.getXmlEmbedded();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedImpl <em>Xml Embedded Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedImpl
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddedImpl()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDED_IMPL = eINSTANCE.getXmlEmbeddedImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic <em>Xml Basic</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasic()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC = eINSTANCE.getXmlBasic();
-
-		/**
-		 * 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__GENERATED_VALUE = eINSTANCE.getXmlBasic_GeneratedValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Table Generator</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_BASIC__TABLE_GENERATOR = eINSTANCE.getXmlBasic_TableGenerator();
-
-		/**
-		 * The meta object literal for the '<em><b>Sequence Generator</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_BASIC__SEQUENCE_GENERATOR = eINSTANCE.getXmlBasic_SequenceGenerator();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicImpl <em>Xml Basic Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicImpl
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicImpl()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_IMPL = eINSTANCE.getXmlBasicImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersion <em>Xml Version</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersion
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlVersion()
-		 * @generated
-		 */
-		public static final EClass XML_VERSION = eINSTANCE.getXmlVersion();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersionImpl <em>Xml Version Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersionImpl
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlVersionImpl()
-		 * @generated
-		 */
-		public static final EClass XML_VERSION_IMPL = eINSTANCE.getXmlVersionImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOne
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToOne()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_ONE = eINSTANCE.getXmlOneToOne();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOneImpl <em>Xml One To One Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOneImpl
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToOneImpl()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_ONE_IMPL = eINSTANCE.getXmlOneToOneImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToMany
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToMany()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_MANY = eINSTANCE.getXmlOneToMany();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToManyImpl <em>Xml One To Many Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToManyImpl
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToManyImpl()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_MANY_IMPL = eINSTANCE.getXmlOneToManyImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOne
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToOne()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_ONE = eINSTANCE.getXmlManyToOne();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOneImpl <em>Xml Many To One Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOneImpl
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToOneImpl()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_ONE_IMPL = eINSTANCE.getXmlManyToOneImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToMany
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToMany()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_MANY = eINSTANCE.getXmlManyToMany();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToManyImpl <em>Xml Many To Many Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToManyImpl
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToManyImpl()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_MANY_IMPL = eINSTANCE.getXmlManyToManyImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollection <em>Xml Basic Collection</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollection
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicCollection()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_COLLECTION = eINSTANCE.getXmlBasicCollection();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollectionImpl <em>Xml Basic Collection Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollectionImpl
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicCollectionImpl()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_COLLECTION_IMPL = eINSTANCE.getXmlBasicCollectionImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMap <em>Xml Basic Map</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMap
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicMap()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_MAP = eINSTANCE.getXmlBasicMap();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMapImpl <em>Xml Basic Map Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMapImpl
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicMapImpl()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_MAP_IMPL = eINSTANCE.getXmlBasicMapImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformation <em>Xml Transformation</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformation
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlTransformation()
-		 * @generated
-		 */
-		public static final EClass XML_TRANSFORMATION = eINSTANCE.getXmlTransformation();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformationImpl <em>Xml Transformation Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformationImpl
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlTransformationImpl()
-		 * @generated
-		 */
-		public static final EClass XML_TRANSFORMATION_IMPL = eINSTANCE.getXmlTransformationImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOne <em>Xml Variable One To One</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOne
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlVariableOneToOne()
-		 * @generated
-		 */
-		public static final EClass XML_VARIABLE_ONE_TO_ONE = eINSTANCE.getXmlVariableOneToOne();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOneImpl <em>Xml Variable One To One Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOneImpl
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlVariableOneToOneImpl()
-		 * @generated
-		 */
-		public static final EClass XML_VARIABLE_ONE_TO_ONE_IMPL = eINSTANCE.getXmlVariableOneToOneImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransient <em>Xml Transient</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransient
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlTransient()
-		 * @generated
-		 */
-		public static final EClass XML_TRANSIENT = eINSTANCE.getXmlTransient();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransientImpl <em>Xml Transient Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransientImpl
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlTransientImpl()
-		 * @generated
-		 */
-		public static final EClass XML_TRANSIENT_IMPL = eINSTANCE.getXmlTransientImpl();
-
-	}
-
-} //EclipseLink1_1OrmPackage
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/EclipseLink1_1OrmXmlResourceFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/EclipseLink1_1OrmXmlResourceFactory.java
deleted file mode 100644
index 3ab8bef3b4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/EclipseLink1_1OrmXmlResourceFactory.java
+++ /dev/null
@@ -1,53 +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.eclipselink1_1.core.resource.orm;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink1_1.core.internal.resource.orm.translators.EclipseLinkEntityMappingsTranslator;
-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 EclipseLink1_1OrmXmlResourceFactory extends TranslatorResourceFactory
-{
-	public EclipseLink1_1OrmXmlResourceFactory() {
-		this(RendererFactory.getDefaultRendererFactory());
-	}
-	
-	public EclipseLink1_1OrmXmlResourceFactory(RendererFactory aRendererFactory) {
-		super(aRendererFactory);
-	}
-	
-	public EclipseLink1_1OrmXmlResourceFactory(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, JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE, EclipseLinkEntityMappingsTranslator.INSTANCE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlAttributeMapping.java
deleted file mode 100644
index 9c199ab2db..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlAttributeMapping.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.eclipselink1_1.core.resource.orm;
-
-import org.eclipse.jpt.core.resource.orm.AccessType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Attribute Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping#getAccess <em>Access</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlAttributeMapping extends org.eclipse.jpt.core.resource.orm.XmlAttributeMapping
-{
-	/**
-	 * Returns the value of the '<em><b>Access</b></em>' attribute.
-	 * The default value is <code>"PROPERTY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.AccessType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Access</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping_Access()
-	 * @model default="PROPERTY"
-	 * @generated
-	 */
-	AccessType getAccess();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping#getAccess <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #getAccess()
-	 * @generated
-	 */
-	void setAccess(AccessType value);
-
-} // XmlAttributeMapping
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasic.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasic.java
deleted file mode 100644
index 555a155c46..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasic.java
+++ /dev/null
@@ -1,115 +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.eclipselink1_1.core.resource.orm;
-
-import org.eclipse.jpt.core.resource.orm.XmlGeneratedValue;
-import org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator;
-import org.eclipse.jpt.core.resource.orm.XmlTableGenerator;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Basic</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic#getGeneratedValue <em>Generated Value</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic#getTableGenerator <em>Table Generator</em>}</li>
- *   <li>{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic#getSequenceGenerator <em>Sequence Generator</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasic()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlBasic extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic, XmlAttributeMapping
-{
-
-	/**
-	 * 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.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasic_GeneratedValue()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlGeneratedValue getGeneratedValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.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
-	 */
-	void setGeneratedValue(XmlGeneratedValue value);
-
-	/**
-	 * 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.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasic_TableGenerator()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlTableGenerator getTableGenerator();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.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
-	 */
-	void setTableGenerator(XmlTableGenerator value);
-
-	/**
-	 * 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.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasic_SequenceGenerator()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlSequenceGenerator getSequenceGenerator();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.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
-	 */
-	void setSequenceGenerator(XmlSequenceGenerator value);
-} // XmlBasic
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicCollection.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicCollection.java
deleted file mode 100644
index 197bb00a16..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicCollection.java
+++ /dev/null
@@ -1,25 +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.eclipselink1_1.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Basic Collection</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicCollection()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlBasicCollection extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection, XmlAttributeMapping
-{
-} // XmlBasicCollection
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicCollectionImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicCollectionImpl.java
deleted file mode 100644
index 011d414b78..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicCollectionImpl.java
+++ /dev/null
@@ -1,243 +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.eclipselink1_1.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.core.resource.orm.AccessType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Basic Collection Impl</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicCollectionImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlBasicCollectionImpl extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollectionImpl implements XmlBasicCollection
-{
-	/**
-	 * 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 AccessType ACCESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAccess() <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccess()
-	 * @generated
-	 * @ordered
-	 */
-	protected AccessType access = ACCESS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlBasicCollectionImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLink1_1OrmPackage.Literals.XML_BASIC_COLLECTION_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access</b></em>' attribute.
-	 * The default value is <code>"PROPERTY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.AccessType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Access</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping_Access()
-	 * @model default="PROPERTY"
-	 * @generated
-	 */
-	public AccessType getAccess()
-	{
-		return access;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollectionImpl#getAccess <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #getAccess()
-	 * @generated
-	 */
-	public void setAccess(AccessType newAccess)
-	{
-		AccessType oldAccess = access;
-		access = newAccess == null ? ACCESS_EDEFAULT : newAccess;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLink1_1OrmPackage.XML_BASIC_COLLECTION_IMPL__ACCESS, oldAccess, access));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_BASIC_COLLECTION_IMPL__ACCESS:
-				return getAccess();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_BASIC_COLLECTION_IMPL__ACCESS:
-				setAccess((AccessType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_BASIC_COLLECTION_IMPL__ACCESS:
-				setAccess(ACCESS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_BASIC_COLLECTION_IMPL__ACCESS:
-				return access != ACCESS_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_BASIC_COLLECTION_IMPL__ACCESS: return EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasicCollection.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 == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS: return EclipseLink1_1OrmPackage.XML_BASIC_COLLECTION_IMPL__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasicCollection.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(" (access: ");
-		result.append(access);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlBasicCollectionImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicImpl.java
deleted file mode 100644
index 1e5fc37662..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicImpl.java
+++ /dev/null
@@ -1,514 +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.eclipselink1_1.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.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.core.resource.orm.XmlGeneratedValue;
-import org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator;
-import org.eclipse.jpt.core.resource.orm.XmlTableGenerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Basic Impl</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlBasicImpl extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicImpl implements XmlBasic
-{
-	/**
-	 * 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 AccessType ACCESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAccess() <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccess()
-	 * @generated
-	 * @ordered
-	 */
-	protected AccessType access = ACCESS_EDEFAULT;
-
-	/**
-	 * 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 #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 #getSequenceGenerator() <em>Sequence Generator</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSequenceGenerator()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlSequenceGenerator sequenceGenerator;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlBasicImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLink1_1OrmPackage.Literals.XML_BASIC_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access</b></em>' attribute.
-	 * The default value is <code>"PROPERTY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.AccessType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Access</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping_Access()
-	 * @model default="PROPERTY"
-	 * @generated
-	 */
-	public AccessType getAccess()
-	{
-		return access;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicImpl#getAccess <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #getAccess()
-	 * @generated
-	 */
-	public void setAccess(AccessType newAccess)
-	{
-		AccessType oldAccess = access;
-		access = newAccess == null ? ACCESS_EDEFAULT : newAccess;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLink1_1OrmPackage.XML_BASIC_IMPL__ACCESS, oldAccess, access));
-	}
-
-	/**
-	 * 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.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasic_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, EclipseLink1_1OrmPackage.XML_BASIC_IMPL__GENERATED_VALUE, oldGeneratedValue, newGeneratedValue);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicImpl#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 - EclipseLink1_1OrmPackage.XML_BASIC_IMPL__GENERATED_VALUE, null, msgs);
-			if (newGeneratedValue != null)
-				msgs = ((InternalEObject)newGeneratedValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLink1_1OrmPackage.XML_BASIC_IMPL__GENERATED_VALUE, null, msgs);
-			msgs = basicSetGeneratedValue(newGeneratedValue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLink1_1OrmPackage.XML_BASIC_IMPL__GENERATED_VALUE, newGeneratedValue, newGeneratedValue));
-	}
-
-	/**
-	 * 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.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasic_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, EclipseLink1_1OrmPackage.XML_BASIC_IMPL__TABLE_GENERATOR, oldTableGenerator, newTableGenerator);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicImpl#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 - EclipseLink1_1OrmPackage.XML_BASIC_IMPL__TABLE_GENERATOR, null, msgs);
-			if (newTableGenerator != null)
-				msgs = ((InternalEObject)newTableGenerator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLink1_1OrmPackage.XML_BASIC_IMPL__TABLE_GENERATOR, null, msgs);
-			msgs = basicSetTableGenerator(newTableGenerator, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLink1_1OrmPackage.XML_BASIC_IMPL__TABLE_GENERATOR, newTableGenerator, newTableGenerator));
-	}
-
-	/**
-	 * 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.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasic_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, EclipseLink1_1OrmPackage.XML_BASIC_IMPL__SEQUENCE_GENERATOR, oldSequenceGenerator, newSequenceGenerator);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicImpl#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 - EclipseLink1_1OrmPackage.XML_BASIC_IMPL__SEQUENCE_GENERATOR, null, msgs);
-			if (newSequenceGenerator != null)
-				msgs = ((InternalEObject)newSequenceGenerator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLink1_1OrmPackage.XML_BASIC_IMPL__SEQUENCE_GENERATOR, null, msgs);
-			msgs = basicSetSequenceGenerator(newSequenceGenerator, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLink1_1OrmPackage.XML_BASIC_IMPL__SEQUENCE_GENERATOR, newSequenceGenerator, newSequenceGenerator));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__GENERATED_VALUE:
-				return basicSetGeneratedValue(null, msgs);
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__TABLE_GENERATOR:
-				return basicSetTableGenerator(null, msgs);
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__SEQUENCE_GENERATOR:
-				return basicSetSequenceGenerator(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 EclipseLink1_1OrmPackage.XML_BASIC_IMPL__ACCESS:
-				return getAccess();
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__GENERATED_VALUE:
-				return getGeneratedValue();
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__TABLE_GENERATOR:
-				return getTableGenerator();
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__SEQUENCE_GENERATOR:
-				return getSequenceGenerator();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__ACCESS:
-				setAccess((AccessType)newValue);
-				return;
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__GENERATED_VALUE:
-				setGeneratedValue((XmlGeneratedValue)newValue);
-				return;
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__TABLE_GENERATOR:
-				setTableGenerator((XmlTableGenerator)newValue);
-				return;
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__SEQUENCE_GENERATOR:
-				setSequenceGenerator((XmlSequenceGenerator)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__ACCESS:
-				setAccess(ACCESS_EDEFAULT);
-				return;
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__GENERATED_VALUE:
-				setGeneratedValue((XmlGeneratedValue)null);
-				return;
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__TABLE_GENERATOR:
-				setTableGenerator((XmlTableGenerator)null);
-				return;
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__SEQUENCE_GENERATOR:
-				setSequenceGenerator((XmlSequenceGenerator)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__ACCESS:
-				return access != ACCESS_EDEFAULT;
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__GENERATED_VALUE:
-				return generatedValue != null;
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__TABLE_GENERATOR:
-				return tableGenerator != null;
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__SEQUENCE_GENERATOR:
-				return sequenceGenerator != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__ACCESS: return EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasic.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__GENERATED_VALUE: return EclipseLink1_1OrmPackage.XML_BASIC__GENERATED_VALUE;
-				case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__TABLE_GENERATOR: return EclipseLink1_1OrmPackage.XML_BASIC__TABLE_GENERATOR;
-				case EclipseLink1_1OrmPackage.XML_BASIC_IMPL__SEQUENCE_GENERATOR: return EclipseLink1_1OrmPackage.XML_BASIC__SEQUENCE_GENERATOR;
-				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 == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS: return EclipseLink1_1OrmPackage.XML_BASIC_IMPL__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasic.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_BASIC__GENERATED_VALUE: return EclipseLink1_1OrmPackage.XML_BASIC_IMPL__GENERATED_VALUE;
-				case EclipseLink1_1OrmPackage.XML_BASIC__TABLE_GENERATOR: return EclipseLink1_1OrmPackage.XML_BASIC_IMPL__TABLE_GENERATOR;
-				case EclipseLink1_1OrmPackage.XML_BASIC__SEQUENCE_GENERATOR: return EclipseLink1_1OrmPackage.XML_BASIC_IMPL__SEQUENCE_GENERATOR;
-				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(" (access: ");
-		result.append(access);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlBasicImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicMap.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicMap.java
deleted file mode 100644
index 336a8e9ad4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicMap.java
+++ /dev/null
@@ -1,25 +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.eclipselink1_1.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Basic Map</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicMap()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlBasicMap extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap, XmlAttributeMapping
-{
-} // XmlBasicMap
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicMapImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicMapImpl.java
deleted file mode 100644
index c7fa036fa0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicMapImpl.java
+++ /dev/null
@@ -1,243 +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.eclipselink1_1.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.core.resource.orm.AccessType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Basic Map Impl</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicMapImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlBasicMapImpl extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMapImpl implements XmlBasicMap
-{
-	/**
-	 * 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 AccessType ACCESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAccess() <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccess()
-	 * @generated
-	 * @ordered
-	 */
-	protected AccessType access = ACCESS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlBasicMapImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLink1_1OrmPackage.Literals.XML_BASIC_MAP_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access</b></em>' attribute.
-	 * The default value is <code>"PROPERTY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.AccessType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Access</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping_Access()
-	 * @model default="PROPERTY"
-	 * @generated
-	 */
-	public AccessType getAccess()
-	{
-		return access;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMapImpl#getAccess <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #getAccess()
-	 * @generated
-	 */
-	public void setAccess(AccessType newAccess)
-	{
-		AccessType oldAccess = access;
-		access = newAccess == null ? ACCESS_EDEFAULT : newAccess;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLink1_1OrmPackage.XML_BASIC_MAP_IMPL__ACCESS, oldAccess, access));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_BASIC_MAP_IMPL__ACCESS:
-				return getAccess();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_BASIC_MAP_IMPL__ACCESS:
-				setAccess((AccessType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_BASIC_MAP_IMPL__ACCESS:
-				setAccess(ACCESS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_BASIC_MAP_IMPL__ACCESS:
-				return access != ACCESS_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_BASIC_MAP_IMPL__ACCESS: return EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasicMap.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 == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS: return EclipseLink1_1OrmPackage.XML_BASIC_MAP_IMPL__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasicMap.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(" (access: ");
-		result.append(access);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlBasicMapImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEmbedded.java
deleted file mode 100644
index 20ed87967a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEmbedded.java
+++ /dev/null
@@ -1,25 +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.eclipselink1_1.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Embedded</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbedded()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlEmbedded extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded, XmlAttributeMapping
-{
-} // XmlEmbedded
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEmbeddedId.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEmbeddedId.java
deleted file mode 100644
index b53b4080f5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEmbeddedId.java
+++ /dev/null
@@ -1,25 +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.eclipselink1_1.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Embedded Id</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddedId()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlEmbeddedId extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedId, XmlAttributeMapping
-{
-} // XmlEmbeddedId
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEmbeddedIdImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEmbeddedIdImpl.java
deleted file mode 100644
index 7521ae9fc9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEmbeddedIdImpl.java
+++ /dev/null
@@ -1,243 +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.eclipselink1_1.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.core.resource.orm.AccessType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Embedded Id Impl</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddedIdImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlEmbeddedIdImpl extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedIdImpl implements XmlEmbeddedId
-{
-	/**
-	 * 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 AccessType ACCESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAccess() <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccess()
-	 * @generated
-	 * @ordered
-	 */
-	protected AccessType access = ACCESS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlEmbeddedIdImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLink1_1OrmPackage.Literals.XML_EMBEDDED_ID_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access</b></em>' attribute.
-	 * The default value is <code>"PROPERTY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.AccessType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Access</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping_Access()
-	 * @model default="PROPERTY"
-	 * @generated
-	 */
-	public AccessType getAccess()
-	{
-		return access;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedIdImpl#getAccess <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #getAccess()
-	 * @generated
-	 */
-	public void setAccess(AccessType newAccess)
-	{
-		AccessType oldAccess = access;
-		access = newAccess == null ? ACCESS_EDEFAULT : newAccess;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLink1_1OrmPackage.XML_EMBEDDED_ID_IMPL__ACCESS, oldAccess, access));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_EMBEDDED_ID_IMPL__ACCESS:
-				return getAccess();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_EMBEDDED_ID_IMPL__ACCESS:
-				setAccess((AccessType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_EMBEDDED_ID_IMPL__ACCESS:
-				setAccess(ACCESS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_EMBEDDED_ID_IMPL__ACCESS:
-				return access != ACCESS_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_EMBEDDED_ID_IMPL__ACCESS: return EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEmbeddedId.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 == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS: return EclipseLink1_1OrmPackage.XML_EMBEDDED_ID_IMPL__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEmbeddedId.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(" (access: ");
-		result.append(access);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlEmbeddedIdImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEmbeddedImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEmbeddedImpl.java
deleted file mode 100644
index 8c966d307f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEmbeddedImpl.java
+++ /dev/null
@@ -1,243 +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.eclipselink1_1.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.core.resource.orm.AccessType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Embedded Impl</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddedImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlEmbeddedImpl extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedImpl implements XmlEmbedded
-{
-	/**
-	 * 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 AccessType ACCESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAccess() <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccess()
-	 * @generated
-	 * @ordered
-	 */
-	protected AccessType access = ACCESS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlEmbeddedImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLink1_1OrmPackage.Literals.XML_EMBEDDED_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access</b></em>' attribute.
-	 * The default value is <code>"PROPERTY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.AccessType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Access</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping_Access()
-	 * @model default="PROPERTY"
-	 * @generated
-	 */
-	public AccessType getAccess()
-	{
-		return access;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedImpl#getAccess <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #getAccess()
-	 * @generated
-	 */
-	public void setAccess(AccessType newAccess)
-	{
-		AccessType oldAccess = access;
-		access = newAccess == null ? ACCESS_EDEFAULT : newAccess;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLink1_1OrmPackage.XML_EMBEDDED_IMPL__ACCESS, oldAccess, access));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_EMBEDDED_IMPL__ACCESS:
-				return getAccess();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_EMBEDDED_IMPL__ACCESS:
-				setAccess((AccessType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_EMBEDDED_IMPL__ACCESS:
-				setAccess(ACCESS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_EMBEDDED_IMPL__ACCESS:
-				return access != ACCESS_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_EMBEDDED_IMPL__ACCESS: return EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEmbedded.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 == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS: return EclipseLink1_1OrmPackage.XML_EMBEDDED_IMPL__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEmbedded.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(" (access: ");
-		result.append(access);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlEmbeddedImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEntityMappings.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEntityMappings.java
deleted file mode 100644
index e345b91099..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEntityMappings.java
+++ /dev/null
@@ -1,47 +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.eclipselink1_1.core.resource.orm;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Entity Mappings</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEntityMappings()
- * @model kind="class"
- * @generated
- */
-public class XmlEntityMappings extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings
-{
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlEntityMappings()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLink1_1OrmPackage.Literals.XML_ENTITY_MAPPINGS;
-	}
-
-} // XmlEntityMappings
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlId.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlId.java
deleted file mode 100644
index b7f4d0f4e2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlId.java
+++ /dev/null
@@ -1,25 +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.eclipselink1_1.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Id</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlId()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlId extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlId, XmlAttributeMapping
-{
-} // XmlId
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlIdImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlIdImpl.java
deleted file mode 100644
index 394259156f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlIdImpl.java
+++ /dev/null
@@ -1,243 +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.eclipselink1_1.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.core.resource.orm.AccessType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Id Impl</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlIdImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlIdImpl extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlIdImpl implements XmlId
-{
-	/**
-	 * 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 AccessType ACCESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAccess() <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccess()
-	 * @generated
-	 * @ordered
-	 */
-	protected AccessType access = ACCESS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlIdImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLink1_1OrmPackage.Literals.XML_ID_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access</b></em>' attribute.
-	 * The default value is <code>"PROPERTY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.AccessType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Access</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping_Access()
-	 * @model default="PROPERTY"
-	 * @generated
-	 */
-	public AccessType getAccess()
-	{
-		return access;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlIdImpl#getAccess <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #getAccess()
-	 * @generated
-	 */
-	public void setAccess(AccessType newAccess)
-	{
-		AccessType oldAccess = access;
-		access = newAccess == null ? ACCESS_EDEFAULT : newAccess;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLink1_1OrmPackage.XML_ID_IMPL__ACCESS, oldAccess, access));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_ID_IMPL__ACCESS:
-				return getAccess();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_ID_IMPL__ACCESS:
-				setAccess((AccessType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_ID_IMPL__ACCESS:
-				setAccess(ACCESS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_ID_IMPL__ACCESS:
-				return access != ACCESS_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_ID_IMPL__ACCESS: return EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlId.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 == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS: return EclipseLink1_1OrmPackage.XML_ID_IMPL__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlId.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(" (access: ");
-		result.append(access);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlIdImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlManyToMany.java
deleted file mode 100644
index c2d30418b8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlManyToMany.java
+++ /dev/null
@@ -1,25 +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.eclipselink1_1.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Many To Many</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToMany()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlManyToMany extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany, XmlAttributeMapping
-{
-} // XmlManyToMany
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlManyToManyImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlManyToManyImpl.java
deleted file mode 100644
index 3975b09580..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlManyToManyImpl.java
+++ /dev/null
@@ -1,243 +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.eclipselink1_1.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.core.resource.orm.AccessType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Many To Many Impl</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToManyImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlManyToManyImpl extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToManyImpl implements XmlManyToMany
-{
-	/**
-	 * 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 AccessType ACCESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAccess() <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccess()
-	 * @generated
-	 * @ordered
-	 */
-	protected AccessType access = ACCESS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlManyToManyImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLink1_1OrmPackage.Literals.XML_MANY_TO_MANY_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access</b></em>' attribute.
-	 * The default value is <code>"PROPERTY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.AccessType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Access</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping_Access()
-	 * @model default="PROPERTY"
-	 * @generated
-	 */
-	public AccessType getAccess()
-	{
-		return access;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToManyImpl#getAccess <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #getAccess()
-	 * @generated
-	 */
-	public void setAccess(AccessType newAccess)
-	{
-		AccessType oldAccess = access;
-		access = newAccess == null ? ACCESS_EDEFAULT : newAccess;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLink1_1OrmPackage.XML_MANY_TO_MANY_IMPL__ACCESS, oldAccess, access));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_MANY_TO_MANY_IMPL__ACCESS:
-				return getAccess();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_MANY_TO_MANY_IMPL__ACCESS:
-				setAccess((AccessType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_MANY_TO_MANY_IMPL__ACCESS:
-				setAccess(ACCESS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_MANY_TO_MANY_IMPL__ACCESS:
-				return access != ACCESS_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_MANY_TO_MANY_IMPL__ACCESS: return EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlManyToMany.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 == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS: return EclipseLink1_1OrmPackage.XML_MANY_TO_MANY_IMPL__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlManyToMany.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(" (access: ");
-		result.append(access);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlManyToManyImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlManyToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlManyToOne.java
deleted file mode 100644
index 1e434d727a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlManyToOne.java
+++ /dev/null
@@ -1,25 +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.eclipselink1_1.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Many To One</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToOne()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlManyToOne extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne, XmlAttributeMapping
-{
-} // XmlManyToOne
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlManyToOneImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlManyToOneImpl.java
deleted file mode 100644
index d53a2601db..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlManyToOneImpl.java
+++ /dev/null
@@ -1,243 +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.eclipselink1_1.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.core.resource.orm.AccessType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Many To One Impl</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToOneImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlManyToOneImpl extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOneImpl implements XmlManyToOne
-{
-	/**
-	 * 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 AccessType ACCESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAccess() <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccess()
-	 * @generated
-	 * @ordered
-	 */
-	protected AccessType access = ACCESS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlManyToOneImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLink1_1OrmPackage.Literals.XML_MANY_TO_ONE_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access</b></em>' attribute.
-	 * The default value is <code>"PROPERTY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.AccessType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Access</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping_Access()
-	 * @model default="PROPERTY"
-	 * @generated
-	 */
-	public AccessType getAccess()
-	{
-		return access;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOneImpl#getAccess <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #getAccess()
-	 * @generated
-	 */
-	public void setAccess(AccessType newAccess)
-	{
-		AccessType oldAccess = access;
-		access = newAccess == null ? ACCESS_EDEFAULT : newAccess;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLink1_1OrmPackage.XML_MANY_TO_ONE_IMPL__ACCESS, oldAccess, access));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_MANY_TO_ONE_IMPL__ACCESS:
-				return getAccess();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_MANY_TO_ONE_IMPL__ACCESS:
-				setAccess((AccessType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_MANY_TO_ONE_IMPL__ACCESS:
-				setAccess(ACCESS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_MANY_TO_ONE_IMPL__ACCESS:
-				return access != ACCESS_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_MANY_TO_ONE_IMPL__ACCESS: return EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlManyToOne.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 == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS: return EclipseLink1_1OrmPackage.XML_MANY_TO_ONE_IMPL__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlManyToOne.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(" (access: ");
-		result.append(access);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlManyToOneImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlOneToMany.java
deleted file mode 100644
index a96e819424..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlOneToMany.java
+++ /dev/null
@@ -1,25 +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.eclipselink1_1.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml One To Many</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToMany()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlOneToMany extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany, XmlAttributeMapping
-{
-} // XmlOneToMany
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlOneToManyImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlOneToManyImpl.java
deleted file mode 100644
index 1bd3d833b6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlOneToManyImpl.java
+++ /dev/null
@@ -1,243 +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.eclipselink1_1.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.core.resource.orm.AccessType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml One To Many Impl</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToManyImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlOneToManyImpl extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToManyImpl implements XmlOneToMany
-{
-	/**
-	 * 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 AccessType ACCESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAccess() <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccess()
-	 * @generated
-	 * @ordered
-	 */
-	protected AccessType access = ACCESS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlOneToManyImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLink1_1OrmPackage.Literals.XML_ONE_TO_MANY_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access</b></em>' attribute.
-	 * The default value is <code>"PROPERTY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.AccessType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Access</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping_Access()
-	 * @model default="PROPERTY"
-	 * @generated
-	 */
-	public AccessType getAccess()
-	{
-		return access;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToManyImpl#getAccess <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #getAccess()
-	 * @generated
-	 */
-	public void setAccess(AccessType newAccess)
-	{
-		AccessType oldAccess = access;
-		access = newAccess == null ? ACCESS_EDEFAULT : newAccess;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLink1_1OrmPackage.XML_ONE_TO_MANY_IMPL__ACCESS, oldAccess, access));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_ONE_TO_MANY_IMPL__ACCESS:
-				return getAccess();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_ONE_TO_MANY_IMPL__ACCESS:
-				setAccess((AccessType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_ONE_TO_MANY_IMPL__ACCESS:
-				setAccess(ACCESS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_ONE_TO_MANY_IMPL__ACCESS:
-				return access != ACCESS_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_ONE_TO_MANY_IMPL__ACCESS: return EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToMany.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 == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS: return EclipseLink1_1OrmPackage.XML_ONE_TO_MANY_IMPL__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToMany.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(" (access: ");
-		result.append(access);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlOneToManyImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlOneToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlOneToOne.java
deleted file mode 100644
index c4b689c1d8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlOneToOne.java
+++ /dev/null
@@ -1,25 +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.eclipselink1_1.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml One To One</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToOne()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlOneToOne extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne, XmlAttributeMapping
-{
-} // XmlOneToOne
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlOneToOneImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlOneToOneImpl.java
deleted file mode 100644
index 6125f5705d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlOneToOneImpl.java
+++ /dev/null
@@ -1,243 +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.eclipselink1_1.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.core.resource.orm.AccessType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml One To One Impl</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToOneImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlOneToOneImpl extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOneImpl implements XmlOneToOne
-{
-	/**
-	 * 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 AccessType ACCESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAccess() <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccess()
-	 * @generated
-	 * @ordered
-	 */
-	protected AccessType access = ACCESS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlOneToOneImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLink1_1OrmPackage.Literals.XML_ONE_TO_ONE_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access</b></em>' attribute.
-	 * The default value is <code>"PROPERTY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.AccessType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Access</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping_Access()
-	 * @model default="PROPERTY"
-	 * @generated
-	 */
-	public AccessType getAccess()
-	{
-		return access;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOneImpl#getAccess <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #getAccess()
-	 * @generated
-	 */
-	public void setAccess(AccessType newAccess)
-	{
-		AccessType oldAccess = access;
-		access = newAccess == null ? ACCESS_EDEFAULT : newAccess;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLink1_1OrmPackage.XML_ONE_TO_ONE_IMPL__ACCESS, oldAccess, access));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_ONE_TO_ONE_IMPL__ACCESS:
-				return getAccess();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_ONE_TO_ONE_IMPL__ACCESS:
-				setAccess((AccessType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_ONE_TO_ONE_IMPL__ACCESS:
-				setAccess(ACCESS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_ONE_TO_ONE_IMPL__ACCESS:
-				return access != ACCESS_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_ONE_TO_ONE_IMPL__ACCESS: return EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToOne.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 == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS: return EclipseLink1_1OrmPackage.XML_ONE_TO_ONE_IMPL__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToOne.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(" (access: ");
-		result.append(access);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlOneToOneImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlTransformation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlTransformation.java
deleted file mode 100644
index 7a025a0b57..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlTransformation.java
+++ /dev/null
@@ -1,25 +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.eclipselink1_1.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Transformation</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlTransformation()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlTransformation extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation, XmlAttributeMapping
-{
-} // XmlTransformation
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlTransformationImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlTransformationImpl.java
deleted file mode 100644
index 8822073b01..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlTransformationImpl.java
+++ /dev/null
@@ -1,243 +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.eclipselink1_1.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.core.resource.orm.AccessType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Transformation Impl</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlTransformationImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlTransformationImpl extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformationImpl implements XmlTransformation
-{
-	/**
-	 * 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 AccessType ACCESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAccess() <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccess()
-	 * @generated
-	 * @ordered
-	 */
-	protected AccessType access = ACCESS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlTransformationImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLink1_1OrmPackage.Literals.XML_TRANSFORMATION_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access</b></em>' attribute.
-	 * The default value is <code>"PROPERTY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.AccessType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Access</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping_Access()
-	 * @model default="PROPERTY"
-	 * @generated
-	 */
-	public AccessType getAccess()
-	{
-		return access;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformationImpl#getAccess <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #getAccess()
-	 * @generated
-	 */
-	public void setAccess(AccessType newAccess)
-	{
-		AccessType oldAccess = access;
-		access = newAccess == null ? ACCESS_EDEFAULT : newAccess;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLink1_1OrmPackage.XML_TRANSFORMATION_IMPL__ACCESS, oldAccess, access));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_TRANSFORMATION_IMPL__ACCESS:
-				return getAccess();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_TRANSFORMATION_IMPL__ACCESS:
-				setAccess((AccessType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_TRANSFORMATION_IMPL__ACCESS:
-				setAccess(ACCESS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_TRANSFORMATION_IMPL__ACCESS:
-				return access != ACCESS_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_TRANSFORMATION_IMPL__ACCESS: return EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlTransformation.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 == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS: return EclipseLink1_1OrmPackage.XML_TRANSFORMATION_IMPL__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlTransformation.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(" (access: ");
-		result.append(access);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlTransformationImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlTransient.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlTransient.java
deleted file mode 100644
index 31c681ffb8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlTransient.java
+++ /dev/null
@@ -1,25 +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.eclipselink1_1.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Transient</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlTransient()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlTransient extends org.eclipse.jpt.core.resource.orm.XmlTransient, XmlAttributeMapping
-{
-} // XmlTransient
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlTransientImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlTransientImpl.java
deleted file mode 100644
index 2dd304a3d3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlTransientImpl.java
+++ /dev/null
@@ -1,234 +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.eclipselink1_1.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.core.resource.orm.AccessType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Transient Impl</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlTransientImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlTransientImpl extends org.eclipse.jpt.core.resource.orm.XmlTransientImpl implements XmlTransient
-{
-	/**
-	 * 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 AccessType ACCESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAccess() <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccess()
-	 * @generated
-	 * @ordered
-	 */
-	protected AccessType access = ACCESS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlTransientImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLink1_1OrmPackage.Literals.XML_TRANSIENT_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access</b></em>' attribute.
-	 * The default value is <code>"PROPERTY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.AccessType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Access</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping_Access()
-	 * @model default="PROPERTY"
-	 * @generated
-	 */
-	public AccessType getAccess()
-	{
-		return access;
-	}
-
-	/**
-	 * AccessType is not supported on xml transient mappings, but we wanted XmlTransient
-	 * to impleemnt XmlAttributeMapping so all the eclipselink1.1 attribute mappings
-	 * can be used interchangeably.
-	 */
-	public void setAccess(AccessType newAccess)
-	{
-		throw new UnsupportedOperationException("Access Type is not supported on transients");
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_TRANSIENT_IMPL__ACCESS:
-				return getAccess();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_TRANSIENT_IMPL__ACCESS:
-				setAccess((AccessType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_TRANSIENT_IMPL__ACCESS:
-				setAccess(ACCESS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_TRANSIENT_IMPL__ACCESS:
-				return access != ACCESS_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_TRANSIENT_IMPL__ACCESS: return EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlTransient.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 == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS: return EclipseLink1_1OrmPackage.XML_TRANSIENT_IMPL__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlTransient.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(" (access: ");
-		result.append(access);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlTransientImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlVariableOneToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlVariableOneToOne.java
deleted file mode 100644
index 3570df6d33..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlVariableOneToOne.java
+++ /dev/null
@@ -1,25 +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.eclipselink1_1.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Variable One To One</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlVariableOneToOne()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlVariableOneToOne extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOne, XmlAttributeMapping
-{
-} // XmlVariableOneToOne
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlVariableOneToOneImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlVariableOneToOneImpl.java
deleted file mode 100644
index 58fdddd95f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlVariableOneToOneImpl.java
+++ /dev/null
@@ -1,243 +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.eclipselink1_1.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.core.resource.orm.AccessType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Variable One To One Impl</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlVariableOneToOneImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlVariableOneToOneImpl extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOneImpl implements XmlVariableOneToOne
-{
-	/**
-	 * 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 AccessType ACCESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAccess() <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccess()
-	 * @generated
-	 * @ordered
-	 */
-	protected AccessType access = ACCESS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlVariableOneToOneImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLink1_1OrmPackage.Literals.XML_VARIABLE_ONE_TO_ONE_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access</b></em>' attribute.
-	 * The default value is <code>"PROPERTY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.AccessType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Access</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping_Access()
-	 * @model default="PROPERTY"
-	 * @generated
-	 */
-	public AccessType getAccess()
-	{
-		return access;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOneImpl#getAccess <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #getAccess()
-	 * @generated
-	 */
-	public void setAccess(AccessType newAccess)
-	{
-		AccessType oldAccess = access;
-		access = newAccess == null ? ACCESS_EDEFAULT : newAccess;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLink1_1OrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL__ACCESS, oldAccess, access));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL__ACCESS:
-				return getAccess();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL__ACCESS:
-				setAccess((AccessType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL__ACCESS:
-				setAccess(ACCESS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL__ACCESS:
-				return access != ACCESS_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL__ACCESS: return EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlVariableOneToOne.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 == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS: return EclipseLink1_1OrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlVariableOneToOne.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(" (access: ");
-		result.append(access);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlVariableOneToOneImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlVersion.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlVersion.java
deleted file mode 100644
index d6849098a2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlVersion.java
+++ /dev/null
@@ -1,25 +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.eclipselink1_1.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Version</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlVersion()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlVersion extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion, XmlAttributeMapping
-{
-} // XmlVersion
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlVersionImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlVersionImpl.java
deleted file mode 100644
index 29fce566c7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlVersionImpl.java
+++ /dev/null
@@ -1,243 +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.eclipselink1_1.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.core.resource.orm.AccessType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Version Impl</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlVersionImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlVersionImpl extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersionImpl implements XmlVersion
-{
-	/**
-	 * 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 AccessType ACCESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAccess() <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccess()
-	 * @generated
-	 * @ordered
-	 */
-	protected AccessType access = ACCESS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlVersionImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLink1_1OrmPackage.Literals.XML_VERSION_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access</b></em>' attribute.
-	 * The default value is <code>"PROPERTY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.AccessType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Access</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping_Access()
-	 * @model default="PROPERTY"
-	 * @generated
-	 */
-	public AccessType getAccess()
-	{
-		return access;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersionImpl#getAccess <em>Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see #getAccess()
-	 * @generated
-	 */
-	public void setAccess(AccessType newAccess)
-	{
-		AccessType oldAccess = access;
-		access = newAccess == null ? ACCESS_EDEFAULT : newAccess;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLink1_1OrmPackage.XML_VERSION_IMPL__ACCESS, oldAccess, access));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_VERSION_IMPL__ACCESS:
-				return getAccess();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_VERSION_IMPL__ACCESS:
-				setAccess((AccessType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_VERSION_IMPL__ACCESS:
-				setAccess(ACCESS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLink1_1OrmPackage.XML_VERSION_IMPL__ACCESS:
-				return access != ACCESS_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_VERSION_IMPL__ACCESS: return EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlVersion.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 == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS: return EclipseLink1_1OrmPackage.XML_VERSION_IMPL__ACCESS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlVersion.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(" (access: ");
-		result.append(access);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlVersionImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/util/EclipseLink1_1OrmAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/util/EclipseLink1_1OrmAdapterFactory.java
deleted file mode 100644
index 398e1be41e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/util/EclipseLink1_1OrmAdapterFactory.java
+++ /dev/null
@@ -1,2057 +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.eclipselink1_1.core.resource.orm.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.jpt.core.resource.orm.AbstractXmlAttributeMapping;
-import org.eclipse.jpt.core.resource.orm.BaseXmlEmbedded;
-import org.eclipse.jpt.core.resource.orm.ColumnMapping;
-import org.eclipse.jpt.core.resource.orm.XmlConvertibleMapping;
-import org.eclipse.jpt.core.resource.orm.XmlJoinColumnsMapping;
-import org.eclipse.jpt.core.resource.orm.XmlJoinTableMapping;
-import org.eclipse.jpt.core.resource.orm.XmlMappedByMapping;
-import org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping;
-import org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping;
-import org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping;
-
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethodsHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertersHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetch;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlMutable;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlPrivateOwned;
-
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage
- * @generated
- */
-public class EclipseLink1_1OrmAdapterFactory extends AdapterFactoryImpl
-{
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static EclipseLink1_1OrmPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseLink1_1OrmAdapterFactory()
-	{
-		if (modelPackage == null)
-		{
-			modelPackage = EclipseLink1_1OrmPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object)
-	{
-		if (object == modelPackage)
-		{
-			return true;
-		}
-		if (object instanceof EObject)
-		{
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EclipseLink1_1OrmSwitch<Adapter> modelSwitch =
-		new EclipseLink1_1OrmSwitch<Adapter>()
-		{
-			@Override
-			public Adapter caseXmlEntityMappings(XmlEntityMappings object)
-			{
-				return createXmlEntityMappingsAdapter();
-			}
-			@Override
-			public Adapter caseXmlAttributeMapping(XmlAttributeMapping object)
-			{
-				return createXmlAttributeMappingAdapter();
-			}
-			@Override
-			public Adapter caseXmlId(XmlId object)
-			{
-				return createXmlIdAdapter();
-			}
-			@Override
-			public Adapter caseXmlIdImpl(XmlIdImpl object)
-			{
-				return createXmlIdImplAdapter();
-			}
-			@Override
-			public Adapter caseXmlEmbeddedId(XmlEmbeddedId object)
-			{
-				return createXmlEmbeddedIdAdapter();
-			}
-			@Override
-			public Adapter caseXmlEmbeddedIdImpl(XmlEmbeddedIdImpl object)
-			{
-				return createXmlEmbeddedIdImplAdapter();
-			}
-			@Override
-			public Adapter caseXmlEmbedded(XmlEmbedded object)
-			{
-				return createXmlEmbeddedAdapter();
-			}
-			@Override
-			public Adapter caseXmlEmbeddedImpl(XmlEmbeddedImpl object)
-			{
-				return createXmlEmbeddedImplAdapter();
-			}
-			@Override
-			public Adapter caseXmlBasic(XmlBasic object)
-			{
-				return createXmlBasicAdapter();
-			}
-			@Override
-			public Adapter caseXmlBasicImpl(XmlBasicImpl object)
-			{
-				return createXmlBasicImplAdapter();
-			}
-			@Override
-			public Adapter caseXmlVersion(XmlVersion object)
-			{
-				return createXmlVersionAdapter();
-			}
-			@Override
-			public Adapter caseXmlVersionImpl(XmlVersionImpl object)
-			{
-				return createXmlVersionImplAdapter();
-			}
-			@Override
-			public Adapter caseXmlOneToOne(XmlOneToOne object)
-			{
-				return createXmlOneToOneAdapter();
-			}
-			@Override
-			public Adapter caseXmlOneToOneImpl(XmlOneToOneImpl object)
-			{
-				return createXmlOneToOneImplAdapter();
-			}
-			@Override
-			public Adapter caseXmlOneToMany(XmlOneToMany object)
-			{
-				return createXmlOneToManyAdapter();
-			}
-			@Override
-			public Adapter caseXmlOneToManyImpl(XmlOneToManyImpl object)
-			{
-				return createXmlOneToManyImplAdapter();
-			}
-			@Override
-			public Adapter caseXmlManyToOne(XmlManyToOne object)
-			{
-				return createXmlManyToOneAdapter();
-			}
-			@Override
-			public Adapter caseXmlManyToOneImpl(XmlManyToOneImpl object)
-			{
-				return createXmlManyToOneImplAdapter();
-			}
-			@Override
-			public Adapter caseXmlManyToMany(XmlManyToMany object)
-			{
-				return createXmlManyToManyAdapter();
-			}
-			@Override
-			public Adapter caseXmlManyToManyImpl(XmlManyToManyImpl object)
-			{
-				return createXmlManyToManyImplAdapter();
-			}
-			@Override
-			public Adapter caseXmlBasicCollection(XmlBasicCollection object)
-			{
-				return createXmlBasicCollectionAdapter();
-			}
-			@Override
-			public Adapter caseXmlBasicCollectionImpl(XmlBasicCollectionImpl object)
-			{
-				return createXmlBasicCollectionImplAdapter();
-			}
-			@Override
-			public Adapter caseXmlBasicMap(XmlBasicMap object)
-			{
-				return createXmlBasicMapAdapter();
-			}
-			@Override
-			public Adapter caseXmlBasicMapImpl(XmlBasicMapImpl object)
-			{
-				return createXmlBasicMapImplAdapter();
-			}
-			@Override
-			public Adapter caseXmlTransformation(XmlTransformation object)
-			{
-				return createXmlTransformationAdapter();
-			}
-			@Override
-			public Adapter caseXmlTransformationImpl(XmlTransformationImpl object)
-			{
-				return createXmlTransformationImplAdapter();
-			}
-			@Override
-			public Adapter caseXmlVariableOneToOne(XmlVariableOneToOne object)
-			{
-				return createXmlVariableOneToOneAdapter();
-			}
-			@Override
-			public Adapter caseXmlVariableOneToOneImpl(XmlVariableOneToOneImpl object)
-			{
-				return createXmlVariableOneToOneImplAdapter();
-			}
-			@Override
-			public Adapter caseXmlTransient(XmlTransient object)
-			{
-				return createXmlTransientAdapter();
-			}
-			@Override
-			public Adapter caseXmlTransientImpl(XmlTransientImpl object)
-			{
-				return createXmlTransientImplAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlEntityMappings(org.eclipse.jpt.core.resource.orm.XmlEntityMappings object)
-			{
-				return createOrm_XmlEntityMappingsAdapter();
-			}
-			@Override
-			public Adapter caseXmlConvertersHolder(XmlConvertersHolder object)
-			{
-				return createXmlConvertersHolderAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlEntityMappings(org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings object)
-			{
-				return createEclipseLinkOrm_XmlEntityMappingsAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlAttributeMapping(org.eclipse.jpt.core.resource.orm.XmlAttributeMapping object)
-			{
-				return createOrm_XmlAttributeMappingAdapter();
-			}
-			@Override
-			public Adapter caseColumnMapping(ColumnMapping object)
-			{
-				return createColumnMappingAdapter();
-			}
-			@Override
-			public Adapter caseXmlConvertibleMapping(XmlConvertibleMapping object)
-			{
-				return createXmlConvertibleMappingAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlId(org.eclipse.jpt.core.resource.orm.XmlId object)
-			{
-				return createOrm_XmlIdAdapter();
-			}
-			@Override
-			public Adapter caseXmlMutable(XmlMutable object)
-			{
-				return createXmlMutableAdapter();
-			}
-			@Override
-			public Adapter caseXmlConverterHolder(XmlConverterHolder object)
-			{
-				return createXmlConverterHolderAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlConvertibleMapping(org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertibleMapping object)
-			{
-				return createEclipseLinkOrm_XmlConvertibleMappingAdapter();
-			}
-			@Override
-			public Adapter caseXmlAccessMethodsHolder(XmlAccessMethodsHolder object)
-			{
-				return createXmlAccessMethodsHolderAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlId(org.eclipse.jpt.eclipselink.core.resource.orm.XmlId object)
-			{
-				return createEclipseLinkOrm_XmlIdAdapter();
-			}
-			@Override
-			public Adapter caseAbstractXmlAttributeMapping(AbstractXmlAttributeMapping object)
-			{
-				return createAbstractXmlAttributeMappingAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlIdImpl(org.eclipse.jpt.core.resource.orm.XmlIdImpl object)
-			{
-				return createOrm_XmlIdImplAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlIdImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlIdImpl object)
-			{
-				return createEclipseLinkOrm_XmlIdImplAdapter();
-			}
-			@Override
-			public Adapter caseBaseXmlEmbedded(BaseXmlEmbedded object)
-			{
-				return createBaseXmlEmbeddedAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlEmbeddedId(org.eclipse.jpt.core.resource.orm.XmlEmbeddedId object)
-			{
-				return createOrm_XmlEmbeddedIdAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlEmbeddedId(org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedId object)
-			{
-				return createEclipseLinkOrm_XmlEmbeddedIdAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlEmbeddedIdImpl(org.eclipse.jpt.core.resource.orm.XmlEmbeddedIdImpl object)
-			{
-				return createOrm_XmlEmbeddedIdImplAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlEmbeddedIdImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedIdImpl object)
-			{
-				return createEclipseLinkOrm_XmlEmbeddedIdImplAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlEmbedded(org.eclipse.jpt.core.resource.orm.XmlEmbedded object)
-			{
-				return createOrm_XmlEmbeddedAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlEmbedded(org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded object)
-			{
-				return createEclipseLinkOrm_XmlEmbeddedAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlEmbeddedImpl(org.eclipse.jpt.core.resource.orm.XmlEmbeddedImpl object)
-			{
-				return createOrm_XmlEmbeddedImplAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlEmbeddedImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedImpl object)
-			{
-				return createEclipseLinkOrm_XmlEmbeddedImplAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlBasic(org.eclipse.jpt.core.resource.orm.XmlBasic object)
-			{
-				return createOrm_XmlBasicAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlBasic(org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic object)
-			{
-				return createEclipseLinkOrm_XmlBasicAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlBasicImpl(org.eclipse.jpt.core.resource.orm.XmlBasicImpl object)
-			{
-				return createOrm_XmlBasicImplAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlBasicImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicImpl object)
-			{
-				return createEclipseLinkOrm_XmlBasicImplAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlVersion(org.eclipse.jpt.core.resource.orm.XmlVersion object)
-			{
-				return createOrm_XmlVersionAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlVersion(org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion object)
-			{
-				return createEclipseLinkOrm_XmlVersionAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlVersionImpl(org.eclipse.jpt.core.resource.orm.XmlVersionImpl object)
-			{
-				return createOrm_XmlVersionImplAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlVersionImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersionImpl object)
-			{
-				return createEclipseLinkOrm_XmlVersionImplAdapter();
-			}
-			@Override
-			public Adapter caseXmlRelationshipMapping(XmlRelationshipMapping object)
-			{
-				return createXmlRelationshipMappingAdapter();
-			}
-			@Override
-			public Adapter caseXmlJoinTableMapping(XmlJoinTableMapping object)
-			{
-				return createXmlJoinTableMappingAdapter();
-			}
-			@Override
-			public Adapter caseXmlJoinColumnsMapping(XmlJoinColumnsMapping object)
-			{
-				return createXmlJoinColumnsMappingAdapter();
-			}
-			@Override
-			public Adapter caseXmlSingleRelationshipMapping(XmlSingleRelationshipMapping object)
-			{
-				return createXmlSingleRelationshipMappingAdapter();
-			}
-			@Override
-			public Adapter caseXmlMappedByMapping(XmlMappedByMapping object)
-			{
-				return createXmlMappedByMappingAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlOneToOne(org.eclipse.jpt.core.resource.orm.XmlOneToOne object)
-			{
-				return createOrm_XmlOneToOneAdapter();
-			}
-			@Override
-			public Adapter caseXmlPrivateOwned(XmlPrivateOwned object)
-			{
-				return createXmlPrivateOwnedAdapter();
-			}
-			@Override
-			public Adapter caseXmlJoinFetch(XmlJoinFetch object)
-			{
-				return createXmlJoinFetchAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlOneToOne(org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne object)
-			{
-				return createEclipseLinkOrm_XmlOneToOneAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlOneToOneImpl(org.eclipse.jpt.core.resource.orm.XmlOneToOneImpl object)
-			{
-				return createOrm_XmlOneToOneImplAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlOneToOneImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOneImpl object)
-			{
-				return createEclipseLinkOrm_XmlOneToOneImplAdapter();
-			}
-			@Override
-			public Adapter caseXmlMultiRelationshipMapping(XmlMultiRelationshipMapping object)
-			{
-				return createXmlMultiRelationshipMappingAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlOneToMany(org.eclipse.jpt.core.resource.orm.XmlOneToMany object)
-			{
-				return createOrm_XmlOneToManyAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlOneToMany(org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany object)
-			{
-				return createEclipseLinkOrm_XmlOneToManyAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlOneToManyImpl(org.eclipse.jpt.core.resource.orm.XmlOneToManyImpl object)
-			{
-				return createOrm_XmlOneToManyImplAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlOneToManyImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToManyImpl object)
-			{
-				return createEclipseLinkOrm_XmlOneToManyImplAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlManyToOne(org.eclipse.jpt.core.resource.orm.XmlManyToOne object)
-			{
-				return createOrm_XmlManyToOneAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlManyToOne(org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne object)
-			{
-				return createEclipseLinkOrm_XmlManyToOneAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlManyToOneImpl(org.eclipse.jpt.core.resource.orm.XmlManyToOneImpl object)
-			{
-				return createOrm_XmlManyToOneImplAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlManyToOneImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOneImpl object)
-			{
-				return createEclipseLinkOrm_XmlManyToOneImplAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlManyToMany(org.eclipse.jpt.core.resource.orm.XmlManyToMany object)
-			{
-				return createOrm_XmlManyToManyAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlManyToMany(org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany object)
-			{
-				return createEclipseLinkOrm_XmlManyToManyAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlManyToManyImpl(org.eclipse.jpt.core.resource.orm.XmlManyToManyImpl object)
-			{
-				return createOrm_XmlManyToManyImplAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlManyToManyImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToManyImpl object)
-			{
-				return createEclipseLinkOrm_XmlManyToManyImplAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlBasicCollection(org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection object)
-			{
-				return createEclipseLinkOrm_XmlBasicCollectionAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlBasicCollectionImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollectionImpl object)
-			{
-				return createEclipseLinkOrm_XmlBasicCollectionImplAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlBasicMap(org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap object)
-			{
-				return createEclipseLinkOrm_XmlBasicMapAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlBasicMapImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMapImpl object)
-			{
-				return createEclipseLinkOrm_XmlBasicMapImplAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlTransformation(org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation object)
-			{
-				return createEclipseLinkOrm_XmlTransformationAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlTransformationImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformationImpl object)
-			{
-				return createEclipseLinkOrm_XmlTransformationImplAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlVariableOneToOne(org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOne object)
-			{
-				return createEclipseLinkOrm_XmlVariableOneToOneAdapter();
-			}
-			@Override
-			public Adapter caseEclipseLinkOrm_XmlVariableOneToOneImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOneImpl object)
-			{
-				return createEclipseLinkOrm_XmlVariableOneToOneImplAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlTransient(org.eclipse.jpt.core.resource.orm.XmlTransient object)
-			{
-				return createOrm_XmlTransientAdapter();
-			}
-			@Override
-			public Adapter caseOrm_XmlTransientImpl(org.eclipse.jpt.core.resource.orm.XmlTransientImpl object)
-			{
-				return createOrm_XmlTransientImplAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object)
-			{
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target)
-	{
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntityMappings
-	 * @generated
-	 */
-	public Adapter createXmlEntityMappingsAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping
-	 * @generated
-	 */
-	public Adapter createXmlAttributeMappingAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlId <em>Xml Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlId
-	 * @generated
-	 */
-	public Adapter createXmlIdAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlIdImpl <em>Xml Id Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlIdImpl
-	 * @generated
-	 */
-	public Adapter createXmlIdImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedId
-	 * @generated
-	 */
-	public Adapter createXmlEmbeddedIdAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedIdImpl <em>Xml Embedded Id Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedIdImpl
-	 * @generated
-	 */
-	public Adapter createXmlEmbeddedIdImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbedded
-	 * @generated
-	 */
-	public Adapter createXmlEmbeddedAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedImpl <em>Xml Embedded Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedImpl
-	 * @generated
-	 */
-	public Adapter createXmlEmbeddedImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic <em>Xml Basic</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic
-	 * @generated
-	 */
-	public Adapter createXmlBasicAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicImpl <em>Xml Basic Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicImpl
-	 * @generated
-	 */
-	public Adapter createXmlBasicImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersion <em>Xml Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersion
-	 * @generated
-	 */
-	public Adapter createXmlVersionAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersionImpl <em>Xml Version Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersionImpl
-	 * @generated
-	 */
-	public Adapter createXmlVersionImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOne
-	 * @generated
-	 */
-	public Adapter createXmlOneToOneAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOneImpl <em>Xml One To One Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOneImpl
-	 * @generated
-	 */
-	public Adapter createXmlOneToOneImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToMany
-	 * @generated
-	 */
-	public Adapter createXmlOneToManyAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToManyImpl <em>Xml One To Many Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToManyImpl
-	 * @generated
-	 */
-	public Adapter createXmlOneToManyImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOne
-	 * @generated
-	 */
-	public Adapter createXmlManyToOneAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOneImpl <em>Xml Many To One Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOneImpl
-	 * @generated
-	 */
-	public Adapter createXmlManyToOneImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToMany
-	 * @generated
-	 */
-	public Adapter createXmlManyToManyAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToManyImpl <em>Xml Many To Many Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToManyImpl
-	 * @generated
-	 */
-	public Adapter createXmlManyToManyImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollection <em>Xml Basic Collection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollection
-	 * @generated
-	 */
-	public Adapter createXmlBasicCollectionAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollectionImpl <em>Xml Basic Collection Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollectionImpl
-	 * @generated
-	 */
-	public Adapter createXmlBasicCollectionImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMap <em>Xml Basic Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMap
-	 * @generated
-	 */
-	public Adapter createXmlBasicMapAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMapImpl <em>Xml Basic Map Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMapImpl
-	 * @generated
-	 */
-	public Adapter createXmlBasicMapImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformation <em>Xml Transformation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformation
-	 * @generated
-	 */
-	public Adapter createXmlTransformationAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformationImpl <em>Xml Transformation Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformationImpl
-	 * @generated
-	 */
-	public Adapter createXmlTransformationImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOne <em>Xml Variable One To One</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOne
-	 * @generated
-	 */
-	public Adapter createXmlVariableOneToOneAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOneImpl <em>Xml Variable One To One Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOneImpl
-	 * @generated
-	 */
-	public Adapter createXmlVariableOneToOneImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransient <em>Xml Transient</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransient
-	 * @generated
-	 */
-	public Adapter createXmlTransientAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransientImpl <em>Xml Transient Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransientImpl
-	 * @generated
-	 */
-	public Adapter createXmlTransientImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntityMappings
-	 * @generated
-	 */
-	public Adapter createOrm_XmlEntityMappingsAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertersHolder <em>Xml Converters Holder</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertersHolder
-	 * @generated
-	 */
-	public Adapter createXmlConvertersHolderAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlEntityMappingsAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAttributeMapping
-	 * @generated
-	 */
-	public Adapter createOrm_XmlAttributeMappingAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.ColumnMapping <em>Column Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.ColumnMapping
-	 * @generated
-	 */
-	public Adapter createColumnMappingAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlConvertibleMapping <em>Xml Convertible Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlConvertibleMapping
-	 * @generated
-	 */
-	public Adapter createXmlConvertibleMappingAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlId <em>Xml Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlId
-	 * @generated
-	 */
-	public Adapter createOrm_XmlIdAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMutable <em>Xml Mutable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlMutable
-	 * @generated
-	 */
-	public Adapter createXmlMutableAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterHolder <em>Xml Converter Holder</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterHolder
-	 * @generated
-	 */
-	public Adapter createXmlConverterHolderAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertibleMapping <em>Xml Convertible Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertibleMapping
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlConvertibleMappingAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethodsHolder <em>Xml Access Methods Holder</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethodsHolder
-	 * @generated
-	 */
-	public Adapter createXmlAccessMethodsHolderAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlId <em>Xml Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlId
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlIdAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlAttributeMapping <em>Abstract Xml Attribute Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlAttributeMapping
-	 * @generated
-	 */
-	public Adapter createAbstractXmlAttributeMappingAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlIdImpl <em>Xml Id Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlIdImpl
-	 * @generated
-	 */
-	public Adapter createOrm_XmlIdImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlIdImpl <em>Xml Id Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlIdImpl
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlIdImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.BaseXmlEmbedded <em>Base Xml Embedded</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.BaseXmlEmbedded
-	 * @generated
-	 */
-	public Adapter createBaseXmlEmbeddedAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEmbeddedId
-	 * @generated
-	 */
-	public Adapter createOrm_XmlEmbeddedIdAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedId
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlEmbeddedIdAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddedIdImpl <em>Xml Embedded Id Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEmbeddedIdImpl
-	 * @generated
-	 */
-	public Adapter createOrm_XmlEmbeddedIdImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedIdImpl <em>Xml Embedded Id Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedIdImpl
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlEmbeddedIdImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEmbedded
-	 * @generated
-	 */
-	public Adapter createOrm_XmlEmbeddedAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlEmbeddedAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddedImpl <em>Xml Embedded Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEmbeddedImpl
-	 * @generated
-	 */
-	public Adapter createOrm_XmlEmbeddedImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedImpl <em>Xml Embedded Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedImpl
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlEmbeddedImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlBasic <em>Xml Basic</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlBasic
-	 * @generated
-	 */
-	public Adapter createOrm_XmlBasicAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic <em>Xml Basic</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlBasicAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlBasicImpl <em>Xml Basic Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlBasicImpl
-	 * @generated
-	 */
-	public Adapter createOrm_XmlBasicImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicImpl <em>Xml Basic Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicImpl
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlBasicImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlVersion <em>Xml Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlVersion
-	 * @generated
-	 */
-	public Adapter createOrm_XmlVersionAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion <em>Xml Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlVersionAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlVersionImpl <em>Xml Version Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlVersionImpl
-	 * @generated
-	 */
-	public Adapter createOrm_XmlVersionImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersionImpl <em>Xml Version Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersionImpl
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlVersionImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping <em>Xml Relationship Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping
-	 * @generated
-	 */
-	public Adapter createXmlRelationshipMappingAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlJoinTableMapping <em>Xml Join Table Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlJoinTableMapping
-	 * @generated
-	 */
-	public Adapter createXmlJoinTableMappingAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlJoinColumnsMapping <em>Xml Join Columns Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlJoinColumnsMapping
-	 * @generated
-	 */
-	public Adapter createXmlJoinColumnsMappingAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping <em>Xml Single Relationship Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping
-	 * @generated
-	 */
-	public Adapter createXmlSingleRelationshipMappingAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlMappedByMapping <em>Xml Mapped By Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMappedByMapping
-	 * @generated
-	 */
-	public Adapter createXmlMappedByMappingAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlOneToOne
-	 * @generated
-	 */
-	public Adapter createOrm_XmlOneToOneAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlPrivateOwned <em>Xml Private Owned</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlPrivateOwned
-	 * @generated
-	 */
-	public Adapter createXmlPrivateOwnedAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetch <em>Xml Join Fetch</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetch
-	 * @generated
-	 */
-	public Adapter createXmlJoinFetchAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlOneToOneAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOneImpl <em>Xml One To One Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlOneToOneImpl
-	 * @generated
-	 */
-	public Adapter createOrm_XmlOneToOneImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOneImpl <em>Xml One To One Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOneImpl
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlOneToOneImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping <em>Xml Multi Relationship Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping
-	 * @generated
-	 */
-	public Adapter createXmlMultiRelationshipMappingAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlOneToMany
-	 * @generated
-	 */
-	public Adapter createOrm_XmlOneToManyAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlOneToManyAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlOneToManyImpl <em>Xml One To Many Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlOneToManyImpl
-	 * @generated
-	 */
-	public Adapter createOrm_XmlOneToManyImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToManyImpl <em>Xml One To Many Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToManyImpl
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlOneToManyImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlManyToOne
-	 * @generated
-	 */
-	public Adapter createOrm_XmlManyToOneAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlManyToOneAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlManyToOneImpl <em>Xml Many To One Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlManyToOneImpl
-	 * @generated
-	 */
-	public Adapter createOrm_XmlManyToOneImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOneImpl <em>Xml Many To One Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOneImpl
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlManyToOneImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlManyToMany
-	 * @generated
-	 */
-	public Adapter createOrm_XmlManyToManyAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlManyToManyAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlManyToManyImpl <em>Xml Many To Many Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlManyToManyImpl
-	 * @generated
-	 */
-	public Adapter createOrm_XmlManyToManyImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToManyImpl <em>Xml Many To Many Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToManyImpl
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlManyToManyImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection <em>Xml Basic Collection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlBasicCollectionAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollectionImpl <em>Xml Basic Collection Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollectionImpl
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlBasicCollectionImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap <em>Xml Basic Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlBasicMapAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMapImpl <em>Xml Basic Map Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMapImpl
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlBasicMapImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation <em>Xml Transformation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlTransformationAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformationImpl <em>Xml Transformation Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformationImpl
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlTransformationImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOne <em>Xml Variable One To One</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOne
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlVariableOneToOneAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOneImpl <em>Xml Variable One To One Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOneImpl
-	 * @generated
-	 */
-	public Adapter createEclipseLinkOrm_XmlVariableOneToOneImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlTransient <em>Xml Transient</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlTransient
-	 * @generated
-	 */
-	public Adapter createOrm_XmlTransientAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.resource.orm.XmlTransientImpl <em>Xml Transient Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlTransientImpl
-	 * @generated
-	 */
-	public Adapter createOrm_XmlTransientImplAdapter()
-	{
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter()
-	{
-		return null;
-	}
-
-} //EclipseLink1_1OrmAdapterFactory
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/util/EclipseLink1_1OrmSwitch.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/util/EclipseLink1_1OrmSwitch.java
deleted file mode 100644
index 7f1270b2ca..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/util/EclipseLink1_1OrmSwitch.java
+++ /dev/null
@@ -1,2151 +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.eclipselink1_1.core.resource.orm.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.jpt.core.resource.orm.AbstractXmlAttributeMapping;
-import org.eclipse.jpt.core.resource.orm.BaseXmlEmbedded;
-import org.eclipse.jpt.core.resource.orm.ColumnMapping;
-import org.eclipse.jpt.core.resource.orm.XmlConvertibleMapping;
-import org.eclipse.jpt.core.resource.orm.XmlJoinColumnsMapping;
-import org.eclipse.jpt.core.resource.orm.XmlJoinTableMapping;
-import org.eclipse.jpt.core.resource.orm.XmlMappedByMapping;
-import org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping;
-import org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping;
-import org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping;
-
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethodsHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertersHolder;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetch;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlMutable;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlPrivateOwned;
-
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage
- * @generated
- */
-public class EclipseLink1_1OrmSwitch<T>
-{
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static EclipseLink1_1OrmPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseLink1_1OrmSwitch()
-	{
-		if (modelPackage == null)
-		{
-			modelPackage = EclipseLink1_1OrmPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public T doSwitch(EObject theEObject)
-	{
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(EClass theEClass, EObject theEObject)
-	{
-		if (theEClass.eContainer() == modelPackage)
-		{
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else
-		{
-			List<EClass> eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch(eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(int classifierID, EObject theEObject)
-	{
-		switch (classifierID)
-		{
-			case EclipseLink1_1OrmPackage.XML_ENTITY_MAPPINGS:
-			{
-				XmlEntityMappings xmlEntityMappings = (XmlEntityMappings)theEObject;
-				T result = caseXmlEntityMappings(xmlEntityMappings);
-				if (result == null) result = caseEclipseLinkOrm_XmlEntityMappings(xmlEntityMappings);
-				if (result == null) result = caseOrm_XmlEntityMappings(xmlEntityMappings);
-				if (result == null) result = caseXmlConvertersHolder(xmlEntityMappings);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_ATTRIBUTE_MAPPING:
-			{
-				XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping)theEObject;
-				T result = caseXmlAttributeMapping(xmlAttributeMapping);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlAttributeMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_ID:
-			{
-				XmlId xmlId = (XmlId)theEObject;
-				T result = caseXmlId(xmlId);
-				if (result == null) result = caseEclipseLinkOrm_XmlId(xmlId);
-				if (result == null) result = caseXmlAttributeMapping(xmlId);
-				if (result == null) result = caseOrm_XmlId(xmlId);
-				if (result == null) result = caseXmlMutable(xmlId);
-				if (result == null) result = caseEclipseLinkOrm_XmlConvertibleMapping(xmlId);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlId);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlId);
-				if (result == null) result = caseColumnMapping(xmlId);
-				if (result == null) result = caseXmlConvertibleMapping(xmlId);
-				if (result == null) result = caseXmlConverterHolder(xmlId);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_ID_IMPL:
-			{
-				XmlIdImpl xmlIdImpl = (XmlIdImpl)theEObject;
-				T result = caseXmlIdImpl(xmlIdImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlIdImpl(xmlIdImpl);
-				if (result == null) result = caseXmlId(xmlIdImpl);
-				if (result == null) result = caseOrm_XmlIdImpl(xmlIdImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlId(xmlIdImpl);
-				if (result == null) result = caseXmlAttributeMapping(xmlIdImpl);
-				if (result == null) result = caseAbstractXmlAttributeMapping(xmlIdImpl);
-				if (result == null) result = caseOrm_XmlId(xmlIdImpl);
-				if (result == null) result = caseXmlMutable(xmlIdImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlConvertibleMapping(xmlIdImpl);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlIdImpl);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlIdImpl);
-				if (result == null) result = caseColumnMapping(xmlIdImpl);
-				if (result == null) result = caseXmlConvertibleMapping(xmlIdImpl);
-				if (result == null) result = caseXmlConverterHolder(xmlIdImpl);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_EMBEDDED_ID:
-			{
-				XmlEmbeddedId xmlEmbeddedId = (XmlEmbeddedId)theEObject;
-				T result = caseXmlEmbeddedId(xmlEmbeddedId);
-				if (result == null) result = caseEclipseLinkOrm_XmlEmbeddedId(xmlEmbeddedId);
-				if (result == null) result = caseXmlAttributeMapping(xmlEmbeddedId);
-				if (result == null) result = caseOrm_XmlEmbeddedId(xmlEmbeddedId);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlEmbeddedId);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlEmbeddedId);
-				if (result == null) result = caseBaseXmlEmbedded(xmlEmbeddedId);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_EMBEDDED_ID_IMPL:
-			{
-				XmlEmbeddedIdImpl xmlEmbeddedIdImpl = (XmlEmbeddedIdImpl)theEObject;
-				T result = caseXmlEmbeddedIdImpl(xmlEmbeddedIdImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlEmbeddedIdImpl(xmlEmbeddedIdImpl);
-				if (result == null) result = caseXmlEmbeddedId(xmlEmbeddedIdImpl);
-				if (result == null) result = caseOrm_XmlEmbeddedIdImpl(xmlEmbeddedIdImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlEmbeddedId(xmlEmbeddedIdImpl);
-				if (result == null) result = caseXmlAttributeMapping(xmlEmbeddedIdImpl);
-				if (result == null) result = caseAbstractXmlAttributeMapping(xmlEmbeddedIdImpl);
-				if (result == null) result = caseOrm_XmlEmbeddedId(xmlEmbeddedIdImpl);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlEmbeddedIdImpl);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlEmbeddedIdImpl);
-				if (result == null) result = caseBaseXmlEmbedded(xmlEmbeddedIdImpl);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_EMBEDDED:
-			{
-				XmlEmbedded xmlEmbedded = (XmlEmbedded)theEObject;
-				T result = caseXmlEmbedded(xmlEmbedded);
-				if (result == null) result = caseEclipseLinkOrm_XmlEmbedded(xmlEmbedded);
-				if (result == null) result = caseXmlAttributeMapping(xmlEmbedded);
-				if (result == null) result = caseOrm_XmlEmbedded(xmlEmbedded);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlEmbedded);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlEmbedded);
-				if (result == null) result = caseBaseXmlEmbedded(xmlEmbedded);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_EMBEDDED_IMPL:
-			{
-				XmlEmbeddedImpl xmlEmbeddedImpl = (XmlEmbeddedImpl)theEObject;
-				T result = caseXmlEmbeddedImpl(xmlEmbeddedImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlEmbeddedImpl(xmlEmbeddedImpl);
-				if (result == null) result = caseXmlEmbedded(xmlEmbeddedImpl);
-				if (result == null) result = caseOrm_XmlEmbeddedImpl(xmlEmbeddedImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlEmbedded(xmlEmbeddedImpl);
-				if (result == null) result = caseXmlAttributeMapping(xmlEmbeddedImpl);
-				if (result == null) result = caseAbstractXmlAttributeMapping(xmlEmbeddedImpl);
-				if (result == null) result = caseOrm_XmlEmbedded(xmlEmbeddedImpl);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlEmbeddedImpl);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlEmbeddedImpl);
-				if (result == null) result = caseBaseXmlEmbedded(xmlEmbeddedImpl);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_BASIC:
-			{
-				XmlBasic xmlBasic = (XmlBasic)theEObject;
-				T result = caseXmlBasic(xmlBasic);
-				if (result == null) result = caseEclipseLinkOrm_XmlBasic(xmlBasic);
-				if (result == null) result = caseXmlAttributeMapping(xmlBasic);
-				if (result == null) result = caseOrm_XmlBasic(xmlBasic);
-				if (result == null) result = caseXmlMutable(xmlBasic);
-				if (result == null) result = caseEclipseLinkOrm_XmlConvertibleMapping(xmlBasic);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlBasic);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlBasic);
-				if (result == null) result = caseColumnMapping(xmlBasic);
-				if (result == null) result = caseXmlConvertibleMapping(xmlBasic);
-				if (result == null) result = caseXmlConverterHolder(xmlBasic);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_BASIC_IMPL:
-			{
-				XmlBasicImpl xmlBasicImpl = (XmlBasicImpl)theEObject;
-				T result = caseXmlBasicImpl(xmlBasicImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlBasicImpl(xmlBasicImpl);
-				if (result == null) result = caseXmlBasic(xmlBasicImpl);
-				if (result == null) result = caseOrm_XmlBasicImpl(xmlBasicImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlBasic(xmlBasicImpl);
-				if (result == null) result = caseXmlAttributeMapping(xmlBasicImpl);
-				if (result == null) result = caseAbstractXmlAttributeMapping(xmlBasicImpl);
-				if (result == null) result = caseOrm_XmlBasic(xmlBasicImpl);
-				if (result == null) result = caseXmlMutable(xmlBasicImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlConvertibleMapping(xmlBasicImpl);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlBasicImpl);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlBasicImpl);
-				if (result == null) result = caseColumnMapping(xmlBasicImpl);
-				if (result == null) result = caseXmlConvertibleMapping(xmlBasicImpl);
-				if (result == null) result = caseXmlConverterHolder(xmlBasicImpl);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_VERSION:
-			{
-				XmlVersion xmlVersion = (XmlVersion)theEObject;
-				T result = caseXmlVersion(xmlVersion);
-				if (result == null) result = caseEclipseLinkOrm_XmlVersion(xmlVersion);
-				if (result == null) result = caseXmlAttributeMapping(xmlVersion);
-				if (result == null) result = caseOrm_XmlVersion(xmlVersion);
-				if (result == null) result = caseXmlMutable(xmlVersion);
-				if (result == null) result = caseEclipseLinkOrm_XmlConvertibleMapping(xmlVersion);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlVersion);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlVersion);
-				if (result == null) result = caseColumnMapping(xmlVersion);
-				if (result == null) result = caseXmlConvertibleMapping(xmlVersion);
-				if (result == null) result = caseXmlConverterHolder(xmlVersion);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_VERSION_IMPL:
-			{
-				XmlVersionImpl xmlVersionImpl = (XmlVersionImpl)theEObject;
-				T result = caseXmlVersionImpl(xmlVersionImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlVersionImpl(xmlVersionImpl);
-				if (result == null) result = caseXmlVersion(xmlVersionImpl);
-				if (result == null) result = caseOrm_XmlVersionImpl(xmlVersionImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlVersion(xmlVersionImpl);
-				if (result == null) result = caseXmlAttributeMapping(xmlVersionImpl);
-				if (result == null) result = caseAbstractXmlAttributeMapping(xmlVersionImpl);
-				if (result == null) result = caseOrm_XmlVersion(xmlVersionImpl);
-				if (result == null) result = caseXmlMutable(xmlVersionImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlConvertibleMapping(xmlVersionImpl);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlVersionImpl);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlVersionImpl);
-				if (result == null) result = caseColumnMapping(xmlVersionImpl);
-				if (result == null) result = caseXmlConvertibleMapping(xmlVersionImpl);
-				if (result == null) result = caseXmlConverterHolder(xmlVersionImpl);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_ONE_TO_ONE:
-			{
-				XmlOneToOne xmlOneToOne = (XmlOneToOne)theEObject;
-				T result = caseXmlOneToOne(xmlOneToOne);
-				if (result == null) result = caseEclipseLinkOrm_XmlOneToOne(xmlOneToOne);
-				if (result == null) result = caseXmlAttributeMapping(xmlOneToOne);
-				if (result == null) result = caseOrm_XmlOneToOne(xmlOneToOne);
-				if (result == null) result = caseXmlPrivateOwned(xmlOneToOne);
-				if (result == null) result = caseXmlJoinFetch(xmlOneToOne);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlOneToOne);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlOneToOne);
-				if (result == null) result = caseXmlSingleRelationshipMapping(xmlOneToOne);
-				if (result == null) result = caseXmlMappedByMapping(xmlOneToOne);
-				if (result == null) result = caseXmlRelationshipMapping(xmlOneToOne);
-				if (result == null) result = caseXmlJoinTableMapping(xmlOneToOne);
-				if (result == null) result = caseXmlJoinColumnsMapping(xmlOneToOne);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_ONE_TO_ONE_IMPL:
-			{
-				XmlOneToOneImpl xmlOneToOneImpl = (XmlOneToOneImpl)theEObject;
-				T result = caseXmlOneToOneImpl(xmlOneToOneImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlOneToOneImpl(xmlOneToOneImpl);
-				if (result == null) result = caseXmlOneToOne(xmlOneToOneImpl);
-				if (result == null) result = caseOrm_XmlOneToOneImpl(xmlOneToOneImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlOneToOne(xmlOneToOneImpl);
-				if (result == null) result = caseXmlAttributeMapping(xmlOneToOneImpl);
-				if (result == null) result = caseAbstractXmlAttributeMapping(xmlOneToOneImpl);
-				if (result == null) result = caseOrm_XmlOneToOne(xmlOneToOneImpl);
-				if (result == null) result = caseXmlPrivateOwned(xmlOneToOneImpl);
-				if (result == null) result = caseXmlJoinFetch(xmlOneToOneImpl);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlOneToOneImpl);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlOneToOneImpl);
-				if (result == null) result = caseXmlSingleRelationshipMapping(xmlOneToOneImpl);
-				if (result == null) result = caseXmlMappedByMapping(xmlOneToOneImpl);
-				if (result == null) result = caseXmlRelationshipMapping(xmlOneToOneImpl);
-				if (result == null) result = caseXmlJoinTableMapping(xmlOneToOneImpl);
-				if (result == null) result = caseXmlJoinColumnsMapping(xmlOneToOneImpl);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_ONE_TO_MANY:
-			{
-				XmlOneToMany xmlOneToMany = (XmlOneToMany)theEObject;
-				T result = caseXmlOneToMany(xmlOneToMany);
-				if (result == null) result = caseEclipseLinkOrm_XmlOneToMany(xmlOneToMany);
-				if (result == null) result = caseXmlAttributeMapping(xmlOneToMany);
-				if (result == null) result = caseOrm_XmlOneToMany(xmlOneToMany);
-				if (result == null) result = caseXmlPrivateOwned(xmlOneToMany);
-				if (result == null) result = caseXmlJoinFetch(xmlOneToMany);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlOneToMany);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlOneToMany);
-				if (result == null) result = caseXmlMultiRelationshipMapping(xmlOneToMany);
-				if (result == null) result = caseXmlJoinColumnsMapping(xmlOneToMany);
-				if (result == null) result = caseXmlMappedByMapping(xmlOneToMany);
-				if (result == null) result = caseXmlJoinTableMapping(xmlOneToMany);
-				if (result == null) result = caseXmlRelationshipMapping(xmlOneToMany);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_ONE_TO_MANY_IMPL:
-			{
-				XmlOneToManyImpl xmlOneToManyImpl = (XmlOneToManyImpl)theEObject;
-				T result = caseXmlOneToManyImpl(xmlOneToManyImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlOneToManyImpl(xmlOneToManyImpl);
-				if (result == null) result = caseXmlOneToMany(xmlOneToManyImpl);
-				if (result == null) result = caseOrm_XmlOneToManyImpl(xmlOneToManyImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlOneToMany(xmlOneToManyImpl);
-				if (result == null) result = caseXmlAttributeMapping(xmlOneToManyImpl);
-				if (result == null) result = caseAbstractXmlAttributeMapping(xmlOneToManyImpl);
-				if (result == null) result = caseOrm_XmlOneToMany(xmlOneToManyImpl);
-				if (result == null) result = caseXmlPrivateOwned(xmlOneToManyImpl);
-				if (result == null) result = caseXmlJoinFetch(xmlOneToManyImpl);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlOneToManyImpl);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlOneToManyImpl);
-				if (result == null) result = caseXmlMultiRelationshipMapping(xmlOneToManyImpl);
-				if (result == null) result = caseXmlJoinColumnsMapping(xmlOneToManyImpl);
-				if (result == null) result = caseXmlMappedByMapping(xmlOneToManyImpl);
-				if (result == null) result = caseXmlJoinTableMapping(xmlOneToManyImpl);
-				if (result == null) result = caseXmlRelationshipMapping(xmlOneToManyImpl);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_MANY_TO_ONE:
-			{
-				XmlManyToOne xmlManyToOne = (XmlManyToOne)theEObject;
-				T result = caseXmlManyToOne(xmlManyToOne);
-				if (result == null) result = caseEclipseLinkOrm_XmlManyToOne(xmlManyToOne);
-				if (result == null) result = caseXmlAttributeMapping(xmlManyToOne);
-				if (result == null) result = caseOrm_XmlManyToOne(xmlManyToOne);
-				if (result == null) result = caseXmlJoinFetch(xmlManyToOne);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlManyToOne);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlManyToOne);
-				if (result == null) result = caseXmlSingleRelationshipMapping(xmlManyToOne);
-				if (result == null) result = caseXmlRelationshipMapping(xmlManyToOne);
-				if (result == null) result = caseXmlJoinTableMapping(xmlManyToOne);
-				if (result == null) result = caseXmlJoinColumnsMapping(xmlManyToOne);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_MANY_TO_ONE_IMPL:
-			{
-				XmlManyToOneImpl xmlManyToOneImpl = (XmlManyToOneImpl)theEObject;
-				T result = caseXmlManyToOneImpl(xmlManyToOneImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlManyToOneImpl(xmlManyToOneImpl);
-				if (result == null) result = caseXmlManyToOne(xmlManyToOneImpl);
-				if (result == null) result = caseOrm_XmlManyToOneImpl(xmlManyToOneImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlManyToOne(xmlManyToOneImpl);
-				if (result == null) result = caseXmlAttributeMapping(xmlManyToOneImpl);
-				if (result == null) result = caseAbstractXmlAttributeMapping(xmlManyToOneImpl);
-				if (result == null) result = caseOrm_XmlManyToOne(xmlManyToOneImpl);
-				if (result == null) result = caseXmlJoinFetch(xmlManyToOneImpl);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlManyToOneImpl);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlManyToOneImpl);
-				if (result == null) result = caseXmlSingleRelationshipMapping(xmlManyToOneImpl);
-				if (result == null) result = caseXmlRelationshipMapping(xmlManyToOneImpl);
-				if (result == null) result = caseXmlJoinTableMapping(xmlManyToOneImpl);
-				if (result == null) result = caseXmlJoinColumnsMapping(xmlManyToOneImpl);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_MANY_TO_MANY:
-			{
-				XmlManyToMany xmlManyToMany = (XmlManyToMany)theEObject;
-				T result = caseXmlManyToMany(xmlManyToMany);
-				if (result == null) result = caseEclipseLinkOrm_XmlManyToMany(xmlManyToMany);
-				if (result == null) result = caseXmlAttributeMapping(xmlManyToMany);
-				if (result == null) result = caseOrm_XmlManyToMany(xmlManyToMany);
-				if (result == null) result = caseXmlJoinFetch(xmlManyToMany);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlManyToMany);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlManyToMany);
-				if (result == null) result = caseXmlMultiRelationshipMapping(xmlManyToMany);
-				if (result == null) result = caseXmlMappedByMapping(xmlManyToMany);
-				if (result == null) result = caseXmlJoinTableMapping(xmlManyToMany);
-				if (result == null) result = caseXmlRelationshipMapping(xmlManyToMany);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_MANY_TO_MANY_IMPL:
-			{
-				XmlManyToManyImpl xmlManyToManyImpl = (XmlManyToManyImpl)theEObject;
-				T result = caseXmlManyToManyImpl(xmlManyToManyImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlManyToManyImpl(xmlManyToManyImpl);
-				if (result == null) result = caseXmlManyToMany(xmlManyToManyImpl);
-				if (result == null) result = caseOrm_XmlManyToManyImpl(xmlManyToManyImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlManyToMany(xmlManyToManyImpl);
-				if (result == null) result = caseXmlAttributeMapping(xmlManyToManyImpl);
-				if (result == null) result = caseAbstractXmlAttributeMapping(xmlManyToManyImpl);
-				if (result == null) result = caseOrm_XmlManyToMany(xmlManyToManyImpl);
-				if (result == null) result = caseXmlJoinFetch(xmlManyToManyImpl);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlManyToManyImpl);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlManyToManyImpl);
-				if (result == null) result = caseXmlMultiRelationshipMapping(xmlManyToManyImpl);
-				if (result == null) result = caseXmlMappedByMapping(xmlManyToManyImpl);
-				if (result == null) result = caseXmlJoinTableMapping(xmlManyToManyImpl);
-				if (result == null) result = caseXmlRelationshipMapping(xmlManyToManyImpl);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_BASIC_COLLECTION:
-			{
-				XmlBasicCollection xmlBasicCollection = (XmlBasicCollection)theEObject;
-				T result = caseXmlBasicCollection(xmlBasicCollection);
-				if (result == null) result = caseEclipseLinkOrm_XmlBasicCollection(xmlBasicCollection);
-				if (result == null) result = caseXmlAttributeMapping(xmlBasicCollection);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlBasicCollection);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlBasicCollection);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_BASIC_COLLECTION_IMPL:
-			{
-				XmlBasicCollectionImpl xmlBasicCollectionImpl = (XmlBasicCollectionImpl)theEObject;
-				T result = caseXmlBasicCollectionImpl(xmlBasicCollectionImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlBasicCollectionImpl(xmlBasicCollectionImpl);
-				if (result == null) result = caseXmlBasicCollection(xmlBasicCollectionImpl);
-				if (result == null) result = caseAbstractXmlAttributeMapping(xmlBasicCollectionImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlBasicCollection(xmlBasicCollectionImpl);
-				if (result == null) result = caseXmlAttributeMapping(xmlBasicCollectionImpl);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlBasicCollectionImpl);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlBasicCollectionImpl);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_BASIC_MAP:
-			{
-				XmlBasicMap xmlBasicMap = (XmlBasicMap)theEObject;
-				T result = caseXmlBasicMap(xmlBasicMap);
-				if (result == null) result = caseEclipseLinkOrm_XmlBasicMap(xmlBasicMap);
-				if (result == null) result = caseXmlAttributeMapping(xmlBasicMap);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlBasicMap);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlBasicMap);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_BASIC_MAP_IMPL:
-			{
-				XmlBasicMapImpl xmlBasicMapImpl = (XmlBasicMapImpl)theEObject;
-				T result = caseXmlBasicMapImpl(xmlBasicMapImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlBasicMapImpl(xmlBasicMapImpl);
-				if (result == null) result = caseXmlBasicMap(xmlBasicMapImpl);
-				if (result == null) result = caseAbstractXmlAttributeMapping(xmlBasicMapImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlBasicMap(xmlBasicMapImpl);
-				if (result == null) result = caseXmlAttributeMapping(xmlBasicMapImpl);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlBasicMapImpl);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlBasicMapImpl);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_TRANSFORMATION:
-			{
-				XmlTransformation xmlTransformation = (XmlTransformation)theEObject;
-				T result = caseXmlTransformation(xmlTransformation);
-				if (result == null) result = caseEclipseLinkOrm_XmlTransformation(xmlTransformation);
-				if (result == null) result = caseXmlAttributeMapping(xmlTransformation);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlTransformation);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlTransformation);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_TRANSFORMATION_IMPL:
-			{
-				XmlTransformationImpl xmlTransformationImpl = (XmlTransformationImpl)theEObject;
-				T result = caseXmlTransformationImpl(xmlTransformationImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlTransformationImpl(xmlTransformationImpl);
-				if (result == null) result = caseXmlTransformation(xmlTransformationImpl);
-				if (result == null) result = caseAbstractXmlAttributeMapping(xmlTransformationImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlTransformation(xmlTransformationImpl);
-				if (result == null) result = caseXmlAttributeMapping(xmlTransformationImpl);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlTransformationImpl);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlTransformationImpl);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_VARIABLE_ONE_TO_ONE:
-			{
-				XmlVariableOneToOne xmlVariableOneToOne = (XmlVariableOneToOne)theEObject;
-				T result = caseXmlVariableOneToOne(xmlVariableOneToOne);
-				if (result == null) result = caseEclipseLinkOrm_XmlVariableOneToOne(xmlVariableOneToOne);
-				if (result == null) result = caseXmlAttributeMapping(xmlVariableOneToOne);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlVariableOneToOne);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlVariableOneToOne);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_VARIABLE_ONE_TO_ONE_IMPL:
-			{
-				XmlVariableOneToOneImpl xmlVariableOneToOneImpl = (XmlVariableOneToOneImpl)theEObject;
-				T result = caseXmlVariableOneToOneImpl(xmlVariableOneToOneImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlVariableOneToOneImpl(xmlVariableOneToOneImpl);
-				if (result == null) result = caseXmlVariableOneToOne(xmlVariableOneToOneImpl);
-				if (result == null) result = caseAbstractXmlAttributeMapping(xmlVariableOneToOneImpl);
-				if (result == null) result = caseEclipseLinkOrm_XmlVariableOneToOne(xmlVariableOneToOneImpl);
-				if (result == null) result = caseXmlAttributeMapping(xmlVariableOneToOneImpl);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlVariableOneToOneImpl);
-				if (result == null) result = caseXmlAccessMethodsHolder(xmlVariableOneToOneImpl);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_TRANSIENT:
-			{
-				XmlTransient xmlTransient = (XmlTransient)theEObject;
-				T result = caseXmlTransient(xmlTransient);
-				if (result == null) result = caseOrm_XmlTransient(xmlTransient);
-				if (result == null) result = caseXmlAttributeMapping(xmlTransient);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlTransient);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EclipseLink1_1OrmPackage.XML_TRANSIENT_IMPL:
-			{
-				XmlTransientImpl xmlTransientImpl = (XmlTransientImpl)theEObject;
-				T result = caseXmlTransientImpl(xmlTransientImpl);
-				if (result == null) result = caseOrm_XmlTransientImpl(xmlTransientImpl);
-				if (result == null) result = caseXmlTransient(xmlTransientImpl);
-				if (result == null) result = caseAbstractXmlAttributeMapping(xmlTransientImpl);
-				if (result == null) result = caseOrm_XmlTransient(xmlTransientImpl);
-				if (result == null) result = caseXmlAttributeMapping(xmlTransientImpl);
-				if (result == null) result = caseOrm_XmlAttributeMapping(xmlTransientImpl);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Entity Mappings</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Entity Mappings</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlEntityMappings(XmlEntityMappings object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Attribute Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Attribute Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlAttributeMapping(XmlAttributeMapping object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Id</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Id</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlId(XmlId object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Id Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Id Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlIdImpl(XmlIdImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Embedded Id</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Embedded Id</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlEmbeddedId(XmlEmbeddedId object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Embedded Id Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Embedded Id Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlEmbeddedIdImpl(XmlEmbeddedIdImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Embedded</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Embedded</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlEmbedded(XmlEmbedded object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Embedded Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Embedded Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlEmbeddedImpl(XmlEmbeddedImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Basic</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Basic</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlBasic(XmlBasic object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Basic Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Basic Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlBasicImpl(XmlBasicImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Version</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Version</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlVersion(XmlVersion object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Version Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Version Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlVersionImpl(XmlVersionImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml One To One</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml One To One</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlOneToOne(XmlOneToOne object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml One To One Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml One To One Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlOneToOneImpl(XmlOneToOneImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml One To Many</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml One To Many</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlOneToMany(XmlOneToMany object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml One To Many Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml One To Many Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlOneToManyImpl(XmlOneToManyImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Many To One</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Many To One</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlManyToOne(XmlManyToOne object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Many To One Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Many To One Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlManyToOneImpl(XmlManyToOneImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Many To Many</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Many To Many</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlManyToMany(XmlManyToMany object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Many To Many Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Many To Many Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlManyToManyImpl(XmlManyToManyImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Basic Collection</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Basic Collection</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlBasicCollection(XmlBasicCollection object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Basic Collection Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Basic Collection Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlBasicCollectionImpl(XmlBasicCollectionImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Basic Map</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Basic Map</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlBasicMap(XmlBasicMap object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Basic Map Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Basic Map Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlBasicMapImpl(XmlBasicMapImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Transformation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Transformation</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlTransformation(XmlTransformation object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Transformation Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Transformation Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlTransformationImpl(XmlTransformationImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Variable One To One</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Variable One To One</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlVariableOneToOne(XmlVariableOneToOne object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Variable One To One Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Variable One To One Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlVariableOneToOneImpl(XmlVariableOneToOneImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Transient</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Transient</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlTransient(XmlTransient object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Transient Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Transient Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlTransientImpl(XmlTransientImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Entity Mappings</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Entity Mappings</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlEntityMappings(org.eclipse.jpt.core.resource.orm.XmlEntityMappings object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Converters Holder</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Converters Holder</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlConvertersHolder(XmlConvertersHolder object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Entity Mappings</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Entity Mappings</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlEntityMappings(org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Attribute Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Attribute Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlAttributeMapping(org.eclipse.jpt.core.resource.orm.XmlAttributeMapping object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Column Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Column Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseColumnMapping(ColumnMapping object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Convertible Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Convertible Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlConvertibleMapping(XmlConvertibleMapping object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Id</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Id</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlId(org.eclipse.jpt.core.resource.orm.XmlId object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Mutable</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Mutable</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlMutable(XmlMutable object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Converter Holder</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Converter Holder</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlConverterHolder(XmlConverterHolder object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Convertible Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Convertible Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlConvertibleMapping(org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertibleMapping object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Access Methods Holder</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Access Methods Holder</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlAccessMethodsHolder(XmlAccessMethodsHolder object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Id</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Id</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlId(org.eclipse.jpt.eclipselink.core.resource.orm.XmlId object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Abstract Xml Attribute Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Abstract Xml Attribute Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAbstractXmlAttributeMapping(AbstractXmlAttributeMapping object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Id Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Id Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlIdImpl(org.eclipse.jpt.core.resource.orm.XmlIdImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Id Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Id Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlIdImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlIdImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Base Xml Embedded</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Base Xml Embedded</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBaseXmlEmbedded(BaseXmlEmbedded object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Embedded Id</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Embedded Id</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlEmbeddedId(org.eclipse.jpt.core.resource.orm.XmlEmbeddedId object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Embedded Id</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Embedded Id</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlEmbeddedId(org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedId object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Embedded Id Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Embedded Id Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlEmbeddedIdImpl(org.eclipse.jpt.core.resource.orm.XmlEmbeddedIdImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Embedded Id Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Embedded Id Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlEmbeddedIdImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedIdImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Embedded</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Embedded</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlEmbedded(org.eclipse.jpt.core.resource.orm.XmlEmbedded object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Embedded</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Embedded</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlEmbedded(org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Embedded Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Embedded Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlEmbeddedImpl(org.eclipse.jpt.core.resource.orm.XmlEmbeddedImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Embedded Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Embedded Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlEmbeddedImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Basic</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Basic</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlBasic(org.eclipse.jpt.core.resource.orm.XmlBasic object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Basic</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Basic</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlBasic(org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Basic Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Basic Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlBasicImpl(org.eclipse.jpt.core.resource.orm.XmlBasicImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Basic Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Basic Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlBasicImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Version</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Version</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlVersion(org.eclipse.jpt.core.resource.orm.XmlVersion object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Version</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Version</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlVersion(org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Version Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Version Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlVersionImpl(org.eclipse.jpt.core.resource.orm.XmlVersionImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Version Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Version Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlVersionImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersionImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Relationship Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Relationship Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlRelationshipMapping(XmlRelationshipMapping object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Join Table Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Join Table Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlJoinTableMapping(XmlJoinTableMapping object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Join Columns Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Join Columns Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlJoinColumnsMapping(XmlJoinColumnsMapping object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Single Relationship Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Single Relationship Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlSingleRelationshipMapping(XmlSingleRelationshipMapping object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Mapped By Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Mapped By Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlMappedByMapping(XmlMappedByMapping object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml One To One</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml One To One</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlOneToOne(org.eclipse.jpt.core.resource.orm.XmlOneToOne object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Private Owned</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Private Owned</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlPrivateOwned(XmlPrivateOwned object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Join Fetch</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Join Fetch</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlJoinFetch(XmlJoinFetch object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml One To One</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml One To One</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlOneToOne(org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml One To One Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml One To One Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlOneToOneImpl(org.eclipse.jpt.core.resource.orm.XmlOneToOneImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml One To One Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml One To One Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlOneToOneImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOneImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Multi Relationship Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Multi Relationship Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXmlMultiRelationshipMapping(XmlMultiRelationshipMapping object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml One To Many</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml One To Many</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlOneToMany(org.eclipse.jpt.core.resource.orm.XmlOneToMany object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml One To Many</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml One To Many</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlOneToMany(org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml One To Many Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml One To Many Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlOneToManyImpl(org.eclipse.jpt.core.resource.orm.XmlOneToManyImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml One To Many Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml One To Many Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlOneToManyImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToManyImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Many To One</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Many To One</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlManyToOne(org.eclipse.jpt.core.resource.orm.XmlManyToOne object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Many To One</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Many To One</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlManyToOne(org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Many To One Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Many To One Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlManyToOneImpl(org.eclipse.jpt.core.resource.orm.XmlManyToOneImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Many To One Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Many To One Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlManyToOneImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOneImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Many To Many</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Many To Many</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlManyToMany(org.eclipse.jpt.core.resource.orm.XmlManyToMany object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Many To Many</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Many To Many</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlManyToMany(org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Many To Many Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Many To Many Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlManyToManyImpl(org.eclipse.jpt.core.resource.orm.XmlManyToManyImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Many To Many Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Many To Many Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlManyToManyImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToManyImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Basic Collection</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Basic Collection</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlBasicCollection(org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Basic Collection Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Basic Collection Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlBasicCollectionImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollectionImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Basic Map</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Basic Map</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlBasicMap(org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Basic Map Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Basic Map Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlBasicMapImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMapImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Transformation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Transformation</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlTransformation(org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Transformation Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Transformation Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlTransformationImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformationImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Variable One To One</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Variable One To One</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlVariableOneToOne(org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOne object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Variable One To One Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Variable One To One Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseLinkOrm_XmlVariableOneToOneImpl(org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOneImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Transient</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Transient</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlTransient(org.eclipse.jpt.core.resource.orm.XmlTransient object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Xml Transient Impl</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Xml Transient Impl</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrm_XmlTransientImpl(org.eclipse.jpt.core.resource.orm.XmlTransientImpl object)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public T defaultCase(EObject object)
-	{
-		return null;
-	}
-
-} //EclipseLink1_1OrmSwitch
diff --git a/jpa/plugins/org.eclipse.jpt.gen/.classpath b/jpa/plugins/org.eclipse.jpt.gen/.classpath
deleted file mode 100644
index 731b00f305..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="property_files"/>
-	<classpathentry exported="true" kind="lib" path="lib/velocity-1.5.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/jpa/plugins/org.eclipse.jpt.gen/.cvsignore b/jpa/plugins/org.eclipse.jpt.gen/.cvsignore
deleted file mode 100644
index a196dd7686..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-@dot
-temp.folder
-build.xml
-javaCompiler...args
-javaCompiler...args.*
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.gen/.project b/jpa/plugins/org.eclipse.jpt.gen/.project
deleted file mode 100644
index ef2d5088ee..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jpt.gen</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/jpa/plugins/org.eclipse.jpt.gen/.settings/org.eclipse.core.resources.prefs b/jpa/plugins/org.eclipse.jpt.gen/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 1f15ff2b4b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Jan 15 11:12:07 EST 2008
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/jpa/plugins/org.eclipse.jpt.gen/.settings/org.eclipse.jdt.core.prefs b/jpa/plugins/org.eclipse.jpt.gen/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3e1d50ad46..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sun May 27 14:28:54 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jpa/plugins/org.eclipse.jpt.gen/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.gen/META-INF/MANIFEST.MF
deleted file mode 100644
index ee9c80a83e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.jpt.gen
-Bundle-Version: 1.3.0.qualifier
-Bundle-ClassPath: .,
- lib/velocity-1.5.jar
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jpt.gen.internal;x-friends:="org.eclipse.jpt.ui",
- org.eclipse.jpt.gen.internal2,
- org.eclipse.jpt.gen.internal2.util
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jpt.utility;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jpt.db;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.apache.commons.collections;bundle-version="3.2.0",
- org.apache.commons.lang;bundle-version="2.1.0",
- org.apache.oro;bundle-version="2.0.8"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jpa/plugins/org.eclipse.jpt.gen/about.html b/jpa/plugins/org.eclipse.jpt.gen/about.html
deleted file mode 100644
index be534ba44f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 02, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor's license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/jpa/plugins/org.eclipse.jpt.gen/build.properties b/jpa/plugins/org.eclipse.jpt.gen/build.properties
deleted file mode 100644
index 038c63b3f2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2007 Oracle. All rights reserved.
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v1.0, which accompanies this distribution
-# and is available at http://www.eclipse.org/legal/epl-v10.html.
-# 
-# Contributors:
-#     Oracle - initial API and implementation
-################################################################################
-source.. = src/,\
-               property_files/
-output.. = bin/
-bin.includes = .,\
-               META-INF/,\
-               about.html,\
-               plugin.properties,\
-               lib/velocity-1.5.jar
-jars.compile.order = .
diff --git a/jpa/plugins/org.eclipse.jpt.gen/component.xml b/jpa/plugins/org.eclipse.jpt.gen/component.xml
deleted file mode 100644
index 7a4e04e21f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jpt.gen"><description url=""></description><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jpt.gen" fragment="false"/></component>
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.gen/lib/velocity-1.5.jar b/jpa/plugins/org.eclipse.jpt.gen/lib/velocity-1.5.jar
deleted file mode 100644
index 7c7f2c43b4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/lib/velocity-1.5.jar
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.gen/plugin.properties b/jpa/plugins/org.eclipse.jpt.gen/plugin.properties
deleted file mode 100644
index 4875a8b174..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/plugin.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-#  Copyright (c) 2007 Oracle. 
-#  All rights reserved.  This program and the accompanying materials 
-#  are made available under the terms of the Eclipse Public License v1.0 
-#  which accompanies this distribution, and is available at 
-#  http://www.eclipse.org/legal/epl-v10.html
-#  
-#  Contributors: 
-#  	Oracle - initial API and implementation
-###############################################################################
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = Java Persistence API Tools - Entity Gen
-providerName = Eclipse.org
diff --git a/jpa/plugins/org.eclipse.jpt.gen/property_files/jpt_gen.properties b/jpa/plugins/org.eclipse.jpt.gen/property_files/jpt_gen.properties
deleted file mode 100644
index 3427be198d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/property_files/jpt_gen.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-# Copyright (c) 2008 Oracle. All rights reserved.
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v1.0, which accompanies this distribution
-# and is available at http://www.eclipse.org/legal/epl-v10.html.
-# 
-# Contributors:
-#     Oracle - initial API and implementation
-################################################################################
-
-PackageGenerator_taskName=Generate Entities
-GenScope_taskName=Build Database Model
-EntityGenerator_taskName=Generate Entity: {0}
-Error_Generating_Entities = Error Generating Entities; 
-
-Templates_notFound = Unable to find JPA entities generation templates in plugin
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/EntityGenTools.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/EntityGenTools.java
deleted file mode 100644
index 058490ea15..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/EntityGenTools.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal;
-
-import java.util.Collection;
-import org.eclipse.jpt.utility.internal.NameTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * Utility methods for entity generation.
- */
-public class EntityGenTools {
-
-	/**
-	 * Convert the specified (database) identifier to a unique "Java style"
-	 * class name.
-	 * @see #convertToUniqueJavaStyleIdentifier(String, boolean, Collection)
-	 */
-	public static String convertToUniqueJavaStyleClassName(String identifier, Collection<String> classNames) {
-		return convertToUniqueJavaStyleIdentifier(identifier, true, classNames);
-	}
-
-	/**
-	 * Convert the specified (database) identifier to a unique "Java style"
-	 * attribute (field/property) name.
-	 * @see #convertToUniqueJavaStyleIdentifier(String, boolean, Collection)
-	 */
-	public static String convertToUniqueJavaStyleAttributeName(String identifier, Collection<String> attributeNames) {
-		return convertToUniqueJavaStyleIdentifier(identifier, false, attributeNames);
-	}
-
-	/**
-	 * Convert the specified (database) identifier to a unique "Java style"
-	 * identifier:
-	 *     - if the identifier is all-caps, convert underscores to "camel case"
-	 *     - if the identifier is not all-caps, leave it unchanged (except, possibly, for the first letter)
-	 *     - convert to a legal Java identifier
-	 *         - eliminate illegal characters
-	 *         - if the result is a reserved word, modify it slightly
-	 * If the result is already one of the specified existing identifiers
-	 * (ignoring case so we don't have filename collisions on Windows),
-	 * modify it slightly again.
-	 *     "FOO" => "Foo" or "foo"
-	 *     "FOO_BAR" => "FooBar" or "fooBar"
-	 *     "PACKAGE" => "Package" or "package_"
-	 */
-	public static String convertToUniqueJavaStyleIdentifier(String identifier, boolean capitalizeFirstLetter, Collection<String> identifiers) {
-		String result = identifier;
-		if (StringTools.stringIsUppercase(result)) {
-			// leave mixed case identifiers alone?
-			result = StringTools.convertUnderscoresToCamelCase(result, capitalizeFirstLetter);
-		} else {
-			result = capitalizeFirstLetter ? StringTools.capitalize(result) : StringTools.uncapitalize(result);
-		}
-		result = NameTools.convertToJavaIdentifier(result);
-		// assume that converting to a unique name will not result in a Java reserved word
-		// (since no Java reserved words end with a number)
-		result = NameTools.uniqueNameForIgnoreCase(result, identifiers);
-		return result;
-	}
-
-
-	// ********** constructor **********
-
-	/**
-	 * Suppress default constructor, ensuring non-instantiability.
-	 */
-	private EntityGenTools() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/EntityGenerator.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/EntityGenerator.java
deleted file mode 100644
index 17fa171bd0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/EntityGenerator.java
+++ /dev/null
@@ -1,1779 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 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.gen.internal;
-
-import java.io.PrintWriter;
-import java.io.Serializable;
-import java.io.StringWriter;
-import java.lang.reflect.Modifier;
-import java.text.Collator;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.jdt.core.IJavaModelStatusConstants;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.db.ForeignKey;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.JavaType;
-import org.eclipse.jpt.utility.internal.BooleanHolder;
-import org.eclipse.jpt.utility.internal.IndentingPrintWriter;
-import org.eclipse.jpt.utility.internal.NameTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-import org.eclipse.osgi.util.NLS;
-
-// TODO format generated code per preferences
-// TODO organize generated imports per preferences
-/**
- * This generator will generate an entity for a table.
- */
-public class EntityGenerator {
-	final Config config;
-	private final IPackageFragment packageFragment;
-	private final GenTable genTable;
-	private final String entityClassName;
-	private final String pkClassName;
-
-
-	// ********** public API **********
-
-	static void generateEntity(
-			Config config,
-			IPackageFragment packageFragment,
-			GenTable genTable,
-			IProgressMonitor progressMonitor
-	) {
-		if ((config == null) || (packageFragment == null) || (genTable == null)) {
-			throw new NullPointerException();
-		}
-		new EntityGenerator(config, packageFragment, genTable).generateEntity(progressMonitor);
-	}
-
-
-	// ********** constructor/initialization **********
-
-	private EntityGenerator(Config config, IPackageFragment packageFragment, GenTable genTable) {
-		super();
-		this.config = config;
-		this.packageFragment = packageFragment;
-		this.genTable = genTable;
-		this.entityClassName = this.fullyQualify(this.getEntityName());
-		this.pkClassName = this.entityClassName + '.' + config.getPrimaryKeyMemberClassName();
-	}
-
-
-	// ********** code gen **********
-
-	private void generateEntity(IProgressMonitor progressMonitor) {
-		try {
-			this.generateEntity_(progressMonitor);
-		} catch (JavaModelException ex) {
-			throw new RuntimeException(ex);
-		}
-	}
-
-	private void generateEntity_(IProgressMonitor progressMonitor) throws JavaModelException {
-		SubMonitor sm = SubMonitor.convert(progressMonitor, this.buildTaskName(), 100);
-		String fileName = this.getEntityName() + ".java";  //$NON-NLS-1$
-		String source = this.buildSource();
-		sm.worked(20);
-		try {
-			this.packageFragment.createCompilationUnit(fileName, source, false, sm.newChild(40));
-		} catch (JavaModelException ex) {
-			if (ex.getJavaModelStatus().getCode() == IJavaModelStatusConstants.NAME_COLLISION) {
-				if (this.config.getOverwriteConfirmer().overwrite(this.entityClassName)) {
-					this.packageFragment.createCompilationUnit(fileName, source, true, sm.newChild(40));
-				}
-			} else {
-				throw ex;
-			}
-		}
-		sm.setWorkRemaining(0);
-	}
-
-	private String buildTaskName() {
-		return NLS.bind(JptGenMessages.EntityGenerator_taskName, this.getEntityName());
-	}
-
-	/**
-	 * build the "body" source first; then build the "package" and "imports" source
-	 * and concatenate the "body" source to it
-	 */
-	private String buildSource() {
-		// build the body source first so we can gather up the import statements
-		BodySource bodySource = this.buildBodySource();
-
-		StringWriter sw = new StringWriter(bodySource.length() + 2000);
-		PrintWriter pw = new PrintWriter(sw);
-		this.printPackageAndImportsOn(pw, bodySource);
-		pw.print(bodySource.getSource());
-		return sw.toString();
-	}
-
-	private BodySource buildBodySource() {
-		EntitySourceWriter pw = new EntitySourceWriter(this.getPackageName(), this.entityClassName);
-		this.printBodySourceOn(pw);
-		return pw;
-	}
-
-	private void printBodySourceOn(EntitySourceWriter pw) {
-		this.printClassDeclarationOn(pw);
-
-		pw.indent();
-			this.printEntityPrimaryKeyFieldsOn(pw);
-			this.printEntityNonPrimaryKeyBasicFieldsOn(pw);
-			this.printEntityManyToOneFieldsOn(pw);
-			this.printEntityOneToManyFieldsOn(pw);
-			this.printEntityOwnedManyToManyFieldsOn(pw);
-			this.printEntityNonOwnedManyToManyFieldsOn(pw);
-			this.printSerialVersionUIDFieldOn(pw);
-			pw.println();
-
-			this.printZeroArgumentConstructorOn(this.getEntityName(), this.config.getMethodVisibilityClause(), pw);
-			if (this.config.propertyAccessType() || this.config.generateGettersAndSetters()) {
-				this.printEntityPrimaryKeyPropertiesOn(pw);
-				this.printEntityNonPrimaryKeyBasicPropertiesOn(pw);
-				this.printEntityManyToOnePropertiesOn(pw);
-				this.printEntityOneToManyPropertiesOn(pw);
-				this.printEntityOwnedManyToManyPropertiesOn(pw);
-				this.printEntityNonOwnedManyToManyPropertiesOn(pw);
-			}
-
-			if (this.primaryKeyClassIsRequired()) {
-				this.printPrimaryKeyClassOn(pw);
-			}
-		pw.undent();
-
-		pw.print('}');
-		pw.println();  // EOF
-	}
-
-
-	// ********** class declaration **********
-
-	private void printClassDeclarationOn(EntitySourceWriter pw) {
-		this.printEntityAnnotationOn(pw);
-		this.printTableAnnotationOn(pw);
-		this.printIdClassAnnotationOn(pw);
-
-		pw.print("public class ");  //$NON-NLS-1$
-		pw.printTypeDeclaration(this.entityClassName);
-		if (config.serializable()) {
-			pw.print(" implements ");  //$NON-NLS-1$
-			pw.printTypeDeclaration(Serializable.class.getName());
-		}
-		pw.print(" {");  //$NON-NLS-1$
-		pw.println();
-	}
-
-	private void printEntityAnnotationOn(EntitySourceWriter pw) {
-		pw.printAnnotation(JPA.ENTITY);
-		pw.println();
-	}
-
-	private void printTableAnnotationOn(EntitySourceWriter pw) {
-		String tableName = this.config.getDatabaseAnnotationNameBuilder().buildTableAnnotationName(this.getEntityName(), this.getTable());
-		if (tableName == null) {
-			return;  // the default table name is OK
-		}
-		pw.printAnnotation(JPA.TABLE);
-		pw.print("(name=");  //$NON-NLS-1$
-		pw.printStringLiteral(tableName);
-		pw.print(')');
-		pw.println();
-	}
-
-	private void printIdClassAnnotationOn(EntitySourceWriter pw) {
-		if (this.primaryKeyClassIsRequired() && this.config.generateIdClassForCompoundPK()) {
-			pw.printAnnotation(JPA.ID_CLASS);
-			pw.print('(');
-			pw.printTypeDeclaration(this.pkClassName);
-			pw.print(".class)");  //$NON-NLS-1$
-			pw.println();
-		}
-	}
-
-
-	// ********** primary key fields **********
-
-	private void printEntityPrimaryKeyFieldsOn(EntitySourceWriter pw) {
-		if (this.primaryKeyClassIsRequired() && this.config.generateEmbeddedIdForCompoundPK()) {
-			this.printEntityEmbeddedIdPrimaryKeyFieldOn(pw);
-		} else {
-			this.printEntityReadOnlyPrimaryKeyFieldsOn(pw);
-			this.printEntityWritablePrimaryKeyFieldsOn(pw);
-		}
-	}
-
-	private void printEntityEmbeddedIdPrimaryKeyFieldOn(EntitySourceWriter pw) {
-		if (this.config.fieldAccessType()) {
-			pw.printAnnotation(JPA.EMBEDDED_ID);
-			pw.println();
-		}
-		this.printFieldOn(this.genTable.getAttributeNameForEmbeddedId(), this.pkClassName, pw);
-	}
-
-	private void printEntityReadOnlyPrimaryKeyFieldsOn(EntitySourceWriter pw) {
-		this.printPrimaryKeyFieldsOn(pw, true, true);  // true=read-only; true=print ID annotation on fields
-	}
-
-	private void printEntityWritablePrimaryKeyFieldsOn(EntitySourceWriter pw) {
-		this.printPrimaryKeyFieldsOn(pw, false, true);  // false=writable; true=print ID annotation on fields
-	}
-
-	private void printPrimaryKeyFieldsOn(EntitySourceWriter pw, boolean readOnly, boolean printIdAnnotation) {
-		for (Iterator<Column> stream = this.primaryKeyColumns(readOnly); stream.hasNext(); ) {
-			this.printPrimaryKeyFieldOn(stream.next(), pw, readOnly, printIdAnnotation);
-		}
-	}
-
-	private Iterator<Column> primaryKeyColumns(boolean readOnly) {
-		return readOnly ? this.genTable.readOnlyPrimaryKeyColumns() : this.genTable.writablePrimaryKeyColumns();
-	}
-
-	// TODO if the field's type is java.util/sql.Date, it needs @Temporal(DATE)
-	// TODO if the primary key is auto-generated, the field must be an integral type
-	private void printPrimaryKeyFieldOn(Column column, EntitySourceWriter pw, boolean readOnly, boolean printIdAnnotation) {
-		String fieldName = this.genTable.getAttributeNameFor(column);
-		if (this.config.fieldAccessType()) {
-			if (printIdAnnotation) {
-				pw.printAnnotation(JPA.ID);
-				pw.println();
-			}
-			String columnName = this.config.getDatabaseAnnotationNameBuilder().buildColumnAnnotationName(fieldName, column);
-			if (readOnly) {
-				this.printReadOnlyColumnAnnotationOn(columnName, pw);
-			} else {
-				this.printColumnAnnotationOn(columnName, pw);
-			}
-		}
-		this.printFieldOn(fieldName, column.getPrimaryKeyJavaTypeDeclaration(), pw);
-	}
-
-	private void printReadOnlyColumnAnnotationOn(String columnName, EntitySourceWriter pw) {
-		pw.printAnnotation(JPA.COLUMN);
-		pw.print('(');
-		if (columnName != null) {
-			pw.print("name=");  //$NON-NLS-1$
-			pw.printStringLiteral(columnName);
-			pw.print(", ");  //$NON-NLS-1$
-		}
-		pw.print("insertable=false, updatable=false)");  //$NON-NLS-1$
-		pw.println();
-	}
-
-
-	// ********** basic fields **********
-
-	private void printEntityNonPrimaryKeyBasicFieldsOn(EntitySourceWriter pw) {
-		for (Iterator<Column> stream = this.genTable.nonPrimaryKeyBasicColumns(); stream.hasNext(); ) {
-			this.printEntityNonPrimaryKeyBasicFieldOn(stream.next(), pw);
-		}
-	}
-
-	private void printEntityNonPrimaryKeyBasicFieldOn(Column column, EntitySourceWriter pw) {
-		String fieldName = this.genTable.getAttributeNameFor(column);
-		if (this.config.fieldAccessType()) {
-			String columnName = this.config.getDatabaseAnnotationNameBuilder().buildColumnAnnotationName(fieldName, column);
-			this.printColumnAnnotationOn(columnName, pw);
-		}
-		if (column.isLOB()) {
-			pw.printAnnotation(JPA.LOB);
-			pw.println();
-		}
-		this.printFieldOn(fieldName, column.getJavaTypeDeclaration(), pw);
-	}
-
-	private void printColumnAnnotationOn(String columnName, EntitySourceWriter pw) {
-		if (columnName != null) {  // the column name is null if the default is OK
-			pw.printAnnotation(JPA.COLUMN);
-			pw.print("(name=");  //$NON-NLS-1$
-			pw.printStringLiteral(columnName);
-			pw.print(')');
-			pw.println();
-		}
-	}
-
-
-	// ********** many-to-one fields **********
-
-	private void printEntityManyToOneFieldsOn(EntitySourceWriter pw) {
-		for (Iterator<ManyToOneRelation> stream = this.genTable.manyToOneRelations(); stream.hasNext(); ) {
-			this.printEntityManyToOneFieldOn(stream.next(), pw);
-		}
-	}
-
-	private void printEntityManyToOneFieldOn(ManyToOneRelation relation, EntitySourceWriter pw) {
-		String fieldName = this.genTable.getAttributeNameFor(relation);
-		if (this.config.fieldAccessType()) {
-			this.printManyToOneAnnotationOn(fieldName, relation, pw);
-		}
-		this.printFieldOn(fieldName, this.fullyQualify(relation.getReferencedEntityName()), pw);
-	}
-
-	private void printManyToOneAnnotationOn(String attributeName, ManyToOneRelation relation, EntitySourceWriter pw) {
-		pw.printAnnotation(JPA.MANY_TO_ONE);
-		pw.println();
-		ForeignKey foreignKey = relation.getForeignKey();
-		if (foreignKey.referencesSingleColumnPrimaryKey()) {
-			// if the FK references a single-column PK, 'referencedColumnName' is not required
-			String joinColumnName = this.config.getDatabaseAnnotationNameBuilder().buildJoinColumnAnnotationName(attributeName, foreignKey);
-			if (joinColumnName == null) {
-				// no JoinColumn annotation needed: the default 'name' and 'referencedColumnName' work
-			} else {
-				// there is only a single join column here (just not the default name)
-				this.printJoinColumnAnnotationOn(joinColumnName, null, pw);
-				pw.println();
-			}
-		} else {
-			this.printManyToOneJoinColumnsAnnotationOn(foreignKey, pw);
-		}
-	}
-
-	private void printManyToOneJoinColumnsAnnotationOn(ForeignKey foreignKey, EntitySourceWriter pw) {
-		if (foreignKey.columnPairsSize() > 1) {
-			pw.printAnnotation(JPA.JOIN_COLUMNS);
-			pw.print("({");  //$NON-NLS-1$
-			pw.println();
-			pw.indent();
-		}
-		this.printJoinColumnAnnotationsOn(foreignKey, pw);
-		if (foreignKey.columnPairsSize() > 1) {
-			pw.undent();
-			pw.println();
-			pw.print("})");  //$NON-NLS-1$
-		}
-		pw.println();
-	}
-
-	private void printJoinColumnAnnotationsOn(ForeignKey foreignKey, EntitySourceWriter pw) {
-		for (Iterator<ForeignKey.ColumnPair> stream = foreignKey.columnPairs(); stream.hasNext(); ) {
-			this.printJoinColumnAnnotationOn(stream.next(), pw);
-			if (stream.hasNext()) {
-				pw.println(',');
-			}
-		}
-	}
-
-	private void printJoinColumnAnnotationOn(ForeignKey.ColumnPair columnPair, EntitySourceWriter pw) {
-		this.printJoinColumnAnnotationOn(
-			this.config.getDatabaseAnnotationNameBuilder().buildJoinColumnAnnotationName(columnPair.getBaseColumn()),
-			this.config.getDatabaseAnnotationNameBuilder().buildJoinColumnAnnotationName(columnPair.getReferencedColumn()),
-			pw
-		);
-	}
-
-	/**
-	 * 'baseColumnName' cannot be null;
-	 * 'referencedColumnName' is null when the default is applicable (i.e. the
-	 * referenced column is the single-column primary key column of the
-	 * referenced table)
-	 */
-	private void printJoinColumnAnnotationOn(String baseColumnName, String referencedColumnName, EntitySourceWriter pw) {
-		pw.printAnnotation(JPA.JOIN_COLUMN);
-		pw.print("(name=");  //$NON-NLS-1$
-		pw.printStringLiteral(baseColumnName);
-
-		if (referencedColumnName != null) {
-			pw.print(", referencedColumnName=");  //$NON-NLS-1$
-			pw.printStringLiteral(referencedColumnName);
-		}
-
-		pw.print(')');
-	}
-
-
-	// ********** one-to-many fields **********
-
-	private void printEntityOneToManyFieldsOn(EntitySourceWriter pw) {
-		for (Iterator<OneToManyRelation> stream = this.genTable.oneToManyRelations(); stream.hasNext(); ) {
-			this.printEntityOneToManyFieldOn(stream.next(), pw);
-		}
-	}
-
-	private void printEntityOneToManyFieldOn(OneToManyRelation relation, EntitySourceWriter pw) {
-		String fieldName = this.genTable.getAttributeNameFor(relation);
-		if (this.config.fieldAccessType()) {
-			this.printOneToManyAnnotationOn(relation, pw);
-		}
-		this.printCollectionFieldOn(fieldName, this.fullyQualify(relation.getReferencedEntityName()), pw);
-	}
-
-	private void printOneToManyAnnotationOn(OneToManyRelation relation, EntitySourceWriter pw) {
-		pw.printAnnotation(JPA.ONE_TO_MANY);
-		pw.print("(mappedBy=\"");  //$NON-NLS-1$
-		pw.print(relation.getMappedBy());
-		pw.print("\")");  //$NON-NLS-1$
-		pw.println();
-	}
-
-
-	// ********** owned many-to-many fields **********
-
-	private void printEntityOwnedManyToManyFieldsOn(EntitySourceWriter pw) {
-		for (Iterator<ManyToManyRelation>  stream = this.genTable.ownedManyToManyRelations(); stream.hasNext(); ) {
-			this.printEntityOwnedManyToManyFieldOn(stream.next(), pw);
-		}
-	}
-
-	private void printEntityOwnedManyToManyFieldOn(ManyToManyRelation relation, EntitySourceWriter pw) {
-		String fieldName = this.genTable.getAttributeNameForOwned(relation);
-		if (this.config.fieldAccessType()) {
-			this.printOwnedManyToManyAnnotationOn(fieldName, relation, pw);
-		}
-		this.printCollectionFieldOn(fieldName, this.fullyQualify(relation.getNonOwningEntityName()), pw);
-	}
-
-	/**
-	 * only print the JoinTable annotation if one or more of the
-	 * [generated] elements is not defaulted:
-	 *     name
-	 *     joinColumns
-	 *     inverseJoinColumns
-	 * thus the need for the 'printJoinTableAnnotation' flag
-	 */
-	private void printOwnedManyToManyAnnotationOn(String attributeName, ManyToManyRelation relation, EntitySourceWriter pw) {
-		pw.printAnnotation(JPA.MANY_TO_MANY);
-		pw.println();
-		BooleanHolder printJoinTableAnnotation = new BooleanHolder(true);
-
-		if ( ! relation.joinTableNameIsDefault()) {  // db-only test - no need to delegate to platform?
-			printJoinTableAnnotation.setFalse();
-			pw.printAnnotation(JPA.JOIN_TABLE);
-			pw.print("(name=");  //$NON-NLS-1$
-			pw.printStringLiteral(this.config.getDatabaseAnnotationNameBuilder().buildJoinTableAnnotationName(relation.getJoinGenTable().getTable()));
-		}
-
-		this.printJoinTableJoinColumnAnnotationsOn(
-				"joinColumns",  //$NON-NLS-1$
-				attributeName,
-				relation.getOwningForeignKey(),
-				printJoinTableAnnotation,
-				pw
-		);
-
-		this.printJoinTableJoinColumnAnnotationsOn(
-				"inverseJoinColumns",  //$NON-NLS-1$
-				relation.getNonOwningGenTable().getAttributeNameForNonOwned(relation),
-				relation.getNonOwningForeignKey(),
-				printJoinTableAnnotation,
-				pw
-		);
-
-		if (printJoinTableAnnotation.isFalse()) {
-			pw.print(')');
-			pw.println();
-		}
-	}
-
-	/**
-	 * 'elementName' is either "joinColumns" or "inverseJoinColumns"
-	 */
-	private void printJoinTableJoinColumnAnnotationsOn(String elementName, String attributeName, ForeignKey foreignKey, BooleanHolder printJoinTableAnnotation, EntitySourceWriter pw) {
-		// we have to pre-calculate whether either 'name' and/or 'referencedColumnName'
-		// is required because they are wrapped by the JoinTable annotation and we
-		// need to print the JoinTable annotation first (if it hasn't already been printed)
-		boolean printRef = ! foreignKey.referencesSingleColumnPrimaryKey();
-		// if 'referencedColumnName' is required, 'name' is also required (i.e. it cannot be defaulted);
-		// but we will calculate it later [1], since there could be multiple join columns
-		String joinColumnName = (printRef) ?
-					null  // 'joinColumnName' is not used
-				:
-					this.config.getDatabaseAnnotationNameBuilder().buildJoinColumnAnnotationName(attributeName, foreignKey);
-		boolean printBase = (printRef || (joinColumnName != null));
-		if (printBase || printRef) {
-			if (printJoinTableAnnotation.isTrue()) {
-				printJoinTableAnnotation.setFalse();
-				pw.printAnnotation(JPA.JOIN_TABLE);
-				pw.print('(');
-			} else {
-				pw.print(',');
-			}
-			pw.println();
-			pw.indent();
-				if (printRef) {
-					// if 'printRef' is true, 'joinColumnName' will always be "IGNORED" (so we ignore it)
-					this.printJoinTableJoinColumnAnnotationsOn(elementName, foreignKey, pw);  // [1]
-				} else {
-					// if the FK references a single-column PK, 'referencedColumnName' is not required
-					if (printBase) {
-						// there is only a single join column here (just not the default name)
-						pw.print(elementName);
-						pw.print('=');
-						this.printJoinColumnAnnotationOn(joinColumnName, null, pw);
-					} else {
-						// no JoinColumn annotation needed: the default 'name' and 'referencedColumnName' work
-					}
-				}
-			pw.undent();
-		}
-	}
-
-	/**
-	 * 'elementName' is either "joinColumns" or "inverseJoinColumns"
-	 */
-	private void printJoinTableJoinColumnAnnotationsOn(String elementName, ForeignKey foreignKey, EntitySourceWriter pw) {
-		pw.print(elementName);
-		pw.print('=');
-		if (foreignKey.columnPairsSize() > 1) {
-			pw.print('{');
-			pw.println();
-			pw.indent();
-		}
-		this.printJoinColumnAnnotationsOn(foreignKey, pw);
-		if (foreignKey.columnPairsSize() > 1) {
-			pw.undent();
-			pw.println();
-			pw.print('}');
-			pw.println();
-		}
-	}
-
-
-	// ********** non-owned many-to-many fields **********
-
-	private void printEntityNonOwnedManyToManyFieldsOn(EntitySourceWriter pw) {
-		for (Iterator<ManyToManyRelation> stream = this.genTable.nonOwnedManyToManyRelations(); stream.hasNext(); ) {
-			this.printEntityNonOwnedManyToManyFieldOn(stream.next(), pw);
-		}
-	}
-
-	private void printEntityNonOwnedManyToManyFieldOn(ManyToManyRelation relation, EntitySourceWriter pw) {
-		String fieldName = this.genTable.getAttributeNameForNonOwned(relation);
-		if (this.config.fieldAccessType()) {
-			this.printNonOwnedManyToManyAnnotationOn(relation, pw);
-		}
-		this.printCollectionFieldOn(fieldName, this.fullyQualify(relation.getOwningEntityName()), pw);
-	}
-
-	private void printNonOwnedManyToManyAnnotationOn(ManyToManyRelation relation, EntitySourceWriter pw) {
-		pw.printAnnotation(JPA.MANY_TO_MANY);
-		pw.print("(mappedBy=\"");  //$NON-NLS-1$
-		pw.print(relation.getMappedBy());
-		pw.print("\")");  //$NON-NLS-1$
-		pw.println();
-	}
-
-
-	// ********** misc **********
-
-	private void printSerialVersionUIDFieldOn(EntitySourceWriter pw) {
-		if (this.config.generateSerialVersionUID()) {
-			pw.print("private static final long serialVersionUID = 1L;");  //$NON-NLS-1$
-			pw.println();
-		}
-	}
-
-	private void printZeroArgumentConstructorOn(String ctorName, String visibility, EntitySourceWriter pw) {
-		if (this.config.generateDefaultConstructor()) {
-			pw.printVisibility(visibility);
-			pw.print(ctorName);
-			pw.print("() {");  //$NON-NLS-1$
-			pw.println();
-			pw.indent();
-				pw.println("super();");  //$NON-NLS-1$
-			pw.undent();
-			pw.print('}');
-			pw.println();
-			pw.println();
-		}
-	}
-
-
-	// ********** primary key properties **********
-
-	private void printEntityPrimaryKeyPropertiesOn(EntitySourceWriter pw) {
-		if (this.primaryKeyClassIsRequired() && this.config.generateEmbeddedIdForCompoundPK()) {
-			this.printEntityEmbeddedIdPrimaryKeyPropertyOn(pw);
-		} else {
-			this.printEntityReadOnlyPrimaryKeyPropertiesOn(pw);
-			this.printEntityWritablePrimaryKeyPropertiesOn(pw);
-		}
-	}
-
-	private void printEntityEmbeddedIdPrimaryKeyPropertyOn(EntitySourceWriter pw) {
-		if (this.config.propertyAccessType()) {
-			pw.printAnnotation(JPA.EMBEDDED_ID);
-			pw.println();
-		}
-		this.printPropertyOn(this.genTable.getAttributeNameForEmbeddedId(), this.pkClassName, pw);
-	}
-
-	private void printEntityReadOnlyPrimaryKeyPropertiesOn(EntitySourceWriter pw) {
-		this.printPrimaryKeyPropertiesOn(pw, true, true);  // true=read-only; true=print ID annotation on getters
-	}
-
-	private void printEntityWritablePrimaryKeyPropertiesOn(EntitySourceWriter pw) {
-		this.printPrimaryKeyPropertiesOn(pw, false, true);  // false=writable; true=print ID annotation on getters
-	}
-
-	private void printPrimaryKeyPropertiesOn(EntitySourceWriter pw, boolean readOnly, boolean printIdAnnotation) {
-		for (Iterator<Column> stream = this.primaryKeyColumns(readOnly); stream.hasNext(); ) {
-			this.printPrimaryKeyPropertyOn(stream.next(), pw, readOnly, printIdAnnotation);
-		}
-	}
-
-	// TODO if the property's type is java.util/sql.Date, it needs @Temporal(DATE)
-	// TODO if the primary key is auto-generated, the property must be an integral type
-	private void printPrimaryKeyPropertyOn(Column column, EntitySourceWriter pw, boolean readOnly, boolean printIdAnnotation) {
-		String propertyName = this.genTable.getAttributeNameFor(column);
-		if (this.config.propertyAccessType()) {
-			if (printIdAnnotation) {
-				pw.printAnnotation(JPA.ID);
-				pw.println();
-			}
-			String columnName = this.config.getDatabaseAnnotationNameBuilder().buildColumnAnnotationName(propertyName, column);
-			if (readOnly) {
-				this.printReadOnlyColumnAnnotationOn(columnName, pw);
-			} else {
-				this.printColumnAnnotationOn(columnName, pw);
-			}
-		}
-		this.printPropertyOn(propertyName, column.getPrimaryKeyJavaTypeDeclaration(), pw);
-	}
-
-
-	// ********** basic properties **********
-
-	private void printEntityNonPrimaryKeyBasicPropertiesOn(EntitySourceWriter pw) {
-		for (Iterator<Column> stream = this.genTable.nonPrimaryKeyBasicColumns(); stream.hasNext(); ) {
-			this.printEntityNonPrimaryKeyBasicPropertyOn(stream.next(), pw);
-		}
-	}
-
-	private void printEntityNonPrimaryKeyBasicPropertyOn(Column column, EntitySourceWriter pw) {
-		String propertyName = this.genTable.getAttributeNameFor(column);
-		if (this.config.propertyAccessType()) {
-			String columnName = this.config.getDatabaseAnnotationNameBuilder().buildColumnAnnotationName(propertyName, column);
-			this.printColumnAnnotationOn(columnName, pw);
-		}
-		this.printPropertyOn(propertyName, column.getJavaTypeDeclaration(), pw);
-	}
-
-
-	// ********** many-to-one properties **********
-
-	private void printEntityManyToOnePropertiesOn(EntitySourceWriter pw) {
-		for (Iterator<ManyToOneRelation> stream = this.genTable.manyToOneRelations(); stream.hasNext(); ) {
-			this.printEntityManyToOnePropertyOn(stream.next(), pw);
-		}
-	}
-
-	private void printEntityManyToOnePropertyOn(ManyToOneRelation relation, EntitySourceWriter pw) {
-		String propertyName = this.genTable.getAttributeNameFor(relation);
-		if (this.config.propertyAccessType()) {
-			this.printManyToOneAnnotationOn(propertyName, relation, pw);
-		}
-		String typeDeclaration = this.fullyQualify(relation.getReferencedEntityName());
-		this.printPropertyOn(propertyName, typeDeclaration, pw);
-	}
-
-
-	// ********** one-to-many properties **********
-
-	private void printEntityOneToManyPropertiesOn(EntitySourceWriter pw) {
-		for (Iterator<OneToManyRelation> stream = this.genTable.oneToManyRelations(); stream.hasNext(); ) {
-			this.printEntityOneToManyPropertyOn(stream.next(), pw);
-		}
-	}
-
-	private void printEntityOneToManyPropertyOn(OneToManyRelation relation, EntitySourceWriter pw) {
-		String propertyName = this.genTable.getAttributeNameFor(relation);
-		if (this.config.propertyAccessType()) {
-			this.printOneToManyAnnotationOn(relation, pw);
-		}
-		String elementTypeDeclaration = this.fullyQualify(relation.getReferencedEntityName());
-		this.printCollectionPropertyOn(propertyName, elementTypeDeclaration, pw);
-	}
-
-
-	// ********** owned many-to-many properties **********
-
-	private void printEntityOwnedManyToManyPropertiesOn(EntitySourceWriter pw) {
-		for (Iterator<ManyToManyRelation> stream = this.genTable.ownedManyToManyRelations(); stream.hasNext(); ) {
-			this.printEntityOwnedManyToManyPropertyOn(stream.next(), pw);
-		}
-	}
-
-	private void printEntityOwnedManyToManyPropertyOn(ManyToManyRelation relation, EntitySourceWriter pw) {
-		String propertyName = this.genTable.getAttributeNameForOwned(relation);
-		if (this.config.propertyAccessType()) {
-			this.printOwnedManyToManyAnnotationOn(propertyName, relation, pw);
-		}
-		String elementTypeDeclaration = this.fullyQualify(relation.getNonOwningEntityName());
-		this.printCollectionPropertyOn(propertyName, elementTypeDeclaration, pw);
-	}
-
-
-	// ********** non-owned many-to-many properties **********
-
-	private void printEntityNonOwnedManyToManyPropertiesOn(EntitySourceWriter pw) {
-		for (Iterator<ManyToManyRelation> stream = this.genTable.nonOwnedManyToManyRelations(); stream.hasNext(); ) {
-			this.printEntityNonOwnedManyToManyPropertyOn(stream.next(), pw);
-		}
-	}
-
-	private void printEntityNonOwnedManyToManyPropertyOn(ManyToManyRelation relation, EntitySourceWriter pw) {
-		String propertyName = this.genTable.getAttributeNameForNonOwned(relation);
-		if (this.config.propertyAccessType()) {
-			this.printNonOwnedManyToManyAnnotationOn(relation, pw);
-		}
-		String elementTypeDeclaration = this.fullyQualify(relation.getOwningEntityName());
-		this.printCollectionPropertyOn(propertyName, elementTypeDeclaration, pw);
-	}
-
-
-	// ********** compound primary key class **********
-
-	private void printPrimaryKeyClassOn(EntitySourceWriter pw) {
-		pw.println();
-		if (this.config.generateEmbeddedIdForCompoundPK()) {
-			pw.printAnnotation(JPA.EMBEDDABLE);
-			pw.println();
-		}
-		pw.print("public static class ");  //$NON-NLS-1$
-		pw.print(this.config.getPrimaryKeyMemberClassName());
-		pw.print(" implements ");  //$NON-NLS-1$
-		pw.printTypeDeclaration(Serializable.class.getName());
-		pw.print(" {");  //$NON-NLS-1$
-		pw.println();
-
-		pw.indent();
-			if (this.config.generateEmbeddedIdForCompoundPK()) {
-				this.printEmbeddableReadOnlyPrimaryKeyFieldsOn(pw);
-				this.printEmbeddableWritablePrimaryKeyFieldsOn(pw);
-			} else {
-				this.printIdFieldsOn(pw);
-			}
-			this.printSerialVersionUIDFieldOn(pw);
-			pw.println();
-			this.printZeroArgumentConstructorOn(this.config.getPrimaryKeyMemberClassName(), "public", pw);  //$NON-NLS-1$
-
-			if (this.config.propertyAccessType() || this.config.generateGettersAndSetters()) {
-				if (this.config.generateEmbeddedIdForCompoundPK()) {
-					this.printEmbeddableReadOnlyPrimaryKeyPropertiesOn(pw);
-					this.printEmbeddableWritablePrimaryKeyPropertiesOn(pw);
-				} else {
-					this.printIdPropertiesOn(pw);
-				}
-			}
-
-			this.printPrimaryKeyEqualsMethodOn(this.config.getPrimaryKeyMemberClassName(), this.getTable().primaryKeyColumns(), pw);
-			this.printPrimaryKeyHashCodeMethodOn(this.getTable().primaryKeyColumns(), pw);
-		pw.undent();
-
-		pw.print('}');
-		pw.println();
-		pw.println();
-	}
-
-
-	// ********** compound primary key class fields **********
-
-	private void printEmbeddableReadOnlyPrimaryKeyFieldsOn(EntitySourceWriter pw) {
-		this.printPrimaryKeyFieldsOn(pw, true, false);  // true=read-only; false=do not print ID annotation on fields
-	}
-
-	private void printEmbeddableWritablePrimaryKeyFieldsOn(EntitySourceWriter pw) {
-		this.printPrimaryKeyFieldsOn(pw, false, false);  // false=writable; false=do not print ID annotation on fields
-	}
-
-	private void printIdFieldsOn(EntitySourceWriter pw) {
-		for (Iterator<Column> stream = this.getTable().primaryKeyColumns(); stream.hasNext(); ) {
-			this.printIdFieldOn(stream.next(), pw);
-		}
-	}
-
-	private void printIdFieldOn(Column column, EntitySourceWriter pw) {
-		this.printFieldOn(this.genTable.getAttributeNameFor(column), column.getPrimaryKeyJavaTypeDeclaration(), pw);
-	}
-
-
-	// ********** compound primary key class properties **********
-
-	private void printEmbeddableReadOnlyPrimaryKeyPropertiesOn(EntitySourceWriter pw) {
-		this.printPrimaryKeyPropertiesOn(pw, true, false);  // true=read-only; false=do not print ID annotation on getters
-	}
-
-	private void printEmbeddableWritablePrimaryKeyPropertiesOn(EntitySourceWriter pw) {
-		this.printPrimaryKeyPropertiesOn(pw, false, false);  // false=writable; false=do not print ID annotation on getters
-	}
-
-	private void printIdPropertiesOn(EntitySourceWriter pw) {
-		for (Iterator<Column> stream = this.getTable().primaryKeyColumns(); stream.hasNext(); ) {
-			this.printIdPropertyOn(stream.next(), pw);
-		}
-	}
-
-	private void printIdPropertyOn(Column column, EntitySourceWriter pw) {
-		this.printPropertyOn(this.genTable.getAttributeNameFor(column), column.getPrimaryKeyJavaTypeDeclaration(), pw);
-	}
-
-
-	// ********** compound primary key class equals **********
-
-	private void printPrimaryKeyEqualsMethodOn(String className, Iterator<Column> columns, EntitySourceWriter pw) {
-		pw.printAnnotation("java.lang.Override");  //$NON-NLS-1$
-		pw.println();
-
-		pw.println("public boolean equals(Object o) {");  //$NON-NLS-1$
-		pw.indent();
-			pw.println("if (o == this) {");  //$NON-NLS-1$
-			pw.indent();
-				pw.println("return true;");  //$NON-NLS-1$
-			pw.undent();
-			pw.print('}');
-			pw.println();
-
-			pw.print("if ( ! (o instanceof ");  //$NON-NLS-1$
-			pw.print(className);
-			pw.print(")) {");  //$NON-NLS-1$
-			pw.println();
-			pw.indent();
-				pw.println("return false;");  //$NON-NLS-1$
-			pw.undent();
-			pw.print('}');
-			pw.println();
-
-			pw.print(className);
-			pw.print(" other = (");  //$NON-NLS-1$
-			pw.print(className);
-			pw.print(") o;");  //$NON-NLS-1$
-			pw.println();
-
-			pw.print("return ");  //$NON-NLS-1$
-			pw.indent();
-				while (columns.hasNext()) {
-					this.printPrimaryKeyEqualsClauseOn(columns.next(), pw);
-					if (columns.hasNext()) {
-						pw.println();
-						pw.print("&& ");  //$NON-NLS-1$
-					}
-				}
-				pw.print(';');
-				pw.println();
-			pw.undent();
-		pw.undent();
-		pw.print('}');
-		pw.println();
-		pw.println();
-	}
-
-	private void printPrimaryKeyEqualsClauseOn(Column column, EntitySourceWriter pw) {
-		String fieldName = this.genTable.getAttributeNameFor(column);
-		JavaType javaType = column.getPrimaryKeyJavaType();
-		if (javaType.isPrimitive()) {
-			this.printPrimitiveEqualsClauseOn(fieldName, pw);
-		} else {
-			this.printReferenceEqualsClauseOn(fieldName, pw);
-		}
-	}
-
-	private void printPrimitiveEqualsClauseOn(String fieldName, EntitySourceWriter pw) {
-		pw.print("(this.");  //$NON-NLS-1$
-		pw.print(fieldName);
-		pw.print(" == other.");  //$NON-NLS-1$
-		pw.print(fieldName);
-		pw.print(')');
-	}
-
-	private void printReferenceEqualsClauseOn(String fieldName, EntitySourceWriter pw) {
-		pw.print("this.");  //$NON-NLS-1$
-		pw.print(fieldName);
-		pw.print(".equals(other.");  //$NON-NLS-1$
-		pw.print(fieldName);
-		pw.print(')');
-	}
-
-
-	// ********** compound primary key class hash code **********
-
-	private void printPrimaryKeyHashCodeMethodOn(Iterator<Column> columns, EntitySourceWriter pw) {
-		pw.printAnnotation("java.lang.Override");  //$NON-NLS-1$
-		pw.println();
-
-		pw.println("public int hashCode() {");  //$NON-NLS-1$
-		pw.indent();
-			pw.println("final int prime = 31;");  //$NON-NLS-1$
-			pw.println("int hash = 17;");  //$NON-NLS-1$
-			while (columns.hasNext()) {
-				pw.print("hash = hash * prime + ");  //$NON-NLS-1$
-				this.printPrimaryKeyHashCodeClauseOn(columns.next(), pw);
-				pw.print(';');
-				pw.println();
-			}
-			pw.println("return hash;");  //$NON-NLS-1$
-		pw.undent();
-		pw.print('}');
-		pw.println();
-		pw.println();
-	}
-
-	private void printPrimaryKeyHashCodeClauseOn(Column column, EntitySourceWriter pw) {
-		String fieldName = this.genTable.getAttributeNameFor(column);
-		JavaType javaType = column.getPrimaryKeyJavaType();
-		if (javaType.isPrimitive()) {
-			this.printPrimitiveHashCodeClauseOn(javaType.getElementTypeName(), fieldName, pw);
-		} else {
-			this.printReferenceHashCodeClauseOn(fieldName, pw);
-		}
-	}
-
-	private void printPrimitiveHashCodeClauseOn(String primitiveName, String fieldName, EntitySourceWriter pw) {
-		if (primitiveName.equals("int")) {  //$NON-NLS-1$
-			// this.value
-			pw.print("this.");  //$NON-NLS-1$
-			pw.print(fieldName);
-		} else if (primitiveName.equals("short")  //$NON-NLS-1$
-				|| primitiveName.equals("byte")  //$NON-NLS-1$
-				|| primitiveName.equals("char")) {  //$NON-NLS-1$
-			// ((int) this.value)  - explicit cast
-			pw.print("((int) this.");  //$NON-NLS-1$
-			pw.print(fieldName);
-			pw.print(')');
-		} else if (primitiveName.equals("long")) {  // cribbed from Long#hashCode()  //$NON-NLS-1$
-			// ((int) (this.value ^ (this.value >>> 32)))
-			pw.print("((int) (this.");  //$NON-NLS-1$
-			pw.print(fieldName);
-			pw.print(" ^ (this.");  //$NON-NLS-1$
-			pw.print(fieldName);
-			pw.print(" >>> 32)))");  //$NON-NLS-1$
-		} else if (primitiveName.equals("float")) {  // cribbed from Float#hashCode()  //$NON-NLS-1$
-			// java.lang.Float.floatToIntBits(this.value)
-			pw.printTypeDeclaration("java.lang.Float");  //$NON-NLS-1$
-			pw.print(".floatToIntBits(this.");  //$NON-NLS-1$
-			pw.print(fieldName);
-			pw.print(')');
-		} else if (primitiveName.equals("double")) {  // cribbed from Double#hashCode()  //$NON-NLS-1$
-			//	((int) (java.lang.Double.doubleToLongBits(this.value) ^ (java.lang.Double.doubleToLongBits(this.value) >>> 32)))
-			pw.print("((int) (");  //$NON-NLS-1$
-			pw.printTypeDeclaration("java.lang.Double");  //$NON-NLS-1$
-			pw.print(".doubleToLongBits(this.");  //$NON-NLS-1$
-			pw.print(fieldName);
-			pw.print(") ^ (");  //$NON-NLS-1$
-			pw.printTypeDeclaration("java.lang.Double");  //$NON-NLS-1$
-			pw.print(".doubleToLongBits(this.");  //$NON-NLS-1$
-			pw.print(fieldName);
-			pw.print(") >>> 32)))");  //$NON-NLS-1$
-		} else if (primitiveName.equals("boolean")) {  //$NON-NLS-1$
-			// (this.value ? 1 : 0)
-			pw.print("(this.");  //$NON-NLS-1$
-			pw.print(fieldName);
-			pw.print(" ? 1 : 0)");  //$NON-NLS-1$
-		} else {
-			throw new IllegalArgumentException(primitiveName);
-		}
-	}
-
-	private void printReferenceHashCodeClauseOn(String fieldName, EntitySourceWriter pw) {
-		pw.print("this.");  //$NON-NLS-1$
-		pw.print(fieldName);
-		pw.print(".hashCode()");  //$NON-NLS-1$
-	}
-
-
-	// ********** package and imports **********
-
-	private void printPackageAndImportsOn(PrintWriter pw, BodySource bodySource) {
-		if (this.getPackageName().length() != 0) {
-			pw.print("package ");  //$NON-NLS-1$
-			pw.print(this.getPackageName());
-			pw.print(';');
-			pw.println();
-			pw.println();
-		}
-
-		for (Iterator<Map.Entry<String, String>> stream = bodySource.importEntries(); stream.hasNext(); ) {
-			Map.Entry<String, String> entry = stream.next();
-			pw.print("import ");  //$NON-NLS-1$
-			pw.print(entry.getValue());  // package
-			pw.print('.');
-			pw.print(entry.getKey());  // short class name
-			pw.print(';');
-			pw.println();
-		}
-		pw.println();
-	}
-
-
-	// ********** fields **********
-
-	/**
-	 * visibility is set in the config
-	 */
-	private void printFieldOn(String fieldName, String typeDeclaration, EntitySourceWriter pw) {
-		pw.printField(
-				fieldName,
-				typeDeclaration,
-				this.config.getFieldVisibilityClause()
-		);
-	}
-
-	/**
-	 * visibility and collection type are set in the config
-	 */
-	private void printCollectionFieldOn(String fieldName, String elementTypeDeclaration, EntitySourceWriter pw) {
-		pw.printParameterizedField(
-				fieldName,
-				this.config.getCollectionTypeName(),
-				elementTypeDeclaration,
-				this.config.getFieldVisibilityClause()
-		);
-	}
-
-
-	// ********** properties **********
-
-	/**
-	 * visibility is set in the config
-	 */
-	private void printPropertyOn(String propertyName, String typeDeclaration, EntitySourceWriter pw) {
-		pw.printGetterAndSetter(
-				propertyName,
-				typeDeclaration,
-				this.config.getMethodVisibilityClause()
-		);
-	}
-
-	/**
-	 * visibility and collection type are set in the config
-	 */
-	private void printCollectionPropertyOn(String propertyName, String elementTypeDeclaration, EntitySourceWriter pw) {
-		pw.printCollectionGetterAndSetter(
-				propertyName,
-				this.config.getCollectionTypeName(),
-				elementTypeDeclaration,
-				this.config.getMethodVisibilityClause()
-		);
-	}
-
-
-	// ********** convenience methods **********
-
-	private String getPackageName() {
-		return this.packageFragment.getElementName();
-	}
-
-	private Table getTable() {
-		return this.genTable.getTable();
-	}
-
-	private String getEntityName() {
-		return this.genTable.getEntityName();
-	}
-
-	private boolean primaryKeyClassIsRequired() {
-		return this.getTable().primaryKeyColumnsSize() > 1;
-	}
-
-	private String fullyQualify(String shortClassName) {
-		String pkg = this.getPackageName();
-		return (pkg.length() == 0) ? shortClassName : pkg + '.' + shortClassName;
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.genTable.getName() + " => " + this.entityClassName);  //$NON-NLS-1$
-	}
-
-
-	// ********** source writer **********
-
-	private interface BodySource {
-
-		/**
-		 * return a sorted set of map entries; the key is the short class name,
-		 * the value is the package name
-		 */
-		Iterator<Map.Entry<String, String>> importEntries();
-
-		/**
-		 * return the body source code
-		 */
-		String getSource();
-
-		/**
-		 * return the length of the body source code
-		 */
-		int length();
-
-	}
-
-	/**
-	 * Extend IndentingPrintWriter with some methods that facilitate building
-	 * class source code.
-	 */
-	private static class EntitySourceWriter extends IndentingPrintWriter implements BodySource {
-		final String packageName;
-		final String className;
-		// key = short class name; value = package name
-		private final Map<String, String> imports = new HashMap<String, String>();
-
-		EntitySourceWriter(String packageName, String className) {
-			super(new StringWriter(20000));
-			this.packageName = packageName;
-			this.className = className;
-		}
-
-		/**
-		 * Convert the specified string to a String Literal and print it,
-		 * adding the surrounding double-quotes and escaping characters
-		 * as necessary.
-		 */
-		void printStringLiteral(String string) {
-			StringTools.convertToJavaStringLiteralOn(string, this);
-		}
-
-		void printVisibility(String visibilityModifier) {
-			if (visibilityModifier.length() != 0) {
-				this.print(visibilityModifier);
-				this.print(' ');
-			}
-		}
-
-		void printAnnotation(String annotationName) {
-			this.print('@');
-			this.printTypeDeclaration(annotationName);
-		}
-
-		void printTypeDeclaration(String typeDeclaration) {
-			this.print(this.buildImportedTypeDeclaration(typeDeclaration));
-		}
-
-		/**
-		 * Return the specified class's "imported" name.
-		 * The class declaration must be of the form:
-		 *     "int"
-		 *     "int[]" (not "[I")
-		 *     "java.lang.Object"
-		 *     "java.lang.Object[]" (not "[Ljava.lang.Object;")
-		 *     "java.util.Map.Entry" (not "java.util.Map$Entry")
-		 *     "java.util.Map.Entry[][]" (not "[[Ljava.util.Map$Entry;")
-		 */
-		private String buildImportedTypeDeclaration(String typeDeclaration) {
-			if (this.typeDeclarationIsMemberClass(typeDeclaration)) {
-				// no need for an import, just return the partially-qualified name
-				return this.buildMemberClassTypeDeclaration(typeDeclaration);
-			}
-			int last = typeDeclaration.lastIndexOf('.');
-			String pkg = (last == -1) ? "" : typeDeclaration.substring(0, last);  //$NON-NLS-1$
-			String shortTypeDeclaration = typeDeclaration.substring(last + 1);
-			String shortElementTypeName = shortTypeDeclaration;
-			while (shortElementTypeName.endsWith("[]")) {  //$NON-NLS-1$
-				shortElementTypeName = shortElementTypeName.substring(0, shortElementTypeName.length() - 2);
-			}
-			String prev = this.imports.get(shortElementTypeName);
-			if (prev == null) {
-				// this is the first class with this short element type name
-				this.imports.put(shortElementTypeName, pkg);
-				return shortTypeDeclaration;
-			}
-			if (prev.equals(pkg)) {
-				// this element type has already been imported
-				return shortTypeDeclaration;
-			}
-			// another class with the same short element type name has been
-			// previously imported, so this one must be used fully-qualified
-			return typeDeclaration;
-		}
-
-		/**
-		 * e.g. "foo.bar.Employee.PK" will return true
-		 */
-		private boolean typeDeclarationIsMemberClass(String typeDeclaration) {
-			return (typeDeclaration.length() > this.className.length())
-					&& typeDeclaration.startsWith(this.className)
-					&& (typeDeclaration.charAt(this.className.length()) == '.');
-		}
-
-		/**
-		 * e.g. "foo.bar.Employee.PK" will return "Employee.PK"
-		 * this prevents collisions with other imported classes (e.g. "joo.jar.PK")
-		 */
-		private String buildMemberClassTypeDeclaration(String typeDeclaration) {
-			int index = this.packageName.length();
-			if (index != 0) {
-				index++;  // bump past the '.'
-			}
-			return typeDeclaration.substring(index);
-		}
-
-		private Iterator<Map.Entry<String, String>> sortedImportEntries() {
-			TreeSet<Map.Entry<String, String>> sortedImports = new TreeSet<Map.Entry<String, String>>(this.buildImportEntriesComparator());
-			sortedImports.addAll(this.imports.entrySet());
-			return sortedImports.iterator();
-		}
-
-		private Comparator<Map.Entry<String, String>> buildImportEntriesComparator() {
-			return new Comparator<Map.Entry<String, String>>() {
-				public int compare(Map.Entry<String, String> e1, Map.Entry<String, String> e2) {
-					Collator collator = Collator.getInstance();
-					int pkg = collator.compare(e1.getValue(), e2.getValue());
-					return (pkg == 0) ? collator.compare(e1.getKey(), e2.getKey()) : pkg;
-				}
-			};
-		}
-
-		void printField(String fieldName, String typeDeclaration, String visibility) {
-			this.printVisibility(visibility);
-			this.printTypeDeclaration(typeDeclaration);
-			this.print(' ');
-			this.print(fieldName);
-			this.print(';');
-			this.println();
-			this.println();
-		}
-
-		void printParameterizedField(String fieldName, String typeDeclaration, String parameterTypeDeclaration, String visibility) {
-			this.printVisibility(visibility);
-			this.printTypeDeclaration(typeDeclaration);
-			this.print('<');
-			this.printTypeDeclaration(parameterTypeDeclaration);
-			this.print('>');
-			this.print(' ');
-			this.print(fieldName);
-			this.print(';');
-			this.println();
-			this.println();
-		}
-
-		void printGetterAndSetter(String propertyName, String typeDeclaration, String visibility) {
-			this.printGetter(propertyName, typeDeclaration, visibility);
-			this.println();
-			this.println();
-
-			this.printSetter(propertyName, typeDeclaration, visibility);
-			this.println();
-			this.println();
-		}
-
-		private void printGetter(String propertyName, String typeDeclaration, String visibility) {
-			this.printVisibility(visibility);
-			this.printTypeDeclaration(typeDeclaration);
-			this.print(' ');
-			this.print(typeDeclaration.equals("boolean") ? "is" : "get");  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			this.print(StringTools.capitalize(propertyName));
-			this.print("() {");  //$NON-NLS-1$
-			this.println();
-
-			this.indent();
-				this.print("return this.");  //$NON-NLS-1$
-				this.print(propertyName);
-				this.print(';');
-				this.println();
-			this.undent();
-
-			this.print('}');
-		}
-
-		private void printSetter(String propertyName, String typeDeclaration, String visibility) {
-			this.printVisibility(visibility);
-			this.print("void set");  //$NON-NLS-1$
-			this.print(StringTools.capitalize(propertyName));
-			this.print('(');
-			this.printTypeDeclaration(typeDeclaration);
-			this.print(' ');
-			this.print(propertyName);
-			this.print(") {");  //$NON-NLS-1$
-			this.println();
-
-			this.indent();
-				this.print("this.");  //$NON-NLS-1$
-				this.print(propertyName);
-				this.print(" = ");  //$NON-NLS-1$
-				this.print(propertyName);
-				this.print(';');
-				this.println();
-			this.undent();
-
-			this.print('}');
-		}
-
-		void printCollectionGetterAndSetter(String propertyName, String collectionTypeDeclaration, String elementTypeDeclaration, String visibility) {
-			this.printCollectionGetter(propertyName, collectionTypeDeclaration, elementTypeDeclaration, visibility);
-			this.println();
-			this.println();
-
-			this.printCollectionSetter(propertyName, collectionTypeDeclaration, elementTypeDeclaration, visibility);
-			this.println();
-			this.println();
-		}
-
-		private void printCollectionGetter(String propertyName, String collectionTypeDeclaration, String elementTypeDeclaration, String visibility) {
-			this.printVisibility(visibility);
-			this.printTypeDeclaration(collectionTypeDeclaration);
-			this.print('<');
-			this.printTypeDeclaration(elementTypeDeclaration);
-			this.print("> get");  //$NON-NLS-1$
-			this.print(StringTools.capitalize(propertyName));
-			this.print("() {");  //$NON-NLS-1$
-			this.println();
-
-			this.indent();
-				this.print("return this.");  //$NON-NLS-1$
-				this.print(propertyName);
-				this.print(';');
-				this.println();
-			this.undent();
-
-			this.print('}');
-		}
-
-		private void printCollectionSetter(String propertyName, String collectionTypeDeclaration, String elementTypeDeclaration, String visibility) {
-			this.printVisibility(visibility);
-			this.print("void set");  //$NON-NLS-1$
-			this.print(StringTools.capitalize(propertyName));
-			this.print('(');
-			this.printTypeDeclaration(collectionTypeDeclaration);
-			this.print('<');
-			this.printTypeDeclaration(elementTypeDeclaration);
-			this.print('>');
-			this.print(' ');
-			this.print(propertyName);
-			this.print(") {");  //$NON-NLS-1$
-			this.println();
-
-			this.indent();
-				this.print("this.");  //$NON-NLS-1$
-				this.print(propertyName);
-				this.print(" = ");  //$NON-NLS-1$
-				this.print(propertyName);
-				this.print(';');
-				this.println();
-			this.undent();
-
-			this.print('}');
-		}
-
-
-		// ********** BodySource implementation **********
-
-		public Iterator<Map.Entry<String, String>> importEntries() {
-			return new FilteringIterator<Map.Entry<String, String>, Map.Entry<String, String>>(this.sortedImportEntries()) {
-				@Override
-				protected boolean accept(Map.Entry<String, String> next) {
-					String pkg = next.getValue();
-					if (pkg.equals("")  //$NON-NLS-1$
-							|| pkg.equals("java.lang")  //$NON-NLS-1$
-							|| pkg.equals(EntitySourceWriter.this.packageName)) {
-						return false;
-					}
-					return true;
-				}
-			};
-		}
-
-		public String getSource() {
-			return this.out.toString();
-		}
-
-		public int length() {
-			return ((StringWriter) this.out).getBuffer().length();
-		}
-
-	}
-
-
-	// ********** config **********
-
-	public static class Config {
-		private boolean convertToJavaStyleIdentifiers = true;
-
-		private boolean propertyAccessType = false;  // as opposed to "field"
-
-		private String collectionTypeName = Set.class.getName();
-		private String collectionAttributeNameSuffix = "Collection";  // e.g. "private Set<Foo> fooCollection"  //$NON-NLS-1$
-
-		private int fieldVisibility = Modifier.PRIVATE;
-		private int methodVisibility = Modifier.PUBLIC;
-
-		private boolean generateGettersAndSetters = true;
-		private boolean generateDefaultConstructor = true;
-
-		private boolean serializable = true;
-		private boolean generateSerialVersionUID = true;
-
-		private boolean generateEmbeddedIdForCompoundPK = true;  // as opposed to IdClass
-		private String embeddedIdAttributeName = "pk";  //$NON-NLS-1$
-		private String primaryKeyMemberClassName = "PK";  //$NON-NLS-1$
-
-		/**
-		 * key = table
-		 * value = entity name
-		 */
-		private HashMap<Table, String> tables = new HashMap<Table, String>();
-
-		private DatabaseAnnotationNameBuilder databaseAnnotationNameBuilder = DatabaseAnnotationNameBuilder.Default.INSTANCE;
-
-		private OverwriteConfirmer overwriteConfirmer = OverwriteConfirmer.Never.INSTANCE;
-
-		public static final int PRIVATE = 0;
-		public static final int PACKAGE = 1;
-		public static final int PROTECTED = 2;
-		public static final int PUBLIC = 3;
-
-
-		public boolean convertToJavaStyleIdentifiers() {
-			return this.convertToJavaStyleIdentifiers;
-		}
-		public void setConvertToJavaStyleIdentifiers(boolean convertToJavaStyleIdentifiers) {
-			this.convertToJavaStyleIdentifiers = convertToJavaStyleIdentifiers;
-		}
-
-		public boolean propertyAccessType() {
-			return this.propertyAccessType;
-		}
-		public void setPropertyAccessType(boolean propertyAccessType) {
-			this.propertyAccessType = propertyAccessType;
-		}
-
-		public boolean fieldAccessType() {
-			return ! this.propertyAccessType;
-		}
-		public void setFieldAccessType(boolean fieldAccessType) {
-			this.propertyAccessType = ! fieldAccessType;
-		}
-
-		public String getCollectionTypeName() {
-			return this.collectionTypeName;
-		}
-		public void setCollectionTypeName(String collectionTypeName) {
-			this.checkRequiredString(collectionTypeName, "collection type name is required");  //$NON-NLS-1$
-			this.collectionTypeName = collectionTypeName;
-		}
-
-		public String getCollectionAttributeNameSuffix() {
-			return this.collectionAttributeNameSuffix;
-		}
-		public void setCollectionAttributeNameSuffix(String collectionAttributeNameSuffix) {
-			this.collectionAttributeNameSuffix = collectionAttributeNameSuffix;
-		}
-
-		public int getFieldVisibility() {
-			return this.fieldVisibility;
-		}
-		/** entity fields cannot be 'public' */
-		public void setFieldVisibility(int fieldVisibility) {
-			switch (fieldVisibility) {
-				case PRIVATE:
-				case PACKAGE:
-				case PROTECTED:
-					this.fieldVisibility = fieldVisibility;
-					break;
-				default:
-					throw new IllegalArgumentException("invalid field visibility: " + fieldVisibility);  //$NON-NLS-1$
-			}
-		}
-		String getFieldVisibilityClause() {
-			switch (this.fieldVisibility) {
-				case PRIVATE:
-					return "private";  //$NON-NLS-1$
-				case PACKAGE:
-					return "";  //$NON-NLS-1$
-				case PROTECTED:
-					return "protected";  //$NON-NLS-1$
-				default:
-					throw new IllegalStateException("invalid field visibility: " + this.fieldVisibility);  //$NON-NLS-1$
-			}
-		}
-
-		public int getMethodVisibility() {
-			return this.methodVisibility;
-		}
-		/** entity properties must be 'public' or 'protected' */
-		public void setMethodVisibility(int methodVisibility) {
-			switch (methodVisibility) {
-				case PROTECTED:
-				case PUBLIC:
-					this.methodVisibility = methodVisibility;
-					break;
-				default:
-					throw new IllegalArgumentException("invalid method visibility: " + methodVisibility);  //$NON-NLS-1$
-			}
-		}
-		String getMethodVisibilityClause() {
-			switch (this.methodVisibility) {
-				case PROTECTED:
-					return "protected";  //$NON-NLS-1$
-				case PUBLIC:
-					return "public";  //$NON-NLS-1$
-				default:
-					throw new IllegalStateException("invalid method visibility: " + this.methodVisibility);  //$NON-NLS-1$
-			}
-		}
-
-		public boolean generateGettersAndSetters() {
-			return this.generateGettersAndSetters;
-		}
-		public void setGenerateGettersAndSetters(boolean generateGettersAndSetters) {
-			this.generateGettersAndSetters = generateGettersAndSetters;
-		}
-
-		public boolean generateDefaultConstructor() {
-			return this.generateDefaultConstructor;
-		}
-		public void setGenerateDefaultConstructor(boolean generateDefaultConstructor) {
-			this.generateDefaultConstructor = generateDefaultConstructor;
-		}
-
-		public boolean serializable() {
-			return this.serializable;
-		}
-		public void setSerializable(boolean serializable) {
-			this.serializable = serializable;
-		}
-
-		public boolean generateSerialVersionUID() {
-			return this.generateSerialVersionUID;
-		}
-		public void setGenerateSerialVersionUID(boolean generateSerialVersionUID) {
-			this.generateSerialVersionUID = generateSerialVersionUID;
-		}
-
-		public boolean generateEmbeddedIdForCompoundPK() {
-			return this.generateEmbeddedIdForCompoundPK;
-		}
-		public void setGenerateEmbeddedIdForCompoundPK(boolean generateEmbeddedIdForCompoundPK) {
-			this.generateEmbeddedIdForCompoundPK = generateEmbeddedIdForCompoundPK;
-		}
-
-		public boolean generateIdClassForCompoundPK() {
-			return ! this.generateEmbeddedIdForCompoundPK;
-		}
-		public void setGenerateIdClassForCompoundPK(boolean generateIdClassForCompoundPK) {
-			this.generateEmbeddedIdForCompoundPK = ! generateIdClassForCompoundPK;
-		}
-
-		public String getEmbeddedIdAttributeName() {
-			return this.embeddedIdAttributeName;
-		}
-		public void setEmbeddedIdAttributeName(String embeddedIdAttributeName) {
-			this.checkRequiredString(embeddedIdAttributeName, "EmbeddedId attribute name is required");  //$NON-NLS-1$
-			this.embeddedIdAttributeName = embeddedIdAttributeName;
-		}
-
-		public String getPrimaryKeyMemberClassName() {
-			return this.primaryKeyMemberClassName;
-		}
-		public void setPrimaryKeyMemberClassName(String primaryKeyMemberClassName) {
-			this.checkRequiredString(primaryKeyMemberClassName, "primary key member class name is required");  //$NON-NLS-1$
-			this.primaryKeyMemberClassName = primaryKeyMemberClassName;
-		}
-
-		String getEntityName(Table table) {
-			return this.tables.get(table);
-		}
-		Iterator<Table> tables() {
-			return this.tables.keySet().iterator();
-		}
-		int tablesSize() {
-			return this.tables.size();
-		}
-		public void addTable(Table table, String entityName) {
-			if (table == null) {
-				throw new NullPointerException("table is required");  //$NON-NLS-1$
-			}
-			this.checkRequiredString(entityName, "entity name is required");  //$NON-NLS-1$
-			if (this.tables.containsKey(table)) {
-				throw new IllegalArgumentException("duplicate table: " + table.getName());  //$NON-NLS-1$
-			}
-			if (this.tables.values().contains(entityName)) {
-				throw new IllegalArgumentException("duplicate entity name: " + entityName);  //$NON-NLS-1$
-			}
-			if ( ! NameTools.stringConsistsOfJavaIdentifierCharacters(entityName)) {
-				throw new IllegalArgumentException("entity name is not a valid Java identifier: " + entityName);  //$NON-NLS-1$
-			}
-			if (NameTools.JAVA_RESERVED_WORDS_SET.contains(entityName)) {
-				throw new IllegalArgumentException("entity name is a Java reserved word: " + entityName);  //$NON-NLS-1$
-			}
-			this.tables.put(table, entityName);
-		}
-
-		public DatabaseAnnotationNameBuilder getDatabaseAnnotationNameBuilder() {
-			return this.databaseAnnotationNameBuilder;
-		}
-		public void setDatabaseAnnotationNameBuilder(DatabaseAnnotationNameBuilder databaseAnnotationNameBuilder) {
-			if (databaseAnnotationNameBuilder == null) {
-				throw new NullPointerException("database annotation name builder is required");  //$NON-NLS-1$
-			}
-			this.databaseAnnotationNameBuilder = databaseAnnotationNameBuilder;
-		}
-
-		public OverwriteConfirmer getOverwriteConfirmer() {
-			return this.overwriteConfirmer;
-		}
-		public void setOverwriteConfirmer(OverwriteConfirmer overwriteConfirmer) {
-			if (overwriteConfirmer == null) {
-				throw new NullPointerException("overwrite confirmer is required");  //$NON-NLS-1$
-			}
-			this.overwriteConfirmer = overwriteConfirmer;
-		}
-
-		private void checkRequiredString(String string, String message) {
-			if ((string == null) || (string.length() == 0)) {
-				throw new IllegalArgumentException(message);
-			}
-		}
-
-	}
-
-
-	// ********** overwrite confirmer **********
-
-	public static interface OverwriteConfirmer {
-		/**
-		 * Return whether the entity generator should overwrite the specified
-		 * file.
-		 */
-		boolean overwrite(String className);
-
-
-		final class Always implements OverwriteConfirmer {
-			public static final OverwriteConfirmer INSTANCE = new Always();
-			public static OverwriteConfirmer instance() {
-				return INSTANCE;
-			}
-			// ensure single instance
-			private Always() {
-				super();
-			}
-			// everything will be overwritten
-			public boolean overwrite(String arg0) {
-				return true;
-			}
-			@Override
-			public String toString() {
-				return "OverwriteConfirmer.Always";  //$NON-NLS-1$
-			}
-		}
-
-
-		final class Never implements OverwriteConfirmer {
-			public static final OverwriteConfirmer INSTANCE = new Never();
-			public static OverwriteConfirmer instance() {
-				return INSTANCE;
-			}
-			// ensure single instance
-			private Never() {
-				super();
-			}
-			// nothing will be overwritten
-			public boolean overwrite(String arg0) {
-				return false;
-			}
-			@Override
-			public String toString() {
-				return "OverwriteConfirmer.Never";  //$NON-NLS-1$
-			}
-		}
-
-	}
-
-
-	// ********** annotation name builder **********
-
-	/**
-	 * Provide a pluggable way to determine whether and how the entity generator
-	 * prints the names of various database objects.
-	 */
-	public static interface DatabaseAnnotationNameBuilder {
-
-		/**
-		 * Given the name of an entity and the table to which it is mapped,
-		 * build and return a string to be used as the value for the entity's
-		 * Table annotation's 'name' element. Return null if the entity
-		 * maps to the table by default.
-		 */
-		String buildTableAnnotationName(String entityName, Table table);
-
-		/**
-		 * Given the name of an attribute (field or property) and the column
-		 * to which it is mapped,
-		 * build and return a string to be used as the value for the attribute's
-		 * Column annotation's 'name' element. Return null if the attribute
-		 * maps to the column by default.
-		 */
-		String buildColumnAnnotationName(String attributeName, Column column);
-
-		/**
-		 * Given the name of an attribute (field or property) and the
-		 * many-to-one or many-to-many foreign key to which it is mapped,
-		 * build and return a string to be used as the value for the attribute's
-		 * JoinColumn annotation's 'name' element. Return null if the attribute
-		 * maps to the join column by default.
-		 * The specified foreign key consists of a single column pair whose
-		 * referenced column is the single-column primary key of the foreign
-		 * key's referenced table.
-		 */
-		String buildJoinColumnAnnotationName(String attributeName, ForeignKey foreignKey);
-
-		/**
-		 * Build and return a string to be used as the value for a JoinColumn
-		 * annotation's 'name' or 'referencedColumnName' element.
-		 * This is called for many-to-one and many-to-many mappings when
-		 * the default join column name and/or referenced column name are/is
-		 * not applicable.
-		 * @see buildJoinColumnAnnotationName(String, ForeignKey)
-		 */
-		String buildJoinColumnAnnotationName(Column column);
-
-		/**
-		 * Build and return a string to be used as the value for a JoinTable
-		 * annotation's 'name' element.
-		 * This is called for many-to-many mappings when the default
-		 * join table name is not applicable.
-		 */
-		String buildJoinTableAnnotationName(Table table);
-
-
-		/**
-		 * The default implementation simple returns the database object's name,
-		 * unaltered.
-		 */
-		final class Default implements DatabaseAnnotationNameBuilder {
-			public static final DatabaseAnnotationNameBuilder INSTANCE = new Default();
-			public static DatabaseAnnotationNameBuilder instance() {
-				return INSTANCE;
-			}
-			// ensure single instance
-			private Default() {
-				super();
-			}
-			public String buildTableAnnotationName(String entityName, Table table) {
-				return table.getName();
-			}
-			public String buildColumnAnnotationName(String attributeName, Column column) {
-				return column.getName();
-			}
-			public String buildJoinColumnAnnotationName(String attributeName, ForeignKey foreignKey) {
-				return foreignKey.getColumnPair().getBaseColumn().getName();
-			}
-			public String buildJoinColumnAnnotationName(Column column) {
-				return column.getName();
-			}
-			public String buildJoinTableAnnotationName(Table table) {
-				return table.getName();
-			}
-			@Override
-			public String toString() {
-				return "DatabaseAnnotationNameBuilder.Default";  //$NON-NLS-1$
-			}
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/GenScope.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/GenScope.java
deleted file mode 100644
index 4e524e6f68..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/GenScope.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-
-/**
- * Build a GenTable for each db.Table passed in.
- * Determine all the relations among the tables in the scope:
- *     many-to-many
- *     many-to-one
- *     one-to-many
- * Make a first pass to determine each entity table's Java attribute names,
- * because we will need them on subsequent passes.
- */
-class GenScope {
-	private final EntityGenerator.Config entityConfig;
-	private final HashMap<Table, GenTable> genTables;
-
-
-	// ********** construction/initialization **********
-
-	GenScope(EntityGenerator.Config entityConfig, IProgressMonitor progressMonitor) {
-		super();
-		this.entityConfig = entityConfig;
-		this.genTables = new HashMap<Table, GenTable>(entityConfig.tablesSize());
-		SubMonitor sm = SubMonitor.convert(progressMonitor, JptGenMessages.GenScope_taskName, 4);
-
-		this.buildGenTables();
-		sm.worked(1);
-		this.checkCanceled(sm);
-
-		this.buildManyToManyRelations();
-		sm.worked(1);
-		this.checkCanceled(sm);
-
-		this.buildManyToOneRelations();  // this will also build the corresponding one-to-many relations
-		sm.worked(1);
-		this.checkCanceled(sm);
-
-		this.buildAttributeNames();
-		sm.worked(1);
-		this.checkCanceled(sm);
-	}
-
-	private void buildGenTables() {
-		for (Iterator<Table> stream = entityConfig.tables(); stream.hasNext(); ) {
-			Table table = stream.next();
-			this.genTables.put(table, new GenTable(this, table));
-		}
-	}
-
-	/**
-	 * find all the "join" tables
-	 */
-	private void buildManyToManyRelations() {
-		for (Iterator<GenTable> stream = this.genTables(); stream.hasNext(); ) {
-			stream.next().buildJoinTableRelation();
-		}
-
-		// revert any "join" table that is referenced by another table back to an "entity" table
-		HashSet<GenTable> referencedGenTables = this.buildReferencedGenTables();
-		for (Iterator<GenTable> stream = this.joinGenTables(); stream.hasNext(); ) {
-			GenTable joinGenTable = stream.next();
-			if (referencedGenTables.contains(joinGenTable)) {
-				joinGenTable.clearJoinTableRelation();
-			}
-		}
-	}
-
-	/**
-	 * find all the many-to-one and corresponding one-to-many relations
-	 */
-	private void buildManyToOneRelations() {
-		for (Iterator<GenTable> stream = this.entityGenTables(); stream.hasNext(); ) {
-			stream.next().buildManyToOneRelations();
-		}
-	}
-
-	/**
-	 * determine all the Java attribute names up-front because we will
-	 * need them for things like 'mappedBy' annotation elements
-	 */
-	private void buildAttributeNames() {
-		for (Iterator<GenTable> stream = this.entityGenTables(); stream.hasNext(); ) {
-			stream.next().buildAttributeNames();
-		}
-	}
-
-
-	// ********** package API **********
-
-	EntityGenerator.Config getEntityConfig() {
-		return this.entityConfig;
-	}
-
-	/**
-	 * return only the gen tables that are suitable for generating
-	 * entities (i.e. exclude the "join" tables)
-	 */
-	Iterator<GenTable> entityGenTables() {
-		return new FilteringIterator<GenTable, GenTable>(this.genTables()) {
-			@Override
-			protected boolean accept(GenTable genTable) {
-				return ! genTable.isJoinTable();
-			}
-		};
-	}
-
-	int entityTablesSize() {
-		return CollectionTools.size(this.entityGenTables());
-	}
-
-	/**
-	 * return the gen table corresponding to the specified db table;
-	 * return null if the gen table is not "in-scope" (e.g. a db foreign key
-	 * might have a reference to a db table that was not included in the
-	 * scope, so we won't have a corresponding gen table)
-	 */
-	GenTable getGenTable(Table table) {
-		return this.genTables.get(table);
-	}
-
-
-	// ********** internal methods **********
-
-	private Iterator<GenTable> genTables() {
-		return this.genTables.values().iterator();
-	}
-
-	private int genTablesSize() {
-		return this.genTables.size();
-	}
-
-	/**
-	 * return only the "join" gen tables
-	 */
-	private Iterator<GenTable> joinGenTables() {
-		return new FilteringIterator<GenTable, GenTable>(this.genTables()) {
-			@Override
-			protected boolean accept(GenTable genTable) {
-				return genTable.isJoinTable();
-			}
-		};
-	}
-
-	/**
-	 * build a set of the gen tables that are referenced by other gen tables
-	 * in the scope
-	 */
-	private HashSet<GenTable> buildReferencedGenTables() {
-		HashSet<GenTable> referencedGenTables = new HashSet<GenTable>(this.genTablesSize());
-		for (Iterator<GenTable> stream = this.genTables(); stream.hasNext(); ) {
-			stream.next().addReferencedGenTablesTo(referencedGenTables);
-		}
-		return referencedGenTables;
-	}
-
-	private void checkCanceled(IProgressMonitor progressMonitor) {
-		if (progressMonitor.isCanceled()) {
-			throw new OperationCanceledException();
-		}
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.genTables);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/GenTable.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/GenTable.java
deleted file mode 100644
index c7fcb29f4c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/GenTable.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 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.gen.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.db.ForeignKey;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.NameTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-
-/**
- * associate a table with the various relations that will be used when
- * generating the entity corresponding to the table
- */
-class GenTable {
-	private final GenScope scope;
-	private final Table table;
-
-	// these relations cannot be built until after we have built all the scope's tables
-	private ManyToManyRelation joinTableRelation;
-	private final ArrayList<ManyToManyRelation> ownedManyToManyRelations = new ArrayList<ManyToManyRelation>();
-	private final ArrayList<ManyToManyRelation> nonOwnedManyToManyRelations = new ArrayList<ManyToManyRelation>();
-	private final ArrayList<ManyToOneRelation> manyToOneRelations = new ArrayList<ManyToOneRelation>();
-	private final ArrayList<OneToManyRelation> oneToManyRelations = new ArrayList<OneToManyRelation>();
-	private final HashSet<Column> foreignKeyColumns = new HashSet<Column>();
-
-	private final HashSet<String> attributeNames = new HashSet<String>();
-	private String attributeNameForEmbeddedId;
-	private final HashMap<Column, String> basicAttributeNames = new HashMap<Column, String>();
-	private final HashMap<ManyToOneRelation, String> manyToOneAttributeNames = new HashMap<ManyToOneRelation, String>();
-	private final HashMap<OneToManyRelation, String> oneToManyAttributeNames = new HashMap<OneToManyRelation, String>();
-	private final HashMap<ManyToManyRelation, String> ownedManyToManyAttributeNames = new HashMap<ManyToManyRelation, String>();
-	private final HashMap<ManyToManyRelation, String> nonOwnedManyToManyAttributeNames = new HashMap<ManyToManyRelation, String>();
-
-
-	// ********** construction/initialization **********
-
-	GenTable(GenScope scope, Table table) {
-		super();
-		this.scope = scope;
-		this.table = table;
-	}
-
-
-	// ********** package API **********
-
-	EntityGenerator.Config getEntityConfig() {
-		return this.scope.getEntityConfig();
-	}
-
-	/**
-	 * examples:
-	 *   GenTable(FOO) => "FOO_COLLECTION"
-	 *   GenTable(foo) => "fooCollection"
-	 *   GenTable(Foo) => "FooCollection"
-	 */
-	String getCollectionAttributeName() {
-		String name = this.getName();
-		String suffix = this.getEntityConfig().getCollectionAttributeNameSuffix();
-		if (StringTools.stringIsUppercase(name)) {  // hmmm  ~bjv
-			suffix = '_' + suffix.toUpperCase();
-		}
-		return name + suffix;
-	}
-
-	/**
-	 * determine whether the table is a "join" table within the table's scope;
-	 * this can be removed, later, if we find another table references the,
-	 * seemingly, join table
-	 * @see #clearJoinTableRelation() (and callers)
-	 */
-	void buildJoinTableRelation() {
-		if ( ! this.table.isPossibleJoinTable()) {
-			return;  // the table must have exactly 2 foreign keys
-		}
-		ForeignKey owningFK = this.table.getJoinTableOwningForeignKey();
-		GenTable owningGenTable = this.scope.getGenTable(owningFK.getReferencedTable());
-		if (owningGenTable == null) {
-			return;  // both tables must be in the scope
-		}
-		ForeignKey nonOwningFK = this.table.getJoinTableNonOwningForeignKey();
-		GenTable nonOwningGenTable = this.scope.getGenTable(nonOwningFK.getReferencedTable());
-		if (nonOwningGenTable == null) {
-			return;  // both tables must be in the scope
-		}
-		this.joinTableRelation = new ManyToManyRelation(
-											this,
-											owningFK,
-											owningGenTable,
-											nonOwningFK,
-											nonOwningGenTable
-										);
-	}
-
-	/**
-	 * used by the scope to figure out whether "join" tables should be
-	 * converted to "entity" tables
-	 */
-	void addReferencedGenTablesTo(Set<GenTable> referencedTables) {
-		for (Iterator<ForeignKey> stream = this.table.foreignKeys(); stream.hasNext(); ) {
-			ForeignKey fk = stream.next();
-			GenTable genTable = this.scope.getGenTable(fk.getReferencedTable());
-			if (genTable != null) {
-				referencedTables.add(genTable);
-			}
-		}
-	}
-
-	/**
-	 * the scope clears the join table relation if there are any references
-	 * to the join table from other tables in the scope
-	 */
-	void clearJoinTableRelation() {
-		this.joinTableRelation.clear();
-		this.joinTableRelation = null;
-	}
-
-	/**
-	 * find "in-scope" foreign keys
-	 */
-	void buildManyToOneRelations() {
-		for (Iterator<ForeignKey> stream = this.table.foreignKeys(); stream.hasNext(); ) {
-			ForeignKey fk = stream.next();
-			GenTable referencedGenTable = this.scope.getGenTable(fk.getReferencedTable());
-			if (referencedGenTable != null) {
-				this.manyToOneRelations.add(new ManyToOneRelation(this, fk, referencedGenTable));
-			}
-		}
-	}
-
-	/**
-	 * now that all the relations are in place, we can configure the Java
-	 * attribute names
-	 */
-	void buildAttributeNames() {
-		this.buildAttributeNameForEmbeddedId();
-
-		// gather up all the table's columns...
-		Set<Column> columns = CollectionTools.set(this.table.columns(), this.table.columnsSize());
-		// ...remove the columns that belong exclusively to many-to-one foreign keys...
-		this.buildManyToOneAttributeNames(columns);
-		// ...and use the remaining columns to generate "basic" attribute names
-		this.buildBasicAttributeNames(columns);
-
-		this.buildOneToManyAttributeNames();
-		this.buildOwnedManyToManyAttributeNames();
-		this.buildNonOwnedManyToManyAttributeNames();
-	}
-
-	/**
-	 * return the columns that are part of the table's primary key
-	 * but are also part of an "in-scope" foreign key
-	 */
-	Iterator<Column> readOnlyPrimaryKeyColumns() {
-		return new FilteringIterator<Column, Column>(this.table.primaryKeyColumns()) {
-			@Override
-			protected boolean accept(Column pkColumn) {
-				return pkColumn.isPartOfForeignKey();
-			}
-		};
-	}
-
-	/**
-	 * return the columns that are part of the table's primary key
-	 * but are NOT part of any "in-scope" foreign key
-	 */
-	Iterator<Column> writablePrimaryKeyColumns() {
-		return new FilteringIterator<Column, Column>(this.table.primaryKeyColumns()) {
-			@Override
-			protected boolean accept(Column pkColumn) {
-				return ! pkColumn.isPartOfForeignKey();
-			}
-		};
-	}
-
-	/**
-	 * return the columns that NEITHER part of the table's primary key
-	 * NOR part of any foreign key
-	 */
-	Iterator<Column> nonPrimaryKeyBasicColumns() {
-		return new FilteringIterator<Column, Column>(this.table.columns()) {
-			@Override
-			protected boolean accept(Column column) {
-				return ! (column.isPartOfPrimaryKey() || column.isPartOfForeignKey());
-			}
-		};
-	}
-
-	Table getTable() {
-		return this.table;
-	}
-
-	String getEntityName() {
-		return this.getEntityConfig().getEntityName(this.table);
-	}
-
-	boolean isJoinTable() {
-		return this.joinTableRelation != null;
-	}
-
-	void addOwnedManyToManyRelation(ManyToManyRelation relation) {
-		this.ownedManyToManyRelations.add(relation);
-	}
-
-	void removeOwnedManyToManyRelation(ManyToManyRelation relation) {
-		this.ownedManyToManyRelations.remove(relation);
-	}
-
-	void addNonOwnedManyToManyRelation(ManyToManyRelation relation) {
-		this.nonOwnedManyToManyRelations.add(relation);
-	}
-
-	void removeNonOwnedManyToManyRelation(ManyToManyRelation relation) {
-		this.nonOwnedManyToManyRelations.remove(relation);
-	}
-
-	void addOneToManyRelation(OneToManyRelation relation) {
-		this.oneToManyRelations.add(relation);
-	}
-
-	Iterator<ManyToOneRelation> manyToOneRelations() {
-		return this.manyToOneRelations.iterator();
-	}
-
-	Iterator<OneToManyRelation> oneToManyRelations() {
-		return this.oneToManyRelations.iterator();
-	}
-
-	Iterator<ManyToManyRelation> ownedManyToManyRelations() {
-		return this.ownedManyToManyRelations.iterator();
-	}
-
-	Iterator<ManyToManyRelation> nonOwnedManyToManyRelations() {
-		return this.nonOwnedManyToManyRelations.iterator();
-	}
-
-	/**
-	 * this will return null if we don't want an embedded id attribute
-	 */
-	String getAttributeNameForEmbeddedId() {
-		return this.attributeNameForEmbeddedId;
-	}
-
-	String getAttributeNameFor(Column column) {
-		return this.basicAttributeNames.get(column);
-	}
-
-	String getAttributeNameFor(ManyToOneRelation relation) {
-		return this.manyToOneAttributeNames.get(relation);
-	}
-
-	String getAttributeNameFor(OneToManyRelation relation) {
-		return this.oneToManyAttributeNames.get(relation);
-	}
-
-	String getAttributeNameForOwned(ManyToManyRelation relation) {
-		return this.ownedManyToManyAttributeNames.get(relation);
-	}
-
-	String getAttributeNameForNonOwned(ManyToManyRelation relation) {
-		return this.nonOwnedManyToManyAttributeNames.get(relation);
-	}
-
-	String getName() {
-		return this.table.getName();
-	}
-
-	boolean joinTableNameIsDefault() {
-		return this.table.joinTableNameIsDefault();
-	}
-
-
-	// ********** internal API **********
-
-	/**
-	 * if we are going to generate an EmbeddedId attribute, add its name to
-	 * 'attributeNames' so we don't collide with it later, when generating
-	 * attribute names for the columns etc.
-	 */
-	private void buildAttributeNameForEmbeddedId() {
-		if ((this.table.primaryKeyColumnsSize() > 1) && this.getEntityConfig().generateEmbeddedIdForCompoundPK()) {
-			this.attributeNameForEmbeddedId = this.configureAttributeName(this.getEntityConfig().getEmbeddedIdAttributeName());
-		}
-	}
-
-	/**
-	 * While we are figuring out the names for the m:1 attributes, remove from the
-	 * specified set of columns the columns that are only part of the foreign keys
-	 * (leaving the remaining columns for basic attributes).
-	 * Store the calculated names so we can get them back later, when we
-	 * are generating source.
-	 */
-	private void buildManyToOneAttributeNames(Set<Column> columns) {
-		for (ManyToOneRelation relation : this.manyToOneRelations) {
-			CollectionTools.removeAll(columns, relation.getForeignKey().nonPrimaryKeyBaseColumns());
-			CollectionTools.addAll(this.foreignKeyColumns, relation.getForeignKey().baseColumns());
-			String attributeName = this.configureAttributeName(relation.getAttributeName());
-			relation.setMappedBy(attributeName);
-			this.manyToOneAttributeNames.put(relation, attributeName);
-		}
-	}
-
-	/**
-	 * Build a unique attribute name for the specified "basic" columns,
-	 * checking for name collisions.
-	 * Store the calculated names so we can get them back later, when we
-	 * are generating source.
-	 */
-	private void buildBasicAttributeNames(Set<Column> columns) {
-		for (Column column : columns) {
-			String attributeName = this.configureAttributeName(column.getName());
-			this.basicAttributeNames.put(column, attributeName);
-		}
-	}
-
-	private void buildOneToManyAttributeNames() {
-		for (OneToManyRelation relation : this.oneToManyRelations) {
-			String attributeName = this.configureAttributeName(relation.getAttributeName());
-			this.oneToManyAttributeNames.put(relation, attributeName);
-		}
-	}
-
-	private void buildOwnedManyToManyAttributeNames() {
-		for (ManyToManyRelation relation : this.ownedManyToManyRelations) {
-			String attributeName = this.configureAttributeName(relation.getOwnedAttributeName());
-			relation.setMappedBy(attributeName);
-			this.ownedManyToManyAttributeNames.put(relation, attributeName);
-		}
-	}
-
-	private void buildNonOwnedManyToManyAttributeNames() {
-		for (ManyToManyRelation relation : this.nonOwnedManyToManyRelations) {
-			String attributeName = this.configureAttributeName(relation.getNonOwnedAttributeName());
-			this.nonOwnedManyToManyAttributeNames.put(relation, attributeName);
-		}
-	}
-
-	/**
-	 * Convert the specified attribute name to something unique for the entity,
-	 * converting it to something Java-like if the config flag is set.
-	 * Store the calculated name to prevent future name collisions.
-	 */
-	private String configureAttributeName(String attributeName) {
-		String result = attributeName;
-		if (this.getEntityConfig().convertToJavaStyleIdentifiers()) {
-			result = EntityGenTools.convertToUniqueJavaStyleAttributeName(result, this.attributeNames);
-		} else {
-			// first, convert the attribute name to a legal Java identifier
-			result = NameTools.convertToJavaIdentifier(result);
-			// then make sure it's unique
-			result = NameTools.uniqueNameForIgnoreCase(attributeName, this.attributeNames);
-		}
-		this.attributeNames.add(result);
-		return result;
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.table);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/JPA.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/JPA.java
deleted file mode 100644
index 59a042af87..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/JPA.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 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.gen.internal;
-
-
-/**
- * JPA 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.
- */
-@SuppressWarnings("nls")
-public interface JPA {
-
-	// JPA package
-	String PACKAGE = "javax.persistence";
-	String PACKAGE_ = PACKAGE + '.';
-
-
-	// ********** API **********
-
-	// JPA annotations
-	String ASSOCIATION_OVERRIDE = PACKAGE_ + "AssociationOverride";
-		String ASSOCIATION_OVERRIDE__NAME = "name";
-		String ASSOCIATION_OVERRIDE__JOIN_COLUMNS = "joinColumns";
-	String ASSOCIATION_OVERRIDES = PACKAGE_ + "AssociationOverrides";
-		String ASSOCIATION_OVERRIDES__VALUE = "value";
-	String ATTRIBUTE_OVERRIDE = PACKAGE_ + "AttributeOverride";
-		String ATTRIBUTE_OVERRIDE__NAME = "name";
-		String ATTRIBUTE_OVERRIDE__COLUMN = "column";
-	String ATTRIBUTE_OVERRIDES = PACKAGE_ + "AttributeOverrides";
-		String ATTRIBUTE_OVERRIDES__VALUE = "value";
-	String BASIC = PACKAGE_ + "Basic";
-		String BASIC__FETCH = "fetch";
-		String BASIC__OPTIONAL = "optional";
-	String COLUMN = PACKAGE_ + "Column";
-		String COLUMN__NAME = "name";
-		String COLUMN__UNIQUE = "unique";
-		String COLUMN__NULLABLE = "nullable";
-		String COLUMN__INSERTABLE = "insertable";
-		String COLUMN__UPDATABLE = "updatable";
-		String COLUMN__COLUMN_DEFINITION = "columnDefinition";
-		String COLUMN__TABLE = "table";
-		String COLUMN__LENGTH = "length";
-		String COLUMN__PRECISION = "precision";
-		String COLUMN__SCALE = "scale";
-	String COLUMN_RESULT = PACKAGE_ + "ColumnResult";
-		String COLUMN_RESULT__NAME = "name";
-	String DISCRIMINATOR_COLUMN = PACKAGE_ + "DiscriminatorColumn";
-		String DISCRIMINATOR_COLUMN__NAME = "name";
-		String DISCRIMINATOR_COLUMN__DISCRIMINATOR_TYPE = "discriminatorType";
-		String DISCRIMINATOR_COLUMN__COLUMN_DEFINITION = "columnDefinition";
-		String DISCRIMINATOR_COLUMN__LENGTH = "length";
-	String DISCRIMINATOR_VALUE = PACKAGE_ + "DiscriminatorValue";
-		String DISCRIMINATOR_VALUE__VALUE = "value";
-	String EMBEDDABLE = PACKAGE_ + "Embeddable";
-	String EMBEDDED = PACKAGE_ + "Embedded";
-	String EMBEDDED_ID = PACKAGE_ + "EmbeddedId";
-	String ENTITY = PACKAGE_ + "Entity";
-		String ENTITY__NAME = "name";
-	String ENTITY_LISTENERS = PACKAGE_ + "EntityListeners";
-		String ENTITY_LISTENERS__VALUE = "value";
-	String ENTITY_RESULT = PACKAGE_ + "EntityResult";
-		String ENTITY_RESULT__ENTITY_CLASS = "entityClass";
-		String ENTITY_RESULT__FIELDS = "fields";
-		String ENTITY_RESULT__DISCRIMINATOR_COLUMN = "discriminatorColumn";
-	String ENUMERATED = PACKAGE_ + "Enumerated";
-		String ENUMERATED__VALUE = "value";
-	String EXCLUDE_DEFAULT_LISTENERS = PACKAGE_ + "ExcludeDefaultListeners";
-	String EXCLUDE_SUPERCLASS_LISTENERS = PACKAGE_ + "ExcludeSuperclassListeners";
-	String FIELD_RESULT = PACKAGE_ + "FieldResult";
-		String FIELD_RESULT__NAME = "name";
-		String FIELD_RESULT__COLUMN = "column";
-	String FLUSH_MODE = PACKAGE_ + "FlushMode";
-		String FLUSH_MODE__VALUE = "value";
-	String GENERATED_VALUE = PACKAGE_ + "GeneratedValue";
-		String GENERATED_VALUE__STRATEGY = "strategy";
-		String GENERATED_VALUE__GENERATOR = "generator";
-	String ID = PACKAGE_ + "Id";
-	String ID_CLASS = PACKAGE_ + "IdClass";
-		String ID_CLASS__VALUE = "value";
-	String INHERITANCE = PACKAGE_ + "Inheritance";
-		String INHERITANCE__STRATEGY = "strategy";
-	String JOIN_COLUMN = PACKAGE_ + "JoinColumn";
-		String JOIN_COLUMN__NAME = "name";
-		String JOIN_COLUMN__REFERENCED_COLUMN_NAME = "referencedColumnName";
-		String JOIN_COLUMN__UNIQUE = "unique";
-		String JOIN_COLUMN__NULLABLE = "nullable";
-		String JOIN_COLUMN__INSERTABLE = "insertable";
-		String JOIN_COLUMN__UPDATABLE = "updatable";
-		String JOIN_COLUMN__COLUMN_DEFINITION = "columnDefinition";
-		String JOIN_COLUMN__TABLE = "table";
-	String JOIN_COLUMNS = PACKAGE_ + "JoinColumns";
-		String JOIN_COLUMNS__VALUE = "value";
-	String JOIN_TABLE = PACKAGE_ + "JoinTable";
-		String JOIN_TABLE__NAME = "name";
-		String JOIN_TABLE__CATALOG = "catalog";
-		String JOIN_TABLE__SCHEMA = "schema";
-		String JOIN_TABLE__JOIN_COLUMNS = "joinColumns";
-		String JOIN_TABLE__INVERSE_JOIN_COLUMNS = "inverseJoinColumns";
-		String JOIN_TABLE__UNIQUE_CONSTRAINTS = "uniqueConstraints";
-	String LOB = PACKAGE_ + "Lob";
-	String MANY_TO_MANY = PACKAGE_ + "ManyToMany";
-		String MANY_TO_MANY__TARGET_ENTITY = "targetEntity";
-		String MANY_TO_MANY__CASCADE = "cascade";
-		String MANY_TO_MANY__FETCH = "fetch";
-		String MANY_TO_MANY__MAPPED_BY = "mappedBy";
-	String MANY_TO_ONE = PACKAGE_ + "ManyToOne";
-		String MANY_TO_ONE__TARGET_ENTITY = "targetEntity";
-		String MANY_TO_ONE__CASCADE = "cascade";
-		String MANY_TO_ONE__FETCH = "fetch";
-		String MANY_TO_ONE__OPTIONAL = "optional";
-	String MAP_KEY = PACKAGE_ + "MapKey";
-		String MAP_KEY__NAME = "name";
-	String MAPPED_SUPERCLASS = PACKAGE_ + "MappedSuperclass";
-	String NAMED_NATIVE_QUERIES = PACKAGE_ + "NamedNativeQueries";
-		String NAMED_NATIVE_QUERIES__VALUE = "value";
-	String NAMED_NATIVE_QUERY = PACKAGE_ + "NamedNativeQuery";
-		String NAMED_NATIVE_QUERY__NAME = "name";
-		String NAMED_NATIVE_QUERY__QUERY = "query";
-		String NAMED_NATIVE_QUERY__HINTS = "hints";
-		String NAMED_NATIVE_QUERY__RESULT_CLASS = "resultClass";
-		String NAMED_NATIVE_QUERY__RESULT_SET_MAPPING = "resultSetMapping";
-	String NAMED_QUERIES = PACKAGE_ + "NamedQueries";
-		String NAMED_QUERIES__VALUE = "value";
-	String NAMED_QUERY = PACKAGE_ + "NamedQuery";
-		String NAMED_QUERY__NAME = "name";
-		String NAMED_QUERY__QUERY = "query";
-		String NAMED_QUERY__HINTS = "hints";
-	String ONE_TO_MANY = PACKAGE_ + "OneToMany";
-		String ONE_TO_MANY__TARGET_ENTITY = "targetEntity";
-		String ONE_TO_MANY__CASCADE = "cascade";
-		String ONE_TO_MANY__FETCH = "fetch";
-		String ONE_TO_MANY__MAPPED_BY = "mappedBy";
-	String ONE_TO_ONE = PACKAGE_ + "OneToOne";
-		String ONE_TO_ONE__TARGET_ENTITY = "targetEntity";
-		String ONE_TO_ONE__CASCADE = "cascade";
-		String ONE_TO_ONE__FETCH = "fetch";
-		String ONE_TO_ONE__OPTIONAL = "optional";
-		String ONE_TO_ONE__MAPPED_BY = "mappedBy";
-	String ORDER_BY = PACKAGE_ + "OrderBy";
-		String ORDER_BY__VALUE = "value";
-	String PERSISTENCE_CONTEXT = PACKAGE_ + "PersistenceContext";
-		String PERSISTENCE_CONTEXT__NAME = "name";
-		String PERSISTENCE_CONTEXT__UNIT_NAME = "unitName";
-		String PERSISTENCE_CONTEXT__TYPE = "type";
-	String PERSISTENCE_CONTEXTS = PACKAGE_ + "PersistenceContexts";
-		String PERSISTENCE_CONTEXTS__VALUE = "value";
-	String PERSISTENCE_UNIT = PACKAGE_ + "XmlPersistenceUnit";
-		String PERSISTENCE_UNIT__NAME = "name";
-		String PERSISTENCE_UNIT__UNIT_NAME = "unitName";
-	String PERSISTENCE_UNITS = PACKAGE_ + "PersistenceUnits";
-		String PERSISTENCE_UNITS__VALUE = "value";
-	String POST_LOAD = PACKAGE_ + "PostLoad";
-	String POST_PERSIST = PACKAGE_ + "PostPersist";
-	String POST_REMOVE = PACKAGE_ + "PostRemove";
-	String POST_UPDATE = PACKAGE_ + "PostUpdate";
-	String PRE_PERSIST = PACKAGE_ + "PrePersist";
-	String PRE_REMOVE = PACKAGE_ + "PreRemove";
-	String PRE_UPDATE = PACKAGE_ + "PreUpdate";
-	String PRIMARY_KEY_JOIN_COLUMN = PACKAGE_ + "PrimaryKeyJoinColumn";
-		String PRIMARY_KEY_JOIN_COLUMN__NAME = "name";
-		String PRIMARY_KEY_JOIN_COLUMN__REFERENCED_COLUMN_NAME = "referencedColumnName";
-		String PRIMARY_KEY_JOIN_COLUMN__COLUMN_DEFINITION = "columnDefinition";
-	String PRIMARY_KEY_JOIN_COLUMNS = PACKAGE_ + "PrimaryKeyJoinColumns";
-		String PRIMARY_KEY_JOIN_COLUMNS__VALUE = "value";
-	String QUERY_HINT = PACKAGE_ + "QueryHint";
-		String QUERY_HINT__NAME = "name";
-		String QUERY_HINT__VALUE = "value";
-	String SECONDARY_TABLE = PACKAGE_ + "SecondaryTable";
-		String SECONDARY_TABLE__NAME = "name";
-		String SECONDARY_TABLE__CATALOG = "catalog";
-		String SECONDARY_TABLE__SCHEMA = "schema";
-		String SECONDARY_TABLE__PK_JOIN_COLUMNS = "pkJoinColumns";
-		String SECONDARY_TABLE__UNIQUE_CONSTRAINTS = "uniqueConstraints";
-	String SECONDARY_TABLES = PACKAGE_ + "SecondaryTables";
-		String SECONDARY_TABLES__VALUE = "value";
-	String SEQUENCE_GENERATOR = PACKAGE_ + "SequenceGenerator";
-		String SEQUENCE_GENERATOR__NAME = "name";
-		String SEQUENCE_GENERATOR__SEQUENCE_NAME = "sequenceName";
-		String SEQUENCE_GENERATOR__INITIAL_VALUE = "initialValue";
-		String SEQUENCE_GENERATOR__ALLOCATION_SIZE = "allocationSize";
-	String SQL_RESULT_SET_MAPPING = PACKAGE_ + "SqlResultSetMapping";
-		String SQL_RESULT_SET_MAPPING__NAME = "name";
-		String SQL_RESULT_SET_MAPPING__ENTITIES = "entities";
-		String SQL_RESULT_SET_MAPPING__COLUMNS = "columns";
-	String TABLE = PACKAGE_ + "Table";
-		String TABLE__NAME = "name";
-		String TABLE__CATALOG = "catalog";
-		String TABLE__SCHEMA = "schema";
-		String TABLE__UNIQUE_CONSTRAINTS = "uniqueConstraints";
-	String TABLE_GENERATOR = PACKAGE_ + "TableGenerator";
-		String TABLE_GENERATOR__NAME = "name";
-		String TABLE_GENERATOR__TABLE = "table";
-		String TABLE_GENERATOR__CATALOG = "catalog";
-		String TABLE_GENERATOR__SCHEMA = "schema";
-		String TABLE_GENERATOR__PK_COLUMN_NAME = "pkColumnName";
-		String TABLE_GENERATOR__VALUE_COLUMN_NAME = "valueColumnName";
-		String TABLE_GENERATOR__PK_COLUMN_VALUE = "pkColumnValue";
-		String TABLE_GENERATOR__INITIAL_VALUE = "initialValue";
-		String TABLE_GENERATOR__ALLOCATION_SIZE = "allocationSize";
-		String TABLE_GENERATOR__UNIQUE_CONSTRAINTS = "uniqueConstraints";
-	String TEMPORAL = PACKAGE_ + "Temporal";
-		String TEMPORAL__VALUE = "value";
-	String TRANSIENT = PACKAGE_ + "Transient";
-	String UNIQUE_CONSTRAINT = PACKAGE_ + "UniqueConstraint";
-		String UNIQUE_CONSTRAINT__COLUMN_NAMES = "columnNames";
-	String VERSION = PACKAGE_ + "Version";
-
-	// JPA enums
-	String GENERATION_TYPE = PACKAGE_ + "GenerationType";
-		String GENERATION_TYPE_ = GENERATION_TYPE + '.';
-		String GENERATION_TYPE__AUTO = GENERATION_TYPE_ + "AUTO";
-		String GENERATION_TYPE__IDENTITY = GENERATION_TYPE_ + "IDENTITY";
-		String GENERATION_TYPE__SEQUENCE = GENERATION_TYPE_ + "SEQUENCE";
-		String GENERATION_TYPE__TABLE = GENERATION_TYPE_ + "TABLE";
-
-	String CASCADE_TYPE = PACKAGE_ + "CascadeType";
-		String CASCADE_TYPE_ = CASCADE_TYPE + '.';
-		String CASCADE_TYPE__ALL = CASCADE_TYPE_ + "ALL";
-		String CASCADE_TYPE__MERGE = CASCADE_TYPE_ + "MERGE";
-		String CASCADE_TYPE__PERSIST = CASCADE_TYPE_ + "PERSIST";
-		String CASCADE_TYPE__REFRESH = CASCADE_TYPE_ + "REFRESH";
-		String CASCADE_TYPE__REMOVE = CASCADE_TYPE_ + "REMOVE";
-
-	String DISCRIMINATOR_TYPE = PACKAGE_ + "DiscriminatorType";
-		String DISCRIMINATOR_TYPE_ = DISCRIMINATOR_TYPE + '.';
-		String DISCRIMINATOR_TYPE__CHAR = DISCRIMINATOR_TYPE_ + "CHAR";
-		String DISCRIMINATOR_TYPE__INTEGER = DISCRIMINATOR_TYPE_ + "INTEGER";
-		String DISCRIMINATOR_TYPE__STRING = DISCRIMINATOR_TYPE_ + "STRING";
-
-	String ENUM_TYPE = PACKAGE_ + "EnumType";
-		String ENUM_TYPE_ = ENUM_TYPE + '.';
-		String ENUM_TYPE__ORDINAL = ENUM_TYPE_ + "ORDINAL";
-		String ENUM_TYPE__STRING = ENUM_TYPE_ + "STRING";
-
-	String FETCH_TYPE = PACKAGE_ + "FetchType";
-		String FETCH_TYPE_ = FETCH_TYPE + '.';
-		String FETCH_TYPE__EAGER = FETCH_TYPE_ + "EAGER";
-		String FETCH_TYPE__LAZY = FETCH_TYPE_ + "LAZY";
-
-	String FLUSH_MODE_TYPE = PACKAGE_ + "FlushModeType";
-		String FLUSH_MODE_TYPE_ = FLUSH_MODE_TYPE + '.';
-		String FLUSH_MODE_TYPE__AUTO = FLUSH_MODE_TYPE_ + "AUTO";
-		String FLUSH_MODE_TYPE__COMMIT = FLUSH_MODE_TYPE_ + "COMMIT";
-
-	String INHERITANCE_TYPE = PACKAGE_ + "InheritanceType";
-		String INHERITANCE_TYPE_ = INHERITANCE_TYPE + '.';
-		String INHERITANCE_TYPE__JOINED = INHERITANCE_TYPE_ + "JOINED";
-		String INHERITANCE_TYPE__SINGLE_TABLE = INHERITANCE_TYPE_ + "SINGLE_TABLE";
-		String INHERITANCE_TYPE__TABLE_PER_CLASS = INHERITANCE_TYPE_ + "TABLE_PER_CLASS";
-
-	String PERSISTENCE_CONTEXT_TYPE = PACKAGE_ + "PersistenceContextType";
-		String PERSISTENCE_CONTEXT_TYPE_ = PERSISTENCE_CONTEXT_TYPE + '.';
-		String PERSISTENCE_CONTEXT_TYPE__EXTENDED = PERSISTENCE_CONTEXT_TYPE_ + "EXTENDED";
-		String PERSISTENCE_CONTEXT_TYPE__TRANSACTION = PERSISTENCE_CONTEXT_TYPE_ + "TRANSACTION";
-
-	String TEMPORAL_TYPE = PACKAGE_ + "TemporalType";
-		String TEMPORAL_TYPE_ = TEMPORAL_TYPE + '.';
-		String TEMPORAL_TYPE__DATE = TEMPORAL_TYPE_ + "DATE";
-		String TEMPORAL_TYPE__TIME = TEMPORAL_TYPE_ + "TIME";
-		String TEMPORAL_TYPE__TIMESTAMP = TEMPORAL_TYPE_ + "TIMESTAMP";
-
-	// JPA interfaces
-	String ENTITY_MANAGER = PACKAGE_ + "EntityManager";
-	String ENTITY_MANAGER_FACTORY = PACKAGE_ + "EntityManagerFactory";
-	String ENTITY_TRANSACTION = PACKAGE_ + "EntityTransaction";
-	String INSTRUMENTABLE_CLASS_LOADER = PACKAGE_ + "InstrumentableClassLoader";
-	String QUERY = PACKAGE_ + "Query";
-
-	// JPA classes
-	String PERSISTENCE = PACKAGE_ + "XmlPersistence";
-
-	// JPA exceptions
-	String NON_UNIQUE_RESULT_EXCEPTION = PACKAGE_ + "NonUniqueResultException";
-	String OBJECT_NOT_FOUND_EXCEPTION = PACKAGE_ + "ObjectNotFoundException";
-	String PERSISTENCE_EXCEPTION = PACKAGE_ + "PersistenceException";
-
-
-	// ********** SPI **********
-
-	// JPA SPI package
-	String SPI_PACKAGE = PACKAGE_ + "spi";
-	String SPI_PACKAGE_ = SPI_PACKAGE + '.';
-
-	// JPA SPI interfaces
-	String ENTITY_MANAGER_FACTORY_PROVIDER = SPI_PACKAGE_ + "EntityManagerFactoryProvider";
-	String PERSISTENCE_INFO = SPI_PACKAGE_ + "PersistenceInfo";
-	String PERSISTENCE_PROVIDER = SPI_PACKAGE_ + "PersistenceProvider";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/JptGenMessages.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/JptGenMessages.java
deleted file mode 100644
index b765abd340..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/JptGenMessages.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Localized messages used by Dali entity generation.
- */
-class JptGenMessages {
-
-	public static String PackageGenerator_taskName;
-	public static String GenScope_taskName;
-	public static String EntityGenerator_taskName;
-	public static String Templates_notFound;
-
-	private static final String BUNDLE_NAME = "jpt_gen"; //$NON-NLS-1$
-	private static final Class<?> BUNDLE_CLASS = JptGenMessages.class;
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, BUNDLE_CLASS);
-	}
-	
-	private JptGenMessages() {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/ManyToManyRelation.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/ManyToManyRelation.java
deleted file mode 100644
index 12631a5bf0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/ManyToManyRelation.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal;
-
-import org.eclipse.jpt.db.ForeignKey;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * This object is shared by the two gen tables that make up the relation.
- * Upon construction, 'mappedBy' will be 'null'. The first gen table to be
- * used to generate an entity will fill in 'mappedBy' with the appropriate
- * attribute (field/property) name.
- */
-class ManyToManyRelation {
-	private final GenTable joinGenTable;
-	private final ForeignKey owningForeignKey;
-	private final GenTable owningGenTable;
-	private final ForeignKey nonOwningForeignKey;
-	private final GenTable nonOwningGenTable;
-	private String mappedBy;  // set while generating entities
-
-
-	ManyToManyRelation(
-			GenTable joinGenTable,
-			ForeignKey owningForeignKey,
-			GenTable owningGenTable,
-			ForeignKey nonOwningForeignKey,
-			GenTable nonOwningGenTable
-	) {
-		super();
-		this.joinGenTable = joinGenTable;
-
-		this.owningForeignKey = owningForeignKey;
-		this.owningGenTable = owningGenTable;
-		owningGenTable.addOwnedManyToManyRelation(this);
-
-		this.nonOwningForeignKey = nonOwningForeignKey;
-		this.nonOwningGenTable = nonOwningGenTable;
-		nonOwningGenTable.addNonOwnedManyToManyRelation(this);
-	}
-
-	GenTable getJoinGenTable() {
-		return this.joinGenTable;
-	}
-
-	ForeignKey getOwningForeignKey() {
-		return this.owningForeignKey;
-	}
-
-	GenTable getOwningGenTable() {
-		return this.owningGenTable;
-	}
-
-	ForeignKey getNonOwningForeignKey() {
-		return this.nonOwningForeignKey;
-	}
-
-	GenTable getNonOwningGenTable() {
-		return this.nonOwningGenTable;
-	}
-
-	String getOwnedAttributeName() {
-		return this.nonOwningGenTable.getCollectionAttributeName();
-	}
-
-	String getNonOwnedAttributeName() {
-		return this.owningGenTable.getCollectionAttributeName();
-	}
-
-	/**
-	 * the scope clears the join table relation if there are any references
-	 * to the join table
-	 */
-	void clear() {
-		this.owningGenTable.removeOwnedManyToManyRelation(this);
-		this.nonOwningGenTable.removeNonOwnedManyToManyRelation(this);
-	}
-
-	String getMappedBy() {
-		return this.mappedBy;
-	}
-
-	void setMappedBy(String mappedBy) {
-		this.mappedBy = mappedBy;
-	}
-
-	String getOwningEntityName() {
-		return this.owningGenTable.getEntityName();
-	}
-
-	String getNonOwningEntityName() {
-		return this.nonOwningGenTable.getEntityName();
-	}
-
-	boolean joinTableNameIsDefault() {
-		return this.joinGenTable.joinTableNameIsDefault();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.joinGenTable);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/ManyToOneRelation.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/ManyToOneRelation.java
deleted file mode 100644
index b69e402a06..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/ManyToOneRelation.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal;
-
-import org.eclipse.jpt.db.ForeignKey;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * This object is held by the "base" gen table and, indirectly via a
- * one-to-many relation, the "referenced" gen table.
- * The "mapped by" attribute (field/property) name is set while the
- * "base" table is calculating its attribute names.
- */
-class ManyToOneRelation {
-	private final GenTable baseGenTable;  // the "many" side (e.g. Detail)
-	private final ForeignKey foreignKey;
-	private final GenTable referencedGenTable;  // the "one" side (e.g. Master)
-	private String mappedBy;  // set while generating entities; used by partner one-to-many relation
-
-
-	ManyToOneRelation(
-			GenTable baseGenTable,
-			ForeignKey foreignKey,
-			GenTable referencedGenTable
-	) {
-		super();
-		this.baseGenTable = baseGenTable;
-		this.foreignKey = foreignKey;
-		this.referencedGenTable = referencedGenTable;
-		referencedGenTable.addOneToManyRelation(new OneToManyRelation(this));
-	}
-
-	GenTable getBaseGenTable() {
-		return this.baseGenTable;
-	}
-
-	ForeignKey getForeignKey() {
-		return this.foreignKey;
-	}
-
-	GenTable getReferencedGenTable() {
-		return this.referencedGenTable;
-	}
-
-	String getAttributeName() {
-		return this.foreignKey.getAttributeName();
-	}
-
-	String getMappedBy() {
-		return this.mappedBy;
-	}
-
-	void setMappedBy(String mappedBy) {
-		this.mappedBy = mappedBy;
-	}
-
-	String getBaseEntityName() {
-		return this.baseGenTable.getEntityName();
-	}
-
-	String getReferencedEntityName() {
-		return this.referencedGenTable.getEntityName();
-	}
-
-	String getBaseGenTableCollectionAttributeName() {
-		return this.baseGenTable.getCollectionAttributeName();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.foreignKey);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/OneToManyRelation.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/OneToManyRelation.java
deleted file mode 100644
index 8d832ccd1c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/OneToManyRelation.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal;
-
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * This object is the inverse of the corresponding many-to-one relation.
- */
-class OneToManyRelation {
-	private final ManyToOneRelation manyToOneRelation;
-
-
-	OneToManyRelation(ManyToOneRelation manyToOneRelation) {
-		super();
-		this.manyToOneRelation = manyToOneRelation;
-	}
-
-	ManyToOneRelation getManyToOneRelation() {
-		return this.manyToOneRelation;
-	}
-
-	String getAttributeName() {
-		return this.manyToOneRelation.getBaseGenTableCollectionAttributeName();
-	}
-
-	String getMappedBy() {
-		return this.manyToOneRelation.getMappedBy();
-	}
-
-	String getReferencedEntityName() {
-		return this.manyToOneRelation.getBaseEntityName();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.manyToOneRelation);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/PackageGenerator.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/PackageGenerator.java
deleted file mode 100644
index 0aa0b5ed7e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/PackageGenerator.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal;
-
-import java.util.Iterator;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * This generator will generate a package of entities for a set of tables.
- */
-public class PackageGenerator {
-	private final Config config;
-	private final EntityGenerator.Config entityConfig;
-	private final GenScope scope;
-
-
-	// ********** public API **********
-
-	public static void generateEntities(
-			Config config,
-			EntityGenerator.Config entityConfig,
-			IProgressMonitor progressMonitor
-	) {
-		if ((config == null) || (entityConfig == null)) {
-			throw new NullPointerException();
-		}
-		SubMonitor sm = SubMonitor.convert(progressMonitor, JptGenMessages.PackageGenerator_taskName, 100);
-		new PackageGenerator(config, entityConfig, sm.newChild(10)).generateEntities(sm.newChild(90));
-	}
-
-
-	// ********** construction/initialization **********
-
-	private PackageGenerator(
-			Config config,
-			EntityGenerator.Config entityConfig,
-			IProgressMonitor progressMonitor
-	) {
-		super();
-		this.config = config;
-		this.entityConfig = entityConfig;
-		this.scope = new GenScope(entityConfig, progressMonitor);
-	}
-
-
-	// ********** generation **********
-
-	private void generateEntities(IProgressMonitor progressMonitor) {
-		SubMonitor sm = SubMonitor.convert(progressMonitor, this.scope.entityTablesSize());
-		for (Iterator<GenTable> stream = this.scope.entityGenTables(); stream.hasNext(); ) {
-			this.checkCanceled(sm);
-			this.generateEntity(stream.next(), sm.newChild(1));
-		}
-	}
-
-	private void generateEntity(GenTable genTable, IProgressMonitor progressMonitor) {
-		EntityGenerator.generateEntity(
-				this.entityConfig,
-				this.config.getPackageFragment(),
-				genTable,
-				progressMonitor
-		);
-	}
-
-	private void checkCanceled(IProgressMonitor progressMonitor) {
-		if (progressMonitor.isCanceled()) {
-			throw new OperationCanceledException();
-		}
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.scope);
-	}
-
-
-	// ********** config **********
-
-	public static class Config {
-		private IPackageFragment packageFragment;
-
-		public IPackageFragment getPackageFragment() {
-			return this.packageFragment;
-		}
-
-		public void setPackageFragment(IPackageFragment packageFragment) {
-			this.packageFragment = packageFragment;
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/Association.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/Association.java
deleted file mode 100644
index aef08c4221..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/Association.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal2;
-
-import java.util.List;
-
-import org.eclipse.jpt.db.ForeignKey;
-import org.eclipse.jpt.gen.internal2.util.StringUtil;
-
-/**
- * Represents an ORM association.
- * There are two types of associations:
- * <ul><li>simple association: An association between two database tables.
- * The <em>referrer</code> table is the one containing the foreign key
- * , the <em>referenced</code> table is the other party.<br>
- * 
- * <li>many to many association: An association between two tables joined by 
- * a <em>join table</em>.
- * In the example AUTHOR, BOOK, AUTHOR_BOOK, The referrer and referenced are 
- * AUTHOR and  BOOK, and the join table is AUTHOR_BOOK.
- * </ul>
- * 
- */
-public class Association implements java.io.Serializable
-{
-	private final static long serialVersionUID = 2;
-
-	public static final String MANY_TO_ONE = "many-to-one";
-	public static final String MANY_TO_MANY = "many-to-many";
-	public static final String ONE_TO_ONE = "one-to-one";
-	public static final String ONE_TO_MANY = "one-to-many";
-	
-	public static final String BI_DI = "bi-di";
-	public static final String NORMAL_DI = "normal-di"; //referrer->referenced
-	public static final String OPPOSITE_DI = "opposite-di"; //referenced->referrer
-	
-	private transient ORMGenCustomizer mCustomizer;
-	private String mReferrerTableName;
-	private String mReferencedTableName;
-	private String mJoinTableName;
-
-	private List<String> mReferrerColNames; /*String objects*/
-	private List<String> mReferencedColNames; /*String objects*/
-	private List<String> mReferrerJoinColNames; /*String objects*/
-	private List<String> mReferencedJoinColNames; /*String objects*/
-
-	private transient List<ORMGenColumn> mReferrerCols; /*ORMGenColumn objects*/
-	private transient List<ORMGenColumn> mReferencedCols; /*ORMGenColumn objects*/
-	private transient List<ORMGenColumn> mReferrerJoinCols; /*ORMGenColumn objects*/
-	private transient List<ORMGenColumn> mReferencedJoinCols; /*ORMGenColumn objects*/
-	
-	private String mCardinality;
-	private String mDirectionality;
-	private byte mFlags = GENERATED;
-	
-	private AssociationRole mReferrerRole;
-	private AssociationRole mReferencedRole;
-
-	private transient ForeignKey mForeignKey;	
-	
-	/*constants for mFlags*/
-	/*whether the association should be generated*/
-	private static final byte GENERATED = 1 << 0;
-	/*whether the association is custom (i.e is not auto computed from foreign keys relationships).*/
-	private static final byte CUSTOM = 1 << 1;
-	
-	/**
-	 * The simple association constructor.
-	 * The 2 tables are joined when the values of each column in
-	 * referrerColNames match its corresponding column in referencedColNames.
-	 * 
-	 * @param referrerTableName The "foreign key" table.
-	 * @param referrerColNames The column names in the referrer table.
-	 * @param referencedTableName The "primary key" table.
-	 * @param referencedColNames The column names in the referenced table.
-	 */
-	public Association(ORMGenCustomizer customizer, String referrerTableName, List<String> referrerColNames
-			, String referencedTableName, List<String> referencedColNames)  {
-		super();
-		
-		mCustomizer = customizer;
-		mReferrerTableName = referrerTableName;
-		mReferencedTableName = referencedTableName;
-		mReferrerColNames = referrerColNames;
-		mReferencedColNames = referencedColNames;
-		
-		mCardinality = MANY_TO_ONE;
-		mDirectionality = BI_DI;
-		
-		setCustom(true);
-	}
-	/**
-	 * The many to many constructor.
-	 * The 2 tables are joined when the values of each column in
-	 * referrerColNames match its corresponding column in referrerJoinColNames
-	 * , and each column in referencedColNames match its corresponding column in referencedJoinColNames.
-	 *
-	 */
-	public Association(ORMGenCustomizer customizer, String referrerTableName, List<String> referrerColNames
-			, String referencedTableName, List<String> referencedColNames
-			, String joinTableName, List<String> referrerJoinColNames, List<String> referencedJoinColNames) {
-		super();
-		
-		mCustomizer = customizer;
-		mReferrerTableName = referrerTableName;
-		mReferencedTableName = referencedTableName;
-		mReferrerColNames = referrerColNames;
-		mReferencedColNames = referencedColNames;
-		mJoinTableName = joinTableName;
-		mReferrerJoinColNames = referrerJoinColNames;
-		mReferencedJoinColNames = referencedJoinColNames;
-		
-		mCardinality = MANY_TO_MANY;	
-		mDirectionality = BI_DI;
-		
-		setCustom(true);
-	}
-	/**
-	 * Empty constructor needed by the deserialization (should not be used otherwise).
-	 */
-	public Association() {
-	}
-	/**
-	 * Computes the cardinality basedon the forign key definitions.
-	 */
-	public void computeCardinality()  {
-		/*by default the association is many-to-one unless the foreign key 
-		 * is also the primary key, in which case it is a one-to-one.*/
-		mCardinality = MANY_TO_ONE;
-		
-		List<ORMGenColumn> referrerCols = getReferrerColumns();
-		List<ORMGenColumn> pkCols = getReferrerTable().getPrimaryKeyColumns();
-		if (pkCols.size() == referrerCols.size()) {
-			boolean isFkPk = true;
-			for (int i = 0, n = pkCols.size(); i < n; ++i) {
-				if (!((ORMGenColumn)pkCols.get(i)).getName().equals(((ORMGenColumn)referrerCols.get(i)).getName())) {
-					isFkPk = false;
-					break;
-				}
-			}
-			if (isFkPk) {
-				mCardinality = ONE_TO_ONE;
-			}
-		}
-		
-		setCustom(false);
-	}
-	/**
-	 * Called after the asscociations are deserialized to attach 
-	 * the customizer object.
-	 */
-	protected void restore(ORMGenCustomizer customizer) {
-		mCustomizer = customizer;
-		
-		if (mReferrerRole != null) {
-			mReferrerRole.restore(this);
-		}
-		if (mReferencedRole != null) {
-			mReferencedRole.restore(this);
-		}
-	}
-	public ORMGenTable getReferrerTable()  {
-		return mCustomizer.getTable(mReferrerTableName);
-	}
-	public String getReferrerTableName() {
-		return mReferrerTableName;
-	}
-	public ORMGenTable getReferencedTable()  {
-		return mCustomizer.getTable(mReferencedTableName);
-	}
-	public String getReferencedTableName() {
-		return mReferencedTableName;
-	}
-	public ORMGenTable getJoinTable()  {
-		return mCustomizer.getTable(mJoinTableName);
-	}
-	public String getJoinTableName() {
-		return mJoinTableName;
-	}
-	/**
-	 * Returns the <code>ORMGenColumn</code> objects for the referrer
-	 * columns.
-	 */
-	public List<ORMGenColumn> getReferrerColumns() {
-		if (mReferrerCols == null) {
-			mReferrerCols = getReferrerTable().getColumnsByNames(mReferrerColNames);
-		}
-		return mReferrerCols;
-	}
-	public List<String> getReferrerColumnNames() {
-		return mReferrerColNames;
-	}
-	/**
-	 * Returns the <code>ORMGenColumn</code> objects for the referenced
-	 * columns.
-	 */
-	public List<ORMGenColumn> getReferencedColumns() {
-		if (mReferencedCols == null) {
-			mReferencedCols = getReferencedTable().getColumnsByNames(mReferencedColNames);
-		}
-		return mReferencedCols;
-	}
-	public List<String> getReferencedColumnNames() {
-		return mReferencedColNames;
-	}
-	public List<ORMGenColumn> getReferrerJoinColumns() {
-		if (mReferrerJoinCols == null) {
-			mReferrerJoinCols = getJoinTable().getColumnsByNames(mReferrerJoinColNames);
-		}
-		return mReferrerJoinCols;
-	}
-	public List<String> getReferrerJoinColumnNames() {
-		return mReferrerJoinColNames;
-	}
-	public List<ORMGenColumn> getReferencedJoinColumns()  {
-		if (mReferencedJoinCols == null) {
-			mReferencedJoinCols = getJoinTable().getColumnsByNames(mReferencedJoinColNames);
-		}
-		return mReferencedJoinCols;
-	}
-	public List<String> getReferencedJoinColumnNames() {
-		return mReferencedJoinColNames;
-	}
-	/**
-	 * Returns the association cardinality, one of {@link #MANY_TO_ONE}|{@link #MANY_TO_MANY}
-	 * |{@link #ONE_TO_ONE}|{@link #ONE_TO_MANY}
-	 */
-	public String getCardinality() {
-		return mCardinality;
-	}
-	public void setCardinality(String cardinality) {
-		assert(cardinality.equals(MANY_TO_ONE) || cardinality.equals(MANY_TO_MANY) || cardinality.equals(ONE_TO_ONE) || cardinality.equals(ONE_TO_MANY));
-		mCardinality = cardinality;
-	}
-	/**
-	 * Returns the association directionality, one of {@link #BI_DI}|{@link #NORMAL_DI}
-	 * |{@link #OPPOSITE_DI}
-	 */
-	public String getDirectionality() {
-		return mDirectionality;
-	}
-	public void setDirectionality(String dir) {
-		assert(dir.equals(BI_DI) || dir.equals(NORMAL_DI) || dir.equals(OPPOSITE_DI));
-		if (!dir.equals(mDirectionality)) {
-			mDirectionality = dir;
-			
-			if (dir.equals(NORMAL_DI)) {
-				mReferencedRole = null;
-			} else if (dir.equals(OPPOSITE_DI)) {
-				mReferrerRole = null;
-			}
-		}
-	}
-	
-	/**
-	 * Tests whether this association is bidirectional.
-	 * This is a shortcut for <code>getDirectionality().equals(BI_DI)</code>.
-	 */
-	public boolean isBidirectional() {
-		return mDirectionality.equals(BI_DI);
-	}
-	/**
-	 * Returns true of this association should be generated. 
-	 */
-	public boolean isGenerated() {
-		return (mFlags & GENERATED) != 0;
-	}
-	public void setGenerated(boolean generated) {
-		if (generated != isGenerated()) {
-			if (generated) {
-				mFlags |= GENERATED;
-			} else {
-				mFlags &= ~GENERATED;
-			}
-			mReferrerRole = mReferencedRole = null;
-		}
-	}
-	/**
-	 * Returns true of this association is custom (i.e is not auto computed from foreign keys relationships). 
-	 */
-	public boolean isCustom() {
-		return (mFlags & CUSTOM) != 0;
-	}
-	public void setCustom(boolean custom) {
-		if (custom) {
-			mFlags |= CUSTOM;
-		} else {
-			mFlags &= ~CUSTOM;
-		}
-	}
-	/**
-	 * Returns the association role for the referrer side, or null 
-	 * if none (i.e if the directionality does not include it).
-	 */
-	public AssociationRole getReferrerRole() {
-		if (mReferrerRole == null && isGenerated()) {
-			if (!getDirectionality().equals(OPPOSITE_DI)) { //BI_DI or NORMAL_DI
-				mReferrerRole = new AssociationRole(this, true/*isReferrerEnd*/);
-			}
-		}
-		return mReferrerRole;
-	}
-	/**
-	 * Returns the association role for the referenced side, or null 
-	 * if none (i.e if the directionality does not include it).
-	 */
-	public AssociationRole getReferencedRole() {
-		if (mReferencedRole == null && isGenerated()) {
-			if (!getDirectionality().equals(Association.NORMAL_DI)) { //BI_DI or OPPOSITE_DI
-				mReferencedRole = new AssociationRole(this, false/*isReferrerEnd*/);
-			}
-		}
-		return mReferencedRole;
-	}
-	/**
-	 * Tests whether this association is valid (valid table and column names).
-	 */
-	protected boolean isValid(){
-		if (!isValidTableAndColumns(mReferrerTableName, mReferrerColNames)
-				|| !isValidTableAndColumns(mReferencedTableName, mReferencedColNames)) {
-			return false;
-		}
-		if (mJoinTableName != null) {
-			if (!isValidTableAndColumns(mJoinTableName, mReferrerJoinColNames)
-					|| !isValidTableAndColumns(mJoinTableName, mReferencedJoinColNames)) {
-				return false;
-			}			
-		}
-		return true;
-	}
-	private boolean isValidTableAndColumns(String tableName, List<String> columnNames) {
-		ORMGenTable table = mCustomizer.getTable(tableName);
-		if (table == null) {
-			return false;
-		}
-		for (int i = 0, n = columnNames.size(); i < n; ++i) {
-			String colName = (String)columnNames.get(i);
-			if (table.getColumnByName(colName) == null) {
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	public void setForeignKey(ForeignKey foreignKey) {
-		this.mForeignKey = foreignKey;
-		
-	}
-	public ForeignKey getForeignKey(){
-		return this.mForeignKey;
-	};	
-	public boolean equals(Object obj) {
-		if( this == obj )
-			return true;
-		if( obj instanceof Association ){
-			Association association2 = (Association)obj;
-			if (!this.getReferrerTableName().equals(association2.getReferrerTableName())
-					|| !this.getReferencedTableName().equals(association2.getReferencedTableName())
-					|| !StringUtil.equalObjects(this.getJoinTableName(), association2.getJoinTableName())
-					|| !this.getReferrerColumnNames().equals(association2.getReferrerColumnNames())
-					|| !this.getReferencedColumnNames().equals(association2.getReferencedColumnNames())
-					) {
-				return false;
-			}					
-			/*the 2 association have the same referrer, referenced and join table*/
-			//If MTO or OTM association
-			if (this.getJoinTableName() == null) {
-				return true;
-			}
-			if (this.getReferrerJoinColumnNames().equals(association2.getReferrerJoinColumnNames())
-					&& this.getReferencedJoinColumnNames().equals(association2.getReferencedJoinColumnNames())) {
-				return true;
-			}
-		}
-		return false;
-	}	
-	public String toString(){
-		return mReferrerTableName + " " + mCardinality + " " + mReferencedTableName ;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/AssociationRole.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/AssociationRole.java
deleted file mode 100644
index 458edfd58e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/AssociationRole.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal2;
-
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Represents an association role (the referrer or referenced role).
- * 
- */
-public class AssociationRole implements java.io.Serializable
-{
-	private transient Association mAssociation; //transient: see restore
-	private boolean mIsReferrerRole;
-	private String mPropertyName;
-	private String mCascade;
-	
-	private final static long serialVersionUID = 1;
-		
-	AssociationRole(Association association, boolean isReferrerRole) {
-		super();
-		
-		mAssociation = association;
-		mIsReferrerRole = isReferrerRole;
-	}
-	/**
-	 * Empty constructor needed by the deserialization (should not be used otherwise).
-	 */
-	public AssociationRole() {
-	}
-	/**
-	 * Called after the asscociations are deserialized to attach 
-	 * the customizer object.
-	 */
-	protected void restore(Association association) {
-		mAssociation = association;
-	}
-	public Association getAssociation() {
-		return mAssociation;
-	}
-	public boolean isReferrerRole() {
-		return mIsReferrerRole;
-	}
-	/**
-	 * Returns the opposite role or null if the association 
-	 * is not bi directional.
-	 */
-	public AssociationRole getOppositeRole() {
-		Association association = getAssociation();
-		if (!association.getDirectionality().equals(Association.BI_DI)) {
-			return null;
-		}
-		if (isReferrerRole()) {
-			return association.getReferencedRole();
-		} else {
-			return association.getReferrerRole();
-		}
-	}
-	/**
-	 * Returns the association cardinality, one of {@link #MANY_TO_ONE}|{@link #MANY_TO_MANY}
-	 * |{@link #ONE_TO_ONE}|{@link #ONE_TO_MANY}
-	 */
-	public String getCardinality() {
-		String type = mAssociation.getCardinality();
-		if (!mIsReferrerRole) {
-			if (type.equals(Association.ONE_TO_MANY)) {
-				type = Association.MANY_TO_ONE;
-			} else if (type.equals(Association.MANY_TO_ONE)) {
-				type = Association.ONE_TO_MANY;
-			}
-		}
-		return type;
-	}
-	public ORMGenTable getReferrerTable() {
-		if (mIsReferrerRole) {
-			return mAssociation.getReferrerTable();
-		} else {
-			return mAssociation.getReferencedTable();
-		}
-	}
-	public List<ORMGenColumn> getReferrerColumns(){
-		if (mIsReferrerRole) {
-			return mAssociation.getReferrerColumns();
-		} else {
-			return mAssociation.getReferencedColumns();
-		}
-	}
-	/**
-	 * Returns the referenced column corresponding to a referrer column.
-	 */
-	public ORMGenColumn getReferencedColumn(String referrerColumn)  {
-		boolean hasJoinTable = mAssociation.getJoinTable() != null;
-		List<ORMGenColumn> referrerColumns = getReferrerColumns();
-		for (int i = 0, n = referrerColumns.size(); i < n; ++i) {
-			ORMGenColumn column = (ORMGenColumn)referrerColumns.get(i);
-			if (column.getName().equals(referrerColumn)) {
-				if (hasJoinTable) {
-					return (ORMGenColumn)getReferrerJoinColumns().get(i);
-				} else {
-					return (ORMGenColumn)getReferencedColumns().get(i);
-				}
-			}
-		}
-		assert(false);
-		return null;
-	}
-	/**
-	 * Returns the referrer column corresponding to a referenced column.
-	 */
-	public ORMGenColumn getReferrerColumn(String referencedColumn)  {
-		boolean hasJoinTable = mAssociation.getJoinTable() != null;
-		List<ORMGenColumn> referencedColumns = getReferencedColumns();
-		for (int i = 0, n = referencedColumns.size(); i < n; ++i) {
-			ORMGenColumn column = (ORMGenColumn)referencedColumns.get(i);
-			if (column.getName().equals(referencedColumn)) {
-				if (hasJoinTable) {
-					return (ORMGenColumn)getReferencedJoinColumns().get(i);
-				} else {
-					return (ORMGenColumn)getReferrerColumns().get(i);
-				}
-			}
-		}
-		assert(false);
-		return null;
-	}
-	public ORMGenTable getReferencedTable()  {
-		if (mIsReferrerRole) {
-			return mAssociation.getReferencedTable();
-		} else {
-			return mAssociation.getReferrerTable();
-		}
-	}
-	public List<ORMGenColumn> getReferencedColumns()  {
-		if (mIsReferrerRole) {
-			return mAssociation.getReferencedColumns();
-		} else {
-			return mAssociation.getReferrerColumns();
-		}
-	}
-	public List<ORMGenColumn> getReferrerJoinColumns()  {
-		if (mIsReferrerRole) {
-			return mAssociation.getReferrerJoinColumns();
-		} else {
-			return mAssociation.getReferencedJoinColumns();
-		}
-	}
-	public List<ORMGenColumn> getReferencedJoinColumns()  {
-		if (mIsReferrerRole) {
-			return mAssociation.getReferencedJoinColumns();
-		} else {
-			return mAssociation.getReferrerJoinColumns();
-		}
-	}
-	
-	/**
-	 * Returns the name that should be used by the generator for 
-	 * the property corresponding to this role.
-	 */
-	public String getPropertyName()   {
-		if (mPropertyName != null) { //if the user explicitly set it then don't be too smart
-			return mPropertyName;
-		}
-		String propName ="";
-		ORMGenTable referrerTable = getReferrerTable();
-		ORMGenTable referencedTable = getReferencedTable();
-
-		boolean isSingular = isSingular();
-		propName = referencedTable.getVarName(isSingular);
-		
-		List<AssociationRole> clashingRoles = new java.util.ArrayList<AssociationRole>(); //roles with our same referrer and referenced tables (i.e would yield the same property name in the same bean)
-		/*make sure there is no role with the same name.*/
-		for (Iterator<AssociationRole> iter = referrerTable.getAssociationRoles().iterator(); iter.hasNext(); ) {
-			AssociationRole role = (AssociationRole)iter.next();
-			if (role.getReferrerTable().getName().equals(referrerTable.getName())
-					&& role.getReferencedTable().getName().equals(referencedTable.getName())
-					&& role.isSingular() == isSingular) {
-				clashingRoles.add(role);
-			}
-		}
-		if (clashingRoles.size() > 1) {
-			int index = clashingRoles.indexOf(this);
-			assert(index >= 0);
-			propName += index+1;
-		}
-		
-		/*make sure there is no column with the same name.*/
-		for (Iterator<ORMGenColumn> iter = referrerTable.getColumns().iterator(); iter.hasNext(); ) {
-			ORMGenColumn column = (ORMGenColumn)iter.next();
-			if (column.getPropertyName().equals(propName)) {
-				String prefix = isSingular ? "Bean" : "Set";
-				propName += prefix;
-				break;
-			}
-		}
-		
-		return propName;
-	}
-	private boolean isSingular() {
-		String cardinality = getCardinality();
-		return cardinality.equals(Association.ONE_TO_ONE) || cardinality.equals(Association.MANY_TO_ONE);
-	}
-	/**
-	 * Changes the name that should be used by the generator for 
-	 * the property corresponding to this role.
-	 * If the argument name is null or empty string then the 
-	 * default computed name is used.
-	 */
-	public void setPropertyName(String name)  {
-		if (name != null && name.length() == 0) {
-			name = null;
-		}
-		if (name != null && name.equals(getPropertyName())) {
-			name = null;
-		}
-		mPropertyName = name;
-	}
-	/**
-	 * Returns the cascade value for this role, or null if none.
-	 */
-	public String getCascade() {
-		return mCascade;
-	}
-	public void setCascade(String cascade) {
-		if (cascade != null && cascade.length() == 0) {
-			cascade = null;
-		}
-		mCascade = cascade;
-	}
-	/**
-	 * Returns a descriptive string used in a comment in the generated 
-	 * file (from the Velocity template).
-	 */
-	public String getDescription()  {
-		//<!-- $directionality $cardinality association to $referencedClassName -->
-		String directionality;
-		if (getAssociation().getDirectionality().equals(Association.BI_DI)) {
-			directionality = "bi-directional";
-		} else {
-			directionality = "uni-directional";
-		}
-		return directionality + " " + getAssociation().getCardinality() + " association to " + getReferencedTable().getClassName();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/BaseEntityGenCustomizer.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/BaseEntityGenCustomizer.java
deleted file mode 100644
index 8b6191c3ca..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/BaseEntityGenCustomizer.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal2;
-
-import java.io.File;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.gen.internal2.util.DTPUtil;
-import org.eclipse.jpt.gen.internal2.util.StringUtil;
-
-/**
- * Default implementation of ORMGenCustomizer according to JPA specification 
- * for entity generation.
- * 
- * This is used to retrieve/change the properties from the wizard
- * and is also passed as a context object to Velocity.
- */
-public class BaseEntityGenCustomizer extends ORMGenCustomizer implements java.io.Serializable
-{
-	private final static long serialVersionUID = 1;
-
-	/*mapping kinds*/
-	private static final String BASIC_MAPPING_KIND = "basic";
-	private static final String ID_MAPPING_KIND = "id";
-	private static final String VERSION_MAPPING_KIND = "version";
-
-	
-	/*the strings for generator names. These appear in a combo box 
-	 * and used by the Velocity template processing.*/
-	private static final String AUTO_GENERATOR = "auto";
-	private static final String NONE_GENERATOR = "none";
-	private static final String IDENTITY_GENERATOR = "identity";
-	private static final String SEQUENCE_GENERATOR = "sequence";
-	private static final String TABLE_GENERATOR = "table";
-	
-	public BaseEntityGenCustomizer(){}
-	
-	public void init(File file, Schema schema) {
-		super.init(file, schema);
-	}
-	
-	//-----------------------------------------
-	//------ ORMGenCustomizer methods
-	//-----------------------------------------
-	public List<String> getAllIdGenerators() {
-		List<String> result = new java.util.ArrayList<String>(5);
-		/*add in the order in which they would appear in the combo*/
-		result.add(AUTO_GENERATOR);
-		result.add(IDENTITY_GENERATOR);
-		result.add(SEQUENCE_GENERATOR);
-		result.add(TABLE_GENERATOR);
-		result.add(NONE_GENERATOR);
-		return result;
-	}
-	public String getNoIdGenerator() {
-		return NONE_GENERATOR;
-	}
-	public String getIdentityIdGenerator() {
-		return IDENTITY_GENERATOR;
-	}
-	public Set<String> getSequenceIdGenerators() {
-		Set<String> result = new java.util.HashSet<String>(3);
-		result.add(AUTO_GENERATOR); 
-		result.add(SEQUENCE_GENERATOR);
-		
-		return result;
-	}
-	public String getPropertyTypeFromColumn( Column column) {
-		return DTPUtil.getJavaType( getSchema(), column );
-	}
-	public String[] getAllPropertyTypes() {
-		/*
-		 * Java primitive types, wrapper of the primitive types
-		 * , java.lang.String, java.math.BigInteger,
-		 * java.math.BigDecimal, java.util.Date, java.util.Calendar, java.sql.Date,
-		 * java.sql.Time, java.sql.Timestamp, byte[], Byte[], char[], Character[],
-		 * enums, and any other type that implements Serializable.
-		 * */
-		//return in the order that will be used in the combo
-		return new String[] {
-				"boolean"
-				, "Boolean"
-				, "byte"
-				, "Byte"
-				, "byte[]"
-				, "char"
-				, "char[]"
-				, "Character"
-				, "Character[]"
-				, "double"
-				, "Double"
-				, "float"
-				, "Float"
-				, "int"
-				, "Integer"
-				, "long"
-				, "Long"
-				, "Object"
-				, "short"
-				, "Short"
-				, "String"
-				
-				, java.math.BigDecimal.class.getName()
-				, java.math.BigInteger.class.getName()
-				, java.util.Calendar.class.getName()
-				, java.util.Date.class.getName()
-				, java.sql.Date.class.getName()
-				, java.sql.Time.class.getName()
-				, java.sql.Timestamp.class.getName()				
-				};
-	}
-	public String[] getAllMappingKinds() {
-		return new String[] {
-				BASIC_MAPPING_KIND
-				, ID_MAPPING_KIND
-				, VERSION_MAPPING_KIND
-		};
-	}
-	/* (non-Javadoc)
-	 */
-	public String getBasicMappingKind() {
-		return BASIC_MAPPING_KIND;
-	}
-	/* (non-Javadoc)
-	 */
-	public String getIdMappingKind() {
-		return ID_MAPPING_KIND;
-	}
-	public boolean editCascade(AssociationRole role) {
-		return false;
-	}
-
-	protected boolean manySideIsAssociationOwner() {
-		return true;
-	}
-
-	//-----------------------------------------
-	//---- Velocity templates methods
-	//-----------------------------------------
-	/**
-	 * Returns the cascades annotation member value, or empty string 
-	 * if none.
-	 * Empty string is returned instead of null because Velocity does not like null 
-	 * when used in #set.
-	 */
-	public String genCascades(AssociationRole role) {
-		List<String> cascades = StringUtil.strToList(role.getCascade(), ',', true/*trim*/);
-		if (cascades == null) {
-			return "";
-		}
-		StringBuffer buffer = new StringBuffer("{");
-		for (int i = 0, n = cascades.size(); i < n; ++i) {
-			String cascade = (String)cascades.get(i);
-			String enumStr;
-			if (cascade.equals(TagNames.ALL_CASCADE)) {
-				enumStr = "CascadeType.ALL";
-			} else if (cascade.equals(TagNames.PERSIST_CASCADE)) {
-				enumStr = "CascadeType.PERSIST";
-			} else if (cascade.equals(TagNames.MERGE_CASCADE)) {
-				enumStr = "CascadeType.MERGE";
-			} else if (cascade.equals(TagNames.REMOVE_CASCADE)) {
-				enumStr = "CascadeType.REMOVE";
-			} else {
-				assert(cascade.equals(TagNames.REFRESH_CASCADE));
-				enumStr = "CascadeType.REFRESH";
-			}
-			if (i != 0) {
-				buffer.append(", ");
-			}
-			buffer.append(enumStr);
-		}
-		buffer.append('}');
-		return buffer.toString();
-	}
-	/**
-	 * Returns the fetch type annotation member value, or empty string 
-	 * if none.
-	 * Empty string is returned instead of null because Velocity does not like null 
-	 * when used in #set.
-	 */
-	public String genFetch(ORMGenTable table) {
-		String fetch = table.getDefaultFetch();
-		if (fetch == null) {
-			return "";
-		} else if (fetch.equals(ORMGenTable.LAZY_FETCH)) {
-			return "FetchType.LAZY";
-		} else {
-			return "FetchType.EAGER";
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/DatabaseAnnotationNameBuilder.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/DatabaseAnnotationNameBuilder.java
deleted file mode 100644
index ce93f829e3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/DatabaseAnnotationNameBuilder.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.eclipse.jpt.gen.internal2;
-
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.db.ForeignKey;
-import org.eclipse.jpt.db.Table;
-
-
-/**
- * Provide a pluggable way to determine whether and how the entity generator
- * prints the names of various database objects.
- */
-public interface DatabaseAnnotationNameBuilder {
-
-	/**
-	 * Given the name of an entity and the table to which it is mapped,
-	 * build and return a string to be used as the value for the entity's
-	 * Table annotation's 'name' element. Return null if the entity
-	 * maps to the table by default.
-	 */
-	String buildTableAnnotationName(String entityName, Table table);
-
-	/**
-	 * Given the name of an attribute (field or property) and the column
-	 * to which it is mapped,
-	 * build and return a string to be used as the value for the attribute's
-	 * Column annotation's 'name' element. Return null if the attribute
-	 * maps to the column by default.
-	 */
-	String buildColumnAnnotationName(String attributeName, Column column);
-
-	/**
-	 * Given the name of an attribute (field or property) and the
-	 * many-to-one or many-to-many foreign key to which it is mapped,
-	 * build and return a string to be used as the value for the attribute's
-	 * JoinColumn annotation's 'name' element. Return null if the attribute
-	 * maps to the join column by default.
-	 * The specified foreign key consists of a single column pair whose
-	 * referenced column is the single-column primary key of the foreign
-	 * key's referenced table.
-	 */
-	String buildJoinColumnAnnotationName(String attributeName, ForeignKey foreignKey);
-
-	/**
-	 * Build and return a string to be used as the value for a JoinColumn
-	 * annotation's 'name' or 'referencedColumnName' element.
-	 * This is called for many-to-one and many-to-many mappings when
-	 * the default join column name and/or referenced column name are/is
-	 * not applicable.
-	 * @see buildJoinColumnAnnotationName(String, ForeignKey)
-	 */
-	String buildJoinColumnAnnotationName(Column column);
-
-	/**
-	 * Build and return a string to be used as the value for a JoinTable
-	 * annotation's 'name' element.
-	 * This is called for many-to-many mappings when the default
-	 * join table name is not applicable.
-	 */
-	String buildJoinTableAnnotationName(Table table);
-
-
-	/**
-	 * The default implementation simple returns the database object's name,
-	 * unaltered.
-	 */
-	final class Default implements DatabaseAnnotationNameBuilder {
-		public static final DatabaseAnnotationNameBuilder INSTANCE = new Default();
-		public static DatabaseAnnotationNameBuilder instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Default() {
-			super();
-		}
-		public String buildTableAnnotationName(String entityName, Table table) {
-			return table.getName();
-		}
-		public String buildColumnAnnotationName(String attributeName, Column column) {
-			return column.getName();
-		}
-		public String buildJoinColumnAnnotationName(String attributeName, ForeignKey foreignKey) {
-			return foreignKey.getColumnPair().getBaseColumn().getName();
-		}
-		public String buildJoinColumnAnnotationName(Column column) {
-			return column.getName();
-		}
-		public String buildJoinTableAnnotationName(Table table) {
-			return table.getName();
-		}
-		@Override
-		public String toString() {
-			return "DatabaseAnnotationNameBuilder.Default";  //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ForeignKeyInfo.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ForeignKeyInfo.java
deleted file mode 100644
index e9048090e9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ForeignKeyInfo.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal2;
-
-import java.util.List;
-
-import org.eclipse.jpt.db.ForeignKey;
-
-/**
- * Represents the metadata for a particular foreign key relationship 
- * in a relational database schema.
- * <p/>
- * The referrer column is one which actually contains a foreign 
- * key constraint, and is equivalent to the "foreign key" column.
- * <p/>
- * The referenced column is one which a referrer or foreign key 
- * column references, and is equivalent to the "primary key" column.
- * 
- */
-public class ForeignKeyInfo
-{
-	private transient ForeignKey mForeignKey ;
-    private String mName;
-    private String mReferrerTableName;
-    private String mReferencedTableName;
-    private List<String> mReferrerColNames = new java.util.ArrayList<String>();
-    private List<String> mReferencedColNames = new java.util.ArrayList<String>();
-    
-    /**
-     * @param fk The name of the constraint backing 
-     * this foreign key metadata instance.
-     */
-    public ForeignKeyInfo(ForeignKey fk, String referrerTableName, String referencedTableName) {
-    	mForeignKey = fk;
-    	mName = fk.getName();
-    	mReferrerTableName = referrerTableName;
-    	mReferencedTableName = referencedTableName;
-	}
-    /**
-     * Obtain the constraint name for this foreign key specification.
-     * The name for a Foreign Key may, as per the JDBC specification,
-     * be <code>null</code> where the constraint is not named.
-     * In addition, it may be hardly recognizable to the user,
-     * particularly for DB/2 constraints.
-     * 
-     * @return The name of the constraint backing
-     *         this foreign key metadata instance.
-     */
-    public String getName()
-    {
-        return mName;
-    }
-    
-    public ForeignKey getForeignKey(){
-    	return mForeignKey;
-    }
-    /**
-     * Add another pair of foreign key mappings for this foreign key
-     * definition.
-     * 
-     * @param referrerColumn The referrer column name for this mapping.
-     * 
-     * @param referencedColumn The referenced column name for this mapping.
-     */
-    public void addColumnMapping(String referrerColName, String referencedColName) {
-    	mReferrerColNames.add(referrerColName);
-    	mReferencedColNames.add(referencedColName);
-    }
-    /**
-     * Returns the referrer table name of this foreign key
-     * relationship.
-     */
-    public String getReferrerTableName() {
-        return mReferrerTableName;
-    }
-    /**
-     * Returns the referrer column names for this
-     * foreign key.
-     * The size of this list is always the same as the size of 
-     * the list retured from <code>getReferencedColumnNames</code>
-     */
-    public List<String> getReferrerColumnNames() {
-        return mReferrerColNames;
-    }
-    /**
-     * Returns the referenced table name of this foreign key
-     * relationship.
-     */
-    public String getReferencedTableName() {
-    	 return mReferencedTableName;
-    }
-    /**
-     * Returns the referenced column names for this
-     * foreign key.
-     * The size of this list is always the same as the size of 
-     * the list retured from <code>getReferrerColumnNames</code>
-     */
-    public List<String> getReferencedColumnNames() {
-        return mReferencedColNames;
-    }
-    /* (non-Javadoc)
-     * @see java.lang.Object#toString()
-     */
-    public String toString() {
-    	return "name=" + mName
-		+ ", referrerTable=" + mReferrerTableName
-		+ ", referencedTable=" + mReferencedTableName
-		+ ", referrerColumns=" + mReferrerColNames
-		+ ", referencedColumns=" + mReferencedColNames
-			;
-    }
-}
-
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/JptGenMessages.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/JptGenMessages.java
deleted file mode 100644
index 25fc02e674..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/JptGenMessages.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal2;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Localized messages used by Dali entity generation.
- */
-class JptGenMessages {
-
-	public static String PackageGenerator_taskName;
-	public static String GenScope_taskName;
-	public static String EntityGenerator_taskName;
-	public static String Templates_notFound;
-	public static String Error_Generating_Entities;
-
-	private static final String BUNDLE_NAME = "jpt_gen"; //$NON-NLS-1$
-	private static final Class<?> BUNDLE_CLASS = JptGenMessages.class;
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, BUNDLE_CLASS);
-	}
-	
-	private JptGenMessages() {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/JptGenPlugin.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/JptGenPlugin.java
deleted file mode 100644
index aec0b82b88..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/JptGenPlugin.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.jpt.gen.internal2;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-public class JptGenPlugin {
-	public static final String PLUGIN_ID = "org.eclipse.jpt.gen";
-	public static void logException ( String msg, Throwable e ) {
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		ILog log = Platform.getLog(bundle);
-		log.log(new Status(IStatus.ERROR, PLUGIN_ID, msg, e ));		
-	}
-	
-	public static void logException( CoreException ce ) {
-		IStatus status = ce.getStatus();
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		ILog log = Platform.getLog(bundle);
-		log.log(new Status(IStatus.ERROR, PLUGIN_ID, status.getMessage(), ce));		
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ORMGenColumn.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ORMGenColumn.java
deleted file mode 100644
index 24d42111c3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ORMGenColumn.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal2;
-
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.gen.internal2.util.DTPUtil;
-import org.eclipse.jpt.gen.internal2.util.StringUtil;
-
-
-/**
- * Represents the ORM generation properties for a database 
- * column.
- * 
- * <p>This is designed to be created/changed by the generation wizard,
- * and generated using Velocity templates.
- * The modified properties (if any) are persisted/retrieved using 
- * <code>ORMGenCustomizer</code>.
- * 
- */
-public class ORMGenColumn
-{
-	private Table mTable;
-	private Column mDbColumn;
-	private ORMGenCustomizer mCustomizer;
-	private static String JAVA_LANG_PACKAGE = "java.lang.";
-	
-	public ORMGenColumn(Column dbColumn, ORMGenCustomizer customizer) {
-		super();
-		
-		mDbColumn = dbColumn;
-		mCustomizer = customizer;
-		mTable = dbColumn.getTable() ;
-	}
-	public ORMGenCustomizer getCustomizer() {
-		return mCustomizer;
-	}
-	
-	protected String customized(String propName) {
-		return getCustomizer().getProperty(propName, mTable.getName(), getName());
-	}
-	protected boolean customizedBoolean(String propName) {
-		return getCustomizer().getBooleanProperty(propName, mTable.getName(), getName());
-	}
-	protected void setCustomized(String propName, String value) {
-		if (value != null && value.length() == 0) {
-			value = null;
-		}
-		getCustomizer().setProperty(propName, value, mTable.getName(), getName());
-	}
-	protected void setCustomizedBoolean(String propName, boolean value, boolean defaultValue) {
-		if (defaultValue == value) {
-			setCustomized(propName, null); //remove the property
-		} else {
-			getCustomizer().setBooleanProperty(propName, value, mTable.getName(), getName());
-		}
-	}
-	
-	/**
-	 * Returns the column name.
-	 */
-	public String getName() {
-		String annotationName = this.mCustomizer.getDatabaseAnnotationNameBuilder().
-			buildColumnAnnotationName(mDbColumn.getName(), mDbColumn);
-		return annotationName!=null ? annotationName : mDbColumn.getName();
-	}
-
-	public String getJoinColumnName(){
-		String annotationName = this.mCustomizer.getDatabaseAnnotationNameBuilder().
-			buildJoinColumnAnnotationName(mDbColumn);
-		return annotationName!=null ? annotationName : mDbColumn.getName();
-	}
-	
-	public Column getDbColumn(){
-		return this.mDbColumn;
-	}
-	
-	/**
-	 * Returns the generated bean property name for the given column.
-	 * Does not return null.
-	 */
-	public String getPropertyName() {
-		String name = customized(PROPERTY_NAME);
-		if (name == null) {
-			name = StringUtil.columnNameToVarName(getName());
-		}
-		return name;
-	}
-	public void setPropertyName(String name) {
-		if (!StringUtil.equalObjects(name, getPropertyName())) {
-			setCustomized(PROPERTY_NAME, name);
-		}
-	}
-	
-	/**
-	 * Return true if the values of name element in the @Column is default
-	 * so we can skip generating the annotation
-	 * 
-	 * @return true
-	 */
-	public boolean isDefault(){
-		return isDefaultname() && isUpdateable() && isInsertable();
-	}
-	
-	/**
-	 * Return true if the values of name element in the @Column is default
-	 * so we can skip generating the annotation
-	 * 
-	 * @return true
-	 */
-	public boolean isDefaultname(){
-		String propName = getPropertyName();
-		String dbColumnName = getName();
-		return propName.equalsIgnoreCase( dbColumnName );
-	}
-
-	
-	/**
-	 * Returns the column type.
-	 * Does not return null.
-	 */
-	public String getPropertyType()  {
-		String type = customized(PROPERTY_TYPE);
-		if (type == null) {
-			type = getCustomizer().getPropertyTypeFromColumn( this.mDbColumn );
-		}
-		if( type.startsWith(JAVA_LANG_PACKAGE) ){
-			type = type.substring( JAVA_LANG_PACKAGE.length() );
-		}
-		return type;
-	}
-	public void setPropertyType(String type)  {
-		if (!StringUtil.equalObjects(type, getPropertyType())) {
-			setCustomized(PROPERTY_TYPE, type);
-		}
-	}
-	/**
-	 * Returns true if the column type is numeric.
-	 */
-	public boolean isNumeric() {
-		boolean ret = this.mDbColumn.isNumeric() ;
-		return ret;
-		
-	}
-	/**
-	 * Returns the mapping kind, one of {@link #PROPERTY_MAPPING_KIND}|{@link #ID_MAPPING_KIND}
-	 * |{@link #VERSION_MAPPING_KIND}|{@link #TIMESTAMP_MAPPING_KIND}.
-	 * 
-	 * This method does not return null (defaults to basic property type).
-	 */
-	public String getMappingKind() {
-		String kind = customized(MAPPING_KIND);
-		if (kind == null) {
-			kind = getCustomizer().getBasicMappingKind();
-			
-			if ( this.mDbColumn.isPartOfPrimaryKey() 
-				 && DTPUtil.getPrimaryKeyColumnNames( this.mDbColumn.getTable() ).size() == 1) {
-				kind = getCustomizer().getIdMappingKind();
-			}
-		}
-		return kind;
-	}
-	public void setMappingKind(String mappingKind)  {
-		if (!StringUtil.equalObjects(mappingKind, getMappingKind())) {
-			setCustomized(MAPPING_KIND, mappingKind);
-		}
-	}
-	public boolean isNullable() {
-		return this.mDbColumn.isNullable();
-	}
-
-	public int getSize() {
-		if( this.mDbColumn.isNumeric()){
-			return mDbColumn.getPrecision();
-		}
-		return mDbColumn.getLength();
-	}
-
-	public int getDecimalDigits() {
-		if( this.mDbColumn.isNumeric() ){
-			return mDbColumn.getScale();
-		}
-		return -1;
-	}
-	
-	public boolean isPrimaryKey(){
-		return this.mDbColumn.isPartOfPrimaryKey() ;
-	}
-	public boolean isForeignKey()  {
-		return this.mDbColumn.isPartOfForeignKey() ;
-	}
-	public boolean isUnique()  {
-		return this.mDbColumn.isPartOfUniqueConstraint() ;
-	}
-	public String getPropertyDescription() {
-		return customized(PROPERTY_DESC);
-	}
-	
-	public boolean isDataTypeLOB(){
-		return this.mDbColumn.isLOB();
-	}	
-
-	public boolean isNeedMapTemporalType(){
-		String propertyType = this.getPropertyType();
-		return ( propertyType.equals("java.util.Date") || propertyType.equals("java.util.Calendar") ); 
-	}	
-	
-	public String getTemporalType(){
-		String defaultType = getCustomizer().getPropertyTypeFromColumn( this.mDbColumn );
-		if( defaultType.equals("java.sql.Date")){
-			return "DATE";
-		}else if( defaultType.equals("java.sql.Time")){
-			return "TIME";
-		}else {
-			return "TIMESTAMP";
-		}
-	}	
-	
-	/**
-	 * Returns the generated property getter scope, one of {@link #PUBLIC_SCOPE}|{@link #PROTECTED_SCOPE}
-	 * |{@link #PRIVATE_SCOPE}.
-	 * This method never returns null (defaults to public).
-	 */
-	public String getPropertyGetScope() {
-		String scope = customized(PROPERTY_GET_SCOPE);
-		if (scope == null) {
-			scope = PUBLIC_SCOPE;
-		}
-		return scope;
-	}
-	public void setPropertyGetScope(String scope) {
-		if (!StringUtil.equalObjects(scope, getPropertyGetScope())) {
-			setCustomized(PROPERTY_GET_SCOPE, scope);
-		}
-	}
-	/**
-	 * Returns the generated property setter scope, one of {@link #PUBLIC_SCOPE}|{@link #PROTECTED_SCOPE}
-	 * |{@link #PRIVATE_SCOPE}.
-	 * This method never returns null (defaults to public).
-	 */
-	public String getPropertySetScope() {
-		String scope = customized(PROPERTY_SET_SCOPE);
-		if (scope == null) {
-			scope = PUBLIC_SCOPE;
-		}
-		return scope;
-	}
-	public void setPropertySetScope(String scope) {
-		if (!StringUtil.equalObjects(scope, getPropertySetScope())) {
-			setCustomized(PROPERTY_SET_SCOPE, scope);
-		}
-	}
-	/**
-	 * Returns the generated field member scope, one of {@link #PUBLIC_SCOPE}|{@link #PROTECTED_SCOPE}
-	 * |{@link #PRIVATE_SCOPE}.
-	 * This method never returns null (defaults to private).
-	 */
-	public String getFieldScope() {
-		String scope = customized(FIELD_SCOPE);
-		if (scope == null) {
-			scope = PRIVATE_SCOPE;
-		}
-		return scope;
-	}
-	/**
-	 * Returns true if this column should be used in the 
-	 * <code>equals</code> method implementation.
-	 */
-	public boolean isUseInEquals()  {
-		return customizedBoolean(USE_IN_EQUALS) || isPrimaryKey();
-	}
-	public void setUseInEquals(boolean value) {
-		setCustomizedBoolean(USE_IN_EQUALS, value, false);
-	}
-	/**
-	 * Returns true if this column should be used in the 
-	 * <code>toString</code> method implementation.
-	 */
-	public boolean isUseInToString()  {
-		return customizedBoolean(USE_IN_TO_STRING) || isPrimaryKey();
-	}
-	public void setUseInToString(boolean value) {
-		setCustomizedBoolean(USE_IN_TO_STRING, value, false);
-	}
-	public boolean isUpdateable() {
-		return !"false".equals(customized(UPDATEABLE)); //defaults to true
-	}
-	public void setUpdateable(boolean value) {
-		setCustomizedBoolean(UPDATEABLE, value, true);
-	}
-	public boolean isInsertable() {
-		return !"false".equals(customized(INSERTABLE)); //defaults to true
-	}
-	public void setInsertable(boolean value) {
-		setCustomizedBoolean(INSERTABLE, value, true);
-	}
-	public boolean isGenerated() {
-		return !"false".equals(customized(GENERATED)); //defaults to true
-	}
-	public void setGenerated(boolean value) {
-		setCustomizedBoolean(GENERATED, value, true);
-	}
-	
-	/*get/set and field scopes*/
-	public static final String PUBLIC_SCOPE = "public";
-	public static final String PROTECTED_SCOPE = "protected";
-	public static final String PRIVATE_SCOPE = "private";
-
-	/*customization properties*/
-	private static final String PROPERTY_NAME = "propertyName";
-	protected static final String PROPERTY_TYPE = "propertyType";
-	protected static final String MAPPING_KIND = "mappingKind";
-	private static final String PROPERTY_DESC = "propertyDesc";
-	private static final String PROPERTY_GET_SCOPE = "propertyGetScope";
-	private static final String PROPERTY_SET_SCOPE = "propertySetScope";
-	private static final String FIELD_SCOPE = "fieldScope";
-	private static final String USE_IN_EQUALS = "useInEquals";
-	private static final String USE_IN_TO_STRING = "useInToString";
-	private static final String UPDATEABLE = "updateable";
-	private static final String INSERTABLE = "insertable";
-	private static final String GENERATED = "genProperty";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ORMGenCustomizer.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ORMGenCustomizer.java
deleted file mode 100644
index 32496eb8ac..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ORMGenCustomizer.java
+++ /dev/null
@@ -1,752 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal2;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.gen.internal2.util.DTPUtil;
-import org.eclipse.jpt.gen.internal2.util.FileUtil;
-import org.eclipse.jpt.gen.internal2.util.StringUtil;
-
-/**
- * Contains the information used to customize the database schema to ORM entity 
- * generation.
- * 
- * <p>The customization settings are mainly exposed in the form of 
- * properties. There are no assumptions in this class about the meaning of the 
- * property names. Properties can be associated to specific tables and table 
- * columns, or globally for any table and/or column.
- * 
- * <p>Subclass can implement the sets of abstract methods to provide ORM vendor
- * specific properties.
- * 
- */
-public abstract class ORMGenCustomizer implements java.io.Serializable
-{
-	private final static long serialVersionUID = 1;
-
-	/**
-	 * A value passed for the table name argument to get/setProperty 
-	 * indicating that the value applies to any table.
-	 */
-	public static final String ANY_TABLE = "__anyTable__";
-	/*the string used in the property name in mProps to indicate 
-	 * a null table value.*/
-	private static final String NULL_TABLE = "";
-	/*the string used in the property name in mProps to indicate 
-	 * a null column value.*/
-	private static final String NULL_COLUMN = "";
-	
-	/*This version number is written in the header of the customization stream
-	 * and read at de-serialization time, if it is different then the file is invalidated.
-	 */
-	private static final int FILE_VERSION = 2;
-	
-	private static final String UPDATE_CONFIG_FILE = "updateConfigFile";
-
-	private transient Schema mSchema;
-	private transient File mFile;
-	
-	private List<String> mTableNames;
-	/*key: table name, value: ORMGenTable object.*/
-	private transient Map<String , ORMGenTable> mTables;
-	/*the <code>Association</code> objects sorted by their "from" 
-	 * table name. Includes all association derived from foreign keys 
-	 * in user selected tables. Since some of the foreign keys may point to table
-	 * user does not select, this list may be different from  mValidAssociations
-	 **/
-	private List<Association> mAssociations;
-	/*
-	 * List of valid associations within the user selected tables  
-	 * */
-	private transient List<Association> mValidAssociations;
-	private transient boolean mInvalidForeignAssociations;
-	
-	/*the property name is in the form $tableName.$columnName.$propertyName.
-	 * Where tableName could be NULL_TABLE or ANY_TABLE
-	 * and columnName could be NULL_COLUMN*/
-	private Map<String, String> mProps = new java.util.HashMap<String, String>();
-
-	private transient DatabaseAnnotationNameBuilder databaseAnnotationNameBuilder = DatabaseAnnotationNameBuilder.Default.INSTANCE;
-	
-	//-----------------------------------------
-	//---- abstract methods
-	//-----------------------------------------
-	/**
-	 * Returns all the primary key generator schemes.
-	 * This can return any strings as far as the Velocity template 
-	 * processor understand them.
-	 */
-	public abstract List<String> getAllIdGenerators();
-	/**
-	 * Returns the string representing the developer-assigned id generator.
-	 * This can return any strings as far as the Velocity template 
-	 * processor understand them.
-	 */
-	public abstract String getNoIdGenerator();
-	/**
-	 * Returns the string representing the identity id generator.
-	 * This can return any strings as far as the Velocity template 
-	 * processor understand them.
-	 */
-	public abstract String getIdentityIdGenerator();
-	/**
-	 * Returns the strings representing the sequence generators.
-	 * This can return any strings as far as the Velocity template 
-	 * processor understand them.
-	 */
-	public abstract Set<String> getSequenceIdGenerators();
-	/**
-	 * Returns a property type from the given database column.
-	 * This can return any strings as far as the Velocity template 
-	 * processor understand them.
-	 */
-	public abstract String getPropertyTypeFromColumn(Column column) ;
-	/**
-	 * Returns all the strings representing property types.
-	 * This can return any strings as far as the Velocity template 
-	 * processor understand them.
-	 */
-	public abstract String[] getAllPropertyTypes();
-	/**
-	 * Returns all the strings representing property mapping kinds.
-	 * This can return any strings as far as the Velocity template 
-	 * processor understand them.
-	 */
-	public abstract String[] getAllMappingKinds();
-	/**
-	 * Returns the basic (default) property mapping kind.
-	 * This can return any strings as far as the Velocity template 
-	 * processor understand them.
-	 */
-	public abstract String getBasicMappingKind();
-	/**
-	 * Returns the id (primary key) property mapping kind.
-	 * This can return any strings as far as the Velocity template 
-	 * processor understand them.
-	 */
-	public abstract String getIdMappingKind();
-	/**
-	 * Interacts with the user to edit the cascade of the given 
-	 * role.
-	 * This method should also call <code>AssociationRole.setCascade</code>.
-	 * 
-	 * @return false if the user interaction is cancelled.
-	 */
-	public abstract boolean editCascade(AssociationRole role);
-	
-	//-----------------------------------------
-	//-----------------------------------------
-
-	/**
-	 * @param file The file that contains the customization settings.
-	 * The file is created if necessary when the <code>save</code> 
-	 * method is called.
-	 */
-	public void init( File file, Schema schema) {
-		this.mSchema = schema;
-		mFile = file;
-		
-		if (!file.exists()) {
-			/*A hack to set the default to eager so thet app does not throw at runtime for new apps
-			 * (in case a lazy strategy is not developed yet). This is done instead of in ORMGenTable.getDefaultFetch 
-			 * for backward compatibility.*/
-			setProperty(ORMGenTable.DEFAULT_FETCH, ORMGenTable.EAGER_FETCH, ORMGenCustomizer.ANY_TABLE, null);
-			return;
-		}
-		InputStream istream = null;
-		ObjectInputStream ois = null;
-		try 
-		{
-			//read it in a file first to speedup deserialization
-			byte[] bytes = FileUtil.readFile(file);
-			istream = new ByteArrayInputStream(bytes);
-			ois = new ObjectInputStream(istream);
-			
-			FileHeader header = (FileHeader)ois.readObject();
-			if (header.mVersion == FILE_VERSION) {
-				ORMGenCustomizer customizer = (ORMGenCustomizer)ois.readObject();
-				restore(customizer);
-			}
-		} catch (Exception ex) {
-			System.out.println("***ORMGenCustomizer.load failed "+file+": " + ex);				
-		}
-		finally 
-		{
-			if (ois != null)
-			{
-				try 
-				{
-					ois.close();
-				} catch (IOException e) {
-				}
-			}
-			
-			if (istream != null)
-			{
-				try 
-				{
-					istream.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-	}
-	
-	public void setSchema(Schema schema){
-		this.mSchema = schema;
-	}
-
-	public Schema getSchema(){
-		return mSchema;
-	}
-	
-	/**
-	 * Empty constructor needed by the deserialization.
-	 */
-	public ORMGenCustomizer() {
-		super();
-	}
-
-	/**
-	 * Saves the customization file.
-	 * The file is created if necessary.
-	 */
-	public void save() throws IOException {
-		//System.out.println("---ORMGenCustomizer.save: " + mFile);
-		if (!mFile.exists() && !mFile.createNewFile()) {
-			return;
-		}
-		java.io.FileOutputStream fos = null;
-		java.io.ObjectOutputStream oos = null;
-		boolean deleteIt = true;
-		try {
-			fos = new java.io.FileOutputStream(mFile);
-			oos = new java.io.ObjectOutputStream(fos);
-			FileHeader header = new FileHeader();
-			oos.writeObject(header);
-			oos.writeObject(this);
-			deleteIt = false;
-		} catch (Exception ex) {
-			//deleteIt is true, so the cache is not saved.
-			CoreException ce = new CoreException(new Status(IStatus.ERROR, JptGenPlugin.PLUGIN_ID,
-					"Unable to save the ORMGenCustomizer file: "+mFile,ex));
-			JptGenPlugin.logException( ce );
-		} finally {
-			try {
-				if (oos!=null) oos.close();
-				if (fos!=null) fos.close();
-				if (deleteIt) {
-					mFile.delete();
-				}
-			} catch (java.io.IOException ex2) {}	
-		}
-	}
-	
-	public DatabaseAnnotationNameBuilder getDatabaseAnnotationNameBuilder() {
-		return this.databaseAnnotationNameBuilder;
-	}
-	public void setDatabaseAnnotationNameBuilder(DatabaseAnnotationNameBuilder databaseAnnotationNameBuilder) {
-		if (databaseAnnotationNameBuilder == null) {
-			throw new NullPointerException("database annotation name builder is required");  //$NON-NLS-1$
-		}
-		this.databaseAnnotationNameBuilder = databaseAnnotationNameBuilder;
-	}	
-
-	/**
-	 * Returns a property value.
-	 */
-	public String getProperty(String propertyName, String tableName, String colName) {
-		String key = getPropKey(propertyName, tableName, colName);
-		String value = (String)mProps.get(key);
-		/*if the key does not exist and it is a table property then 
-		 * get the default table property.*/
-		if (value == null && tableName != null && colName == null && !tableName.equals(ANY_TABLE)) {
-			value = getProperty(propertyName, ANY_TABLE, colName);
-		}
-		return value;
-	}
-	/**
-	 * Changes a property value.
-	 * 
-	 * @param value The new value, could be null.
-	 */
-	public void setProperty(String propertyName, String value, String tableName, String colName) {
-		String key = getPropKey(propertyName, tableName, colName);
-		if (value != null) {
-			mProps.put(key, value);
-		} else {
-			mProps.remove(key);
-		}
-	}
-	/**
-	 * Same as {@link #getProperty(String, String, String)} but 
-	 * converts the value to boolean.
-	 */
-	public boolean getBooleanProperty(String propertyName, String tableName, String colName) {
-		String value = getProperty(propertyName, tableName, colName);
-		return "true".equals(value);
-	}
-	/**
-	 * Changes a table boolean property value.
-	 */
-	public void setBooleanProperty(String propertyName, boolean value, String tableName, String colName) {
-		setProperty(propertyName, value ? "true" : "false", tableName, colName);
-	}
-	/**
-	 * Returns the names of the tables to generate.
-	 */
-	@SuppressWarnings("unchecked")
-	public List<String> getTableNames() {
-		return mTableNames != null ? mTableNames : java.util.Collections.EMPTY_LIST;
-	}
-	/**
-	 * Called when the table user selection is changed in the 
-	 * generation wizard.
-	 */
-	public void setTableNames(List<String> tableNames) {
-		mTableNames = tableNames;
-		mTables = null;
-		mValidAssociations = null; //recompute
-		mInvalidForeignAssociations = true; //make sure foreign associations from newly added tables are computed.
-	}
-	/**
-	 * Returns the table names to be generated.
-	 * This might be different from <code>getTableNames</code> if there 
-	 * are many-to-many join tables and are not contributing 
-	 * in any other associations.
-	 */
-	public List<String> getGenTableNames()  {
-		List<String> names = getTableNames();
-		List<String> result = new java.util.ArrayList<String>(names.size());
-		
-		/*filter out join tables*/
-		List<Association> associations = getAssociations();
-		for (Iterator<String> tableNamesIter = names.iterator(); tableNamesIter.hasNext(); ) {
-			String tableName = (String)tableNamesIter.next();
-			boolean isValid = true;
-			
-			for (Iterator<Association> assocIter = associations.iterator(); assocIter.hasNext(); ) {
-				Association association = (Association)assocIter.next();
-				if (!association.isGenerated()) {
-					continue;
-				}
-				if (tableName.equals(association.getReferrerTableName())
-						|| tableName.equals(association.getReferencedTableName())) {
-					isValid = true;
-					break;
-				}
-				if (tableName.equals(association.getJoinTableName())) {
-					isValid = false;
-				}
-			}
-			if (isValid) {
-				result.add(tableName);
-			}
-		}
-		return result;
-	}
-	/**
-	 * Returns an <code>ORMGenTable</code> object given its name, or 
-	 * null if none.
-	 */
-	public ORMGenTable getTable(String tableName)  {
-		if (mTables == null) {
-			mTables = new java.util.HashMap<String, ORMGenTable>(mTableNames.size());
-		}
-		
-		if(mTableNames!=null && mSchema!=null){
-			for (Iterator<String> iter = mTableNames.iterator(); iter.hasNext(); ) {
-				String name = (String)iter.next();
-				Table dbTable = mSchema.getTableNamed( name );
-				if (dbTable != null) {
-					mTables.put(name, createGenTable(dbTable));
-				}
-			}
-		}
-		return (ORMGenTable)mTables.get(tableName);
-	}
-	/**
-	 * Returns the <code>Association</code> objects sorted by their "from" 
-	 * table name.
-	 */
-	public List<Association> getAssociations(){
-		return getAssociations(true/*validOnly*/);
-	}
-	/**
-	 * Adds the given association.
-	 */
-	public void addAssociation(Association association)  {
-		getAssociations(false/*validOnly*/).add(association);
-		if (mValidAssociations != null) {
-			mValidAssociations.add(association);
-		}
-		
-	}
-	/**
-	 * Deletes the given association.
-	 */
-	public void deleteAssociation(Association association)  {
-		boolean removed = getAssociations(false/*validOnly*/).remove(association);
-		assert(removed);
-		
-		if (mValidAssociations != null) {
-			removed = mValidAssociations.remove(association);
-			assert(removed);
-		}
-	}
-	/**
-	 * Returns true if an association similar to the given association 
-	 * already exists.
-	 * This is decided based only on the association tables and columns.
-	 */
-	public boolean similarAssociationExists(Association association) {
-		try {
-			for (Iterator<Association> iter = getAssociations(false/*validOnly*/).iterator(); iter.hasNext(); ) {
-				Association association2 = (Association)iter.next();
-				if (!association.getReferrerTableName().equals(association2.getReferrerTableName())
-						|| !association.getReferencedTableName().equals(association2.getReferencedTableName())
-						|| !StringUtil.equalObjects(association.getJoinTableName(), association2.getJoinTableName())
-						|| !association.getReferrerColumnNames().equals(association2.getReferrerColumnNames())
-						|| !association.getReferencedColumnNames().equals(association2.getReferencedColumnNames())
-						) {
-					continue;
-				}					
-				/*the 2 association have the same referrer, referenced and join table*/
-				if (association.getJoinTableName() == null) {
-					return true;
-				}
-				if (association.getReferrerJoinColumnNames().equals(association2.getReferrerJoinColumnNames())
-						&& association.getReferencedJoinColumnNames().equals(association2.getReferencedJoinColumnNames())) {
-					return true;
-				}
-			}
-		} catch (Exception e) {
-			return false;
-		}
-		return false;
-	}
-	/**
-	 * Creates the <code>ORMGenTable</code> instance. 
-	 */
-	public ORMGenTable createGenTable(Table dbTable) {
-		return new ORMGenTable(dbTable, this);
-	}
-	/**
-	 * Creates the <code>ORMGenColumn</code> instance.
-	 */
-	protected ORMGenColumn createGenColumn(Column dbCol) {
-		return new ORMGenColumn(dbCol, this);
-	}
-	/**
-	 * Returns true of the underlying persistence specs require the "many" side 
-	 * of an association to be the owner (like EJB3).
-	 */
-	protected boolean manySideIsAssociationOwner() {
-		return false;
-	}
-	public boolean isUpdateConfigFile() {
-		return !"false".equals(getProperty(UPDATE_CONFIG_FILE, null, null)); //defaults to true
-	}
-	public void setUpdateConfigFile(boolean value) {
-		if (value) { //default is true
-			setProperty(UPDATE_CONFIG_FILE, null, null, null); //remove it
-		} else {
-			setBooleanProperty(UPDATE_CONFIG_FILE, value, null, null);
-		}
-	}
-
-	//-----------------------------------------
-	//---- Velocity templates methods
-	//-----------------------------------------
-	/**
-	 * Returns a getter method name given a property name.
-	 */
-	public String propertyGetter(String propertyName) {
-		return "get"+StringUtil.initUpper(propertyName);
-	}
-	/**
-	 * Returns a setter method name given a property name.
-	 */
-	public String propertySetter(String propertyName) {
-		return "set"+StringUtil.initUpper(propertyName);
-	}
-	public String quote(String s) {
-		return StringUtil.quote(s, '"');
-	}
-	public String quote(boolean b) {
-		return quote(String.valueOf(b));
-	}
-	public String quote(int i) {
-		return quote(String.valueOf(i));
-	}
-	/**
-	 * Appends an annotation member name and value to an existing annotation.
-	 * 
-	 * @param s The annotation members string.
-	 *
-	 * @param memberValue The member value, if null or empty strings then 
-	 * nothing is appened.
-	 * 
-	 * @param whether to double quote the member value.
-	 */
-	public String appendAnnotation(String s, String memberName, String memberValue, boolean quote) {
-		if (memberValue == null || memberValue.length() == 0) {
-			return s;
-		}
-		StringBuffer buffer = new StringBuffer(s);
-		if (buffer.length() != 0) {
-			buffer.append(", ");
-		}
-		buffer.append(memberName);
-		buffer.append('=');
-		if (quote) {
-			buffer.append('"');
-		}
-		buffer.append(memberValue);
-		if (quote) {
-			buffer.append('"');
-		}
-		return buffer.toString();
-	}
-	public boolean isJDK1_5() {
-		return true;
-	}
-	
-	//-----------------------------------------
-	//---- private methods
-	//-----------------------------------------
-	/**
-	 * Restores the customization settings from the given 
-	 * (persisted) customizer.
-	 */
-	private void restore(ORMGenCustomizer customizer)  {
-		mTableNames = customizer.mTableNames;
-		mAssociations = customizer.mAssociations;
-		mProps = customizer.mProps;
-		if( mSchema == null )
-			return;
-		
-		/*remove invalid table names*/
-		for (int i = mTableNames.size()-1; i >= 0; --i) {
-			String tableName = (String)mTableNames.get(i);
-			if (mSchema.getTableNamed( tableName) == null) {
-				mTableNames.remove(i);
-			}
-		}
-		if( mAssociations!=null ){
-			/*restore the associations*/
-			for (Iterator<Association> iter = mAssociations.iterator(); iter.hasNext(); ) {
-				Association association = (Association)iter.next();
-				association.restore(this);
-			}
-			/*add the foreign keys associations just in case the tables changed since 
-			 * the last time the state was persisted. Pass checkExisting true so that the 
-			 * associations restored above are not overwritten.*/
-			addForeignKeyAssociations(true/*checkExisting*/);
-		}
-	}
-	/**
-	 * Returns the key in mProps corresponding to the specified 
-	 * propertyName, table and column.
-	 */
-	private String getPropKey(String propertyName, String tableName, String colName) {
-		if (tableName == null) {
-			tableName = NULL_TABLE;
-		}
-		if (colName == null) {
-			colName = NULL_COLUMN;
-		}
-		return tableName + '.' + colName + '.' + propertyName;
-	}
-	/**
-	 * Returns the associations that are valid for the 
-	 * current tables.
-	 */
-	private List<Association> getAssociations(boolean validOnly){
-		if (mAssociations == null) {
-			mAssociations = new java.util.ArrayList<Association>();
-			
-			addForeignKeyAssociations(false/*checkExisting*/);
-		} else if (mInvalidForeignAssociations) {
-			mInvalidForeignAssociations = false;
-			
-			addForeignKeyAssociations(true/*checkExisting*/);
-		}
-		List<Association> associations;
-		if (validOnly) {
-			if (mValidAssociations == null) {
-				/*filter out the invalid associations*/
-				mValidAssociations = new ArrayList<Association>(mAssociations.size());
-				for (int i = 0, n = mAssociations.size(); i < n; ++i) {
-					Association association = (Association)mAssociations.get(i);
-					if (association.isValid()) {
-						mValidAssociations.add(association);
-					}
-				}
-			}
-			associations = mValidAssociations;
-		} else {
-			associations = mAssociations;
-		}
-		return associations;
-	}
-	private void addForeignKeyAssociations(boolean checkExisting) {
-		List<String> tableNames = getTableNames();
-		for (Iterator<String> iter = tableNames.iterator(); iter.hasNext(); ) {
-			ORMGenTable table = getTable((String)iter.next());
-			addForeignKeyAssociations(table, checkExisting);
-		}
-	}
-	private void addForeignKeyAssociations(ORMGenTable table, boolean checkExisting) {
-		if(table==null)
-			return;
-		
-		
-		List<ForeignKeyInfo> fKeys = null;
-		
-		try{
-			fKeys = DTPUtil.getForeignKeys(table.getDbTable());
-		}catch(Exception ise){
-			//workaround Dali bug for now
-			return;
-		}
-		
-		if( fKeys.size()==0 )
-			return;
-		
-		List<Association> addedAssociations = new java.util.ArrayList<Association>();
-		for (Iterator<ForeignKeyInfo> iter = fKeys.iterator(); iter.hasNext(); ) {
-			ForeignKeyInfo fki = (ForeignKeyInfo)iter.next();
-			ORMGenTable referencedTable = getTable(fki.getReferencedTableName());
-			if (referencedTable == null) {
-				continue;
-			}
-			Association association = new Association(this, table.getName(), fki.getReferrerColumnNames()
-						, referencedTable.getName(), fki.getReferencedColumnNames());
-			association.computeCardinality();
-			//Defer the check of similarAssociationExists after computeManyToMany()
-			//otherwise the MTM association will not computed correctly in some cases.
-			//if (checkExisting && similarAssociationExists(association)) {
-			//	continue;
-			//}
-			addedAssociations.add(association);
-		}
-		
-		Association m2m = computeManyToMany(table, addedAssociations);
-		if (m2m != null) {
-			/*do not generate the 2 many-to-one*/
-			for (int i = 0; i < addedAssociations.size(); ++i) {
-				Association association = (Association)addedAssociations.get(i);
-				association.setGenerated(false);
-			}
-			addedAssociations.add(0, m2m);
-		}
-		//remove the association if already existing
-		Iterator<Association> it =  addedAssociations.iterator(); 
-		while( it.hasNext() ){
-			Association newAssociation = it.next();
-			for( Association association : mAssociations ){
-				if( newAssociation.equals( association )){
-					//If the association is existing, don't add.
-					//only copy the generated flag
-					association.setGenerated( newAssociation.isGenerated() );
-					it.remove();
-				}
-			}
-		}
-		mAssociations.addAll(addedAssociations);
-	}
-	private Association computeManyToMany(ORMGenTable table, List<Association> addedAssociations) {
-		/*many-to-many associations if:
-		 * -addedAssociations contains 2 many-to-one associations to 2 different tables t1 and t2.
-		 * -<code>table</code> contains only the primary key columns.
-		 * -the primary key of <code>table</code> is the concatenation of its foreign 
-		 * 	keys to t1 and t2.*/
-		
-		if (addedAssociations.size() != 2) {
-			return null;
-		}
-		
-		//Assume MTM table should have only two columns that are foreign keys
-		if( table.getColumns().size() != 2 ){
-			return null;
-		}
-		
-		Association assoc1 = (Association)addedAssociations.get(0);
-		Association assoc2 = (Association)addedAssociations.get(1);
-		if (assoc1.getCardinality() != Association.MANY_TO_ONE
-				|| assoc2.getCardinality() != Association.MANY_TO_ONE) {
-			return null;
-		}
-		ORMGenTable t1 = assoc1.getReferencedTable();
-		ORMGenTable t2 = assoc2.getReferencedTable();
-
-//Commented out because the assumption is too restrictive: 
-//this check will prevent generating table MTM to itself		
-//		if (t1.getName().equals(t2.getName()) || 
-//				t1.getName().equals(table.getName()) || t2.getName().equals(table.getName())) {
-		if( t1.getName().equals(table.getName()) || t2.getName().equals(table.getName()) ) {
-			return null;
-		}
-		
-//Commented out because the assumption is too restrictive: 
-//this check will prevent generating MTM mapping table not having 
-//primary key defined 		
-//		List pkNames = DTPUtil.getPrimaryKeyColumnNames(table.getDbTable());
-//		if (pkNames.size() != table.getColumnNames().size()) {
-//			return null;
-//		}
-//		List fkNames = new java.util.ArrayList(assoc1.getReferrerColumnNames()); //clone because we modify by addAll below
-//		fkNames.addAll(assoc2.getReferrerColumnNames());
-//		if (!CollectionUtil.equalsIgnoreOrder(pkNames, fkNames)) {
-//			return null;
-//		}
-		Association m2m = new Association(this, t1.getName()/*referrerTableName*/, assoc1.getReferencedColumnNames()/*referrerColNames*/
-				, t2.getName()/*referencedTableName*/, assoc2.getReferencedColumnNames()/*referencedColNames*/
-				, table.getName(), assoc1.getReferrerColumnNames()/*referrerJoinColNames*/, assoc2.getReferrerColumnNames()/*referencedJoinColNames*/);
-		m2m.setCustom(false);
-		return m2m;
-	}
-
-	//---------------------------------------------------
-	//---- FileHeader class -----------------------------
-	//---------------------------------------------------
-	/**
-	 * The header of the customization file.
-	 */
-	private static class FileHeader implements java.io.Serializable
-	{
-		private static final long serialVersionUID = 1L;
-		/**
-		 * Should be argument-less because it is used in 
-		 * the de-serialization process.
-		 */
-		public FileHeader() {
-			mVersion = FILE_VERSION;
-		}
-		int mVersion;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ORMGenTable.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ORMGenTable.java
deleted file mode 100644
index 11ab29a29a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ORMGenTable.java
+++ /dev/null
@@ -1,828 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal2;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.gen.internal2.util.DTPUtil;
-import org.eclipse.jpt.gen.internal2.util.StringUtil;
-import org.eclipse.jpt.utility.JavaType;
-
-/**
- * Represents the ORM generation properties for a database 
- * table.
- * 
- * <p>This is designed to be created/changed by the generation wizard,
- * and generated using Velocity templates.
- * The modified properties (if any) are persisted/retrieved using 
- * <code>ORMGenCustomizer</code>.
- * 
- */
-public class ORMGenTable
-{
-	private ORMGenCustomizer mCustomizer;
-	private List<ORMGenColumn> mColumns;
-	private Table mDbTable;
-	
-	/**
-	 * @param table The database table or null if this table is used 
-	 * to get/set the default table properties (properties that apply to all tables unless overriden).
-	 */
-	public ORMGenTable(Table table, ORMGenCustomizer customizer) {
-		super();
-		
-		mDbTable = table;
-		mCustomizer = customizer;
-	}
-	public ORMGenCustomizer getCustomizer() {
-		return mCustomizer;
-	}
-	/**
-	 * Returns true if this table is is used to get/set the default 
-	 * table properties.
-	 */
-	public boolean isDefaultsTable() {
-		return mDbTable == null;
-	}
-	
-	protected String customized(String propName) {
-		return getCustomizer().getProperty(propName, getName(), null);
-	}
-	protected boolean customizedBoolean(String propName) {
-		return getCustomizer().getBooleanProperty(propName, getName(), null);
-	}
-	protected void setCustomized(String propName, String value) {
-		if (value != null && value.length() == 0) {
-			value = null;
-		}
-		getCustomizer().setProperty(propName, value, getName(), null);
-	}
-	protected void setCustomizedBoolean(String propName, boolean value, boolean defaultValue) {
-		if (defaultValue == value) {
-			setCustomized(propName, null); //remove the property
-		} else {
-			getCustomizer().setBooleanProperty(propName, value, getName(), null);
-		}
-	}
-	public Table getDbTable() {
-		return mDbTable;
-	}
-	/**
-	 * Returns the table name.
-	 */
-	public String getName() {
-		if( mDbTable == null )
-			return ORMGenCustomizer.ANY_TABLE;
-		String annotationName = this.mCustomizer.getDatabaseAnnotationNameBuilder().
-			buildTableAnnotationName(mDbTable.getName(), mDbTable);
-		return annotationName != null ? annotationName : mDbTable.getName();
-	}
-	
-	public String getJoinTableAnnotationName(){
-		if( mDbTable == null )
-			return ORMGenCustomizer.ANY_TABLE;
-		String annotationName = this.mCustomizer.getDatabaseAnnotationNameBuilder().
-			buildJoinTableAnnotationName( mDbTable);
-		return annotationName != null ? annotationName : mDbTable.getName();
-	}
-	
-	/**
-	 * Returns the database schema containing the table.
-	 */
-	public String getSchema() {
-		if( DTPUtil.isDefaultSchema( mDbTable ))
-			return "";
-		String schemaName = mDbTable.getSchema().getName();
-		
-		return schemaName;
-	}
-	/**
-	 * Sets the package for the generated class (empty string for the default package)
-	 */
-	public void setPackage(String srcFolder, String pkg) {
-		setCustomized(SRC_FOLDER, srcFolder);
-		
-		getCustomizer().setProperty(PACKAGE, pkg, getName(), null); //not calling setCustomized so that empty strings do not get nulled out.
-	}
-	/**
-	 * Returns the Java package (empty string for the default package).
-	 */
-	public String getPackage() {
-		return customized(PACKAGE);
-	}
-
-	/**
-	 * Returns the generated Java class name (not qualified).
-	 */
-	public String getClassName() {
-		String name = customized(CLASS_NAME);
-		if (name == null) {
-			name = StringUtil.tableNameToVarName(getName());
-			name = StringUtil.initUpper(name);
-			name = StringUtil.singularise(name);
-		}
-		return name;
-	}
-	public void setClassName(String className) {
-		/*if the class name is the same as the (possibly computed) class name 
-		 * then nothing to do*/
-		if (!StringUtil.equalObjects(className, getClassName())) {
-			setCustomized(CLASS_NAME, className);
-		}
-	}
-	/**
-	 * Returns a name suitable to be used as a variable or class name.
-	 * This is computed based on the table name.
-	 * 
-	 * @param singular Whether the name should be singular or plural.
-	 */
-	public String getVarName(boolean singular) {
-		String name = StringUtil.tableNameToVarName(getName());
-		if (singular) {
-			name = StringUtil.singularise(name);
-		} else {
-			name = StringUtil.pluralise(name);
-		}
-		return name;
-	}
-	/**
-	 * Returns the fully qualified generated Java class name.
-	 */
-	public String getQualifiedClassName() {
-		return qualify(getClassName());
-	}
-	/**
-	 * Returns the composite key Java class name (not qualified).
-	 */
-	public String getCompositeKeyClassName() {
-		String name = customized(COMPOSITE_KEY_CLASS_NAME);
-		if (name == null) {
-			name = getClassName() + "PK";
-		}
-		return name;
-	}
-	/**
-	 * Returns the fully qualified composite key Java class name.
-	 */
-	public String getQualifiedCompositeKeyClassName() {
-		return qualify(getCompositeKeyClassName());
-	}
-	/**
-	 * Returns the composite key property name.
-	 */
-	public String getCompositeKeyPropertyName() {
-		return "compId";
-	}
-	/**
-	 * Returns the <code>ORMGenColumn</code> objects to be 
-	 * generated for this table.
-	 */
-	public List<ORMGenColumn> getColumns() {
-		if (mColumns == null) {
-			mColumns = new ArrayList<ORMGenColumn>(); 
-			Iterator<Column> cols = mDbTable.columns();
-			while (cols.hasNext() ) {
-				Column c = cols.next();
-				ORMGenColumn genColumn = getCustomizer().createGenColumn( c );
-				mColumns.add( genColumn );
-			}
-		}
-		return mColumns;
-	}
-	public List<String> getColumnNames() {
-		Iterator<Column> cols = mDbTable.columns();
-		List<String> ret = new ArrayList<String>();
-		while (cols.hasNext() ) {
-			Column c = cols.next(); 
-			ret.add(c.getName());
-		}
-		return ret;
-	}
-	/**
-	 * Returns the <code>ORMGenColumn</code> objects representing 
-	 * the table's primary key.
-	 */
-	public List<ORMGenColumn> getPrimaryKeyColumns()  {
-		List<Column> dbCols = DTPUtil.getPrimaryKeyColumns( mDbTable);
-		List<ORMGenColumn> ret = new ArrayList<ORMGenColumn>();
-		for(Column dbCol : dbCols ){
-			ret.add(new ORMGenColumn(dbCol, this.mCustomizer));
-		}
-		return ret;
-	}
-	/**
-	 * Returns the primary key column or null if there is 
-	 * no or many primary key columns.
-	 */
-	public ORMGenColumn getPrimaryKeyColumn() {
-		ORMGenColumn pkCol = null;
-		List<ORMGenColumn> pkColumns = getPrimaryKeyColumns();
-		if (pkColumns.size() == 1) {
-			//Column dbCol = (Column)pkColumns.get(0);
-			pkCol = pkColumns.get(0); //(ORMGenColumn) mCustomizer.createGenColumn(dbCol);
-		} else {
-			/*if no pk column then look for the first column with id 
-			 * mapping kind. This is so that the wizard can be used with tables 
-			 * not having primary keys. */
-			List<ORMGenColumn> columns = getColumns();
-			for (int i = 0, n = columns.size(); i < n; ++i) {
-				ORMGenColumn column = (ORMGenColumn)columns.get(i);
-				if (column.getMappingKind().equals(mCustomizer.getIdMappingKind())) {
-					pkCol = column;
-					break;
-				}
-			}	
-		}
-		return pkCol;
-	}
-	/**
-	 * Returns true if there is more than 1 pk column.
-	 */
-	public boolean isCompositeKey() {
-		return DTPUtil.getPrimaryKeyColumnNames( mDbTable ).size() > 1;
-	}
-	/**
-	 * Returns the <code>ORMGenColumn</code> objects for the 
-	 * the columns that are not part of any association.
-	 * 
-	 * @param genOnly Whether to include only the columns marked for generation.
-	 * 
-	 * @param includePk Whether to include the primary kley column(s).
-	 * 
-	 * @param includeInherited Whether to include the columns associated 
-	 * with Java properties that exist in the super class (if any).
-	 */
-	public List<ORMGenColumn> getSimpleColumns(boolean genOnly, boolean includePk, boolean includeInherited){
-		List<ORMGenColumn> result = new java.util.ArrayList<ORMGenColumn>();
-		
-		List<ORMGenColumn> columns = getColumns();
-		List<AssociationRole> roles = getAssociationRoles();
-		for (int i = 0, n = columns.size(); i < n; ++i) {
-			ORMGenColumn column = (ORMGenColumn)columns.get(i);
-			if (genOnly && !column.isGenerated()) {
-				continue;
-			}
-			if (column.isPrimaryKey()) {
-				if (!includePk || isCompositeKey()) {
-					continue;
-				}
-			} else if (isColumnInAsscociation(column, roles)) {
-				continue;
-			}
-			
-			result.add(column);
-		}
-		return result;
-		
-	}
-	public List<ORMGenColumn> getSimpleColumns() {
-		return getSimpleColumns(true/*genOnly*/, true/*includePk*/, true/*includeInherited*/);
-	}
-	/**
-	 * Returns false if the given column should be generated with 
-	 * false updatable/insertable.
-	 * This is the case when the column is mapped more than once, this 
-	 * usually happen with columns in composite keys and many-to-one 
-	 * associations.
-	 * 
-	 * <br>Note that for Hibernate the column param is null because 
-	 * the insert/update attributes are specified for the many-to-one tag itself 
-	 * instead of the nested column tags (bogus obviously).
-	 */
-	public boolean isColumnUpdateInsert(AssociationRole role, ORMGenColumn column)  {
-		if (column == null) {
-			for (Iterator<ORMGenColumn> iter = role.getReferrerColumns().iterator(); iter.hasNext(); ) {
-				ORMGenColumn c = (ORMGenColumn)iter.next();
-				if (!isColumnUpdateInsert(role, c)) {
-					return false;
-				}
-			}
-			return true;
-		}
-		
-		if (column.isPrimaryKey()) {
-			return false;
-		}
-		/*should look if there are multiple associations using the same column 
-		 * and return false, but this is probably an unusual case.*/
-		
-		return true;
-	}
-	/**
-	 * Returns the <code>ORMGenColumn</code> objects corresponding 
-	 * to the given column names.
-	 */
-	public List<ORMGenColumn> getColumnsByNames(List<String> names){
-		List<ORMGenColumn> result = new java.util.ArrayList<ORMGenColumn>();
-		for( String name :  names  ){
-			ORMGenColumn column = getColumnByName(name);
-			assert(column != null);
-			if (column != null) {
-				result.add(column);
-			}
-		}
-		return result;
-	}
-	/**
-	 * Returns the columns having the given name, or null if none.
-	 */
-	public ORMGenColumn getColumnByName(String name) {
-		List<ORMGenColumn> columns = getColumns();
-		for (int i = 0, n = columns.size(); i < n; ++i) {
-			ORMGenColumn column = (ORMGenColumn)columns.get(i);
-			if (column.getName().equals(name)) {
-				return column;
-			}
-		}
-		return null;
-	}
-	/**
-	 * Returns the <code>AssociationRole</code> objects for this table.
-	 * Only the association marked for generation are returned.
-	 */
-	public List<AssociationRole> getAssociationRoles(){
-		/*this is not cached intentionally because invalidating the 
-		 * cache with wizard changes is kinda tricky.*/
-		List<AssociationRole> associationRoles = new ArrayList<AssociationRole>();
-		
-		String name = getName();
-		List<Association> associations = mCustomizer.getAssociations();
-		for (Iterator<Association> iter = associations.iterator(); iter.hasNext(); ) {
-			Association association = (Association)iter.next();
-			if (!association.isGenerated()) {
-				continue;
-			}
-			/*check both referrer *and* referenced because an association could be 
-			 * from-to the same table (employee/manager)*/
-			if (association.getReferrerTable().getName().equals(name)) {
-				AssociationRole role = association.getReferrerRole();
-				if (role != null) {
-					associationRoles.add(role);
-				}
-			}
-			if (association.getReferencedTable().getName().equals(name)) {
-				AssociationRole role = association.getReferencedRole();
-				if (role != null) {
-					associationRoles.add(role);
-				}
-			}
-		}
-		return associationRoles;
-	}
-	public String getClassDescription() {
-		return customized(CLASS_DESC);
-	}
-	/**
-	 * Returns the generated class scope, one of {@link #PUBLIC_SCOPE}|{@link #PROTECTED_SCOPE}
-	 * |{@link #PRIVATE_SCOPE}.
-	 * This method never returns null (defaults to public).
-	 */
-	public String getClassScope() {
-		String scope = customized(CLASS_SCOPE);
-		if (scope == null) {
-			scope = PUBLIC_SCOPE;
-		}
-		return scope;
-	}
-	public String getExtends() {
-		return customized(EXTENDS);
-	}
-	public void setExtends(String baseClass) {
-		setCustomized(EXTENDS, baseClass);
-	}
-	public List<String> getImplements() {
-		String str = customized(IMPLEMENTS);
-		List<String> result = StringUtil.strToList(str, ',', true/*trim*/);
-		if (result == null) {
-			result = Collections.emptyList();
-		}
-		return result;
-	}
-	public void setImplements(List<String> interfaces) {
-		setCustomized(IMPLEMENTS, StringUtil.listToStr(interfaces, ','));
-	}
-	/**
-	 * Returns the string that should be generated in the Java class 
-	 * for extends and implements.
-	 */
-	public String generateExtendsImplements() {
-		StringBuffer buffer = new StringBuffer();
-		
-		String extendsClass = getExtends();
-		if (extendsClass != null && !extendsClass.equals("java.lang.Object") && !extendsClass.equals("Object")) {
-			buffer.append("extends " + simplifyClassName(extendsClass));
-		}
-		
-		buffer.append(" implements Serializable"); //assuming that the Java file template imports the java.io.Serializable
-		
-		for (Iterator<String> iter = getImplements().iterator(); iter.hasNext(); ) {
-			buffer.append(", " + simplifyClassName((String)iter.next())); 
-		}
-		
-		return buffer.toString();
-	}
-	private String simplifyClassName(String fullClassName) {
-		final String JAVA_LANG = "java.lang.";
-		if (fullClassName.startsWith(JAVA_LANG)) {
-			return fullClassName.substring(JAVA_LANG.length());
-		}
-		String pkg = StringUtil.getPackageName(fullClassName);
-		if (pkg != null && StringUtil.equalObjects(pkg, getPackage())) {
-			 return StringUtil.getClassName(fullClassName);
-		}
-		return fullClassName;
-	}
-	/**
-	 * Returns the id generator scheme (assigned, sequence, etc).
-	 * Does not return null, defaults to "assigned" or "identity" depending on whether 
-	 * the table has an identity column.
-	 */
-	public String getIdGenerator()  {
-		String generator = customized(ID_GENERATOR);
-		String noneGenerator = getCustomizer().getNoIdGenerator();
-		if (!isDefaultsTable()) {
-			/*This is done mainly because there might be cases where some tables have autoinctement pk 
-			 * and others are assigned. In this case this makes it so that it is possible to have 
-			 * a "none" default value that is interpreted depending on the case. */
-			if (generator == null || generator.equals(noneGenerator)) {
-				ORMGenColumn pkColumn = getPrimaryKeyColumn();
-				if (pkColumn != null && DTPUtil.isAutoIncrement( pkColumn.getDbColumn() )) {
-					generator = getCustomizer().getIdentityIdGenerator();
-				}
-			}
-		}
-		if (generator == null) {
-			generator = noneGenerator;
-		}
-		return generator;
-	}
-	/**
-	 * Changes the id generator scheme (assigned, sequence, etc).
-	 */
-	public void setIdGenerator(String scheme) {
-		setCustomized(ID_GENERATOR, scheme);
-	}
-	/**
-	 * Returns the sequence name for the given table, or null if none (makes
-	 * sense only when the scheme is native, sequence, ..).
-	 */
-	public String getSequence() {
-		return customized(SEQUENCE);
-	}
-	public void setSeqence(String name) {
-		setCustomized(SEQUENCE, name);
-	}
-	/**
-	 * Returns the sequence name after replacing the ${table} and ${pk} 
-	 * by their values, or null if none.
-	 */
-	public String getFormattedSequence()  {
-		String sequence = getSequence();
-		if (sequence != null) {
-			/*resolve the ${table} and ${pk} patterns*/
-			sequence = StringUtil.strReplace(sequence, TABLE_SEQ_PATTERN, getName());
-			
-			if (sequence.indexOf(PK_SEQ_PATTERN) >= 0) {
-				 List<String> pkNames = DTPUtil.getPrimaryKeyColumnNames( getDbTable() );
-				 String pkName = null;
-				 if (pkNames.size()>0 ) {
-				 	pkName = (String)pkNames.get(0);
-				 }
-				 sequence = StringUtil.strReplace(sequence, PK_SEQ_PATTERN, pkName);
-			}
-		}
-		return sequence!=null?sequence.toUpperCase():"";
-	}
-	public boolean isImplementEquals() {
-		return !"true".equals(customized(IMPLEMENT_EQUALS)); //defaults to false
-	}
-	public void setImplementEquals(boolean value) {
-		setCustomizedBoolean(IMPLEMENT_EQUALS, value, true);
-	}
-	
-	/**
-	 * Returns true if there is any column participating in equals/hashcode.
-	 */
-	public boolean hasColumnsInEquals()  {
-		List<ORMGenColumn> columns = getSimpleColumns();
-		for (int i = 0, n = columns.size(); i < n; ++i) {
-			ORMGenColumn column = (ORMGenColumn)columns.get(i);
-			if (column.isUseInEquals()) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Returns {@link #GENERATE_DDL_ANNOTATION}  indicating whether
-	 * the optional DDL parameters like length, nullable, unqiue, etc should be generated 
-	 * in @Column annotation.
-	 * defaults to false.
-	 */
-	public boolean isGenerateDDLAnnotations() {
-		return "true".equals(customized(GENERATE_DDL_ANNOTATION)); //defaults to false
-	}
-	
-	public void setGenerateDDLAnnotations(boolean generate) {
-		setCustomizedBoolean(GENERATE_DDL_ANNOTATION, generate, false);		
-	}
-
-	/**
-	 * Returns one of {@link #PROPERTY_ACCESS}|{@link #FIELD_ACCESS} indicating how 
-	 * the entity properties are mapped.
-	 * Does not return null (defaults to {@link #FIELD_ACCESS}).
-	 */
-	public String getAccess() {
-		String name = customized(ACCESS);
-		if (name == null) {
-			name = FIELD_ACCESS;
-		}
-		return name;
-	}
-	public void setAccess(String access) {
-		assert(access == null || access.equals(PROPERTY_ACCESS) || access.equals(FIELD_ACCESS));
-		if (!StringUtil.equalObjects(access, getAccess())) {
-			setCustomized(ACCESS, access);
-		}
-	}
-	/**
-	 * Returns one of {@link #LAZY_FETCH}|{@link #EAGER_FETCH} indicating how 
-	 * the table associations are feched.
-	 * Returns null if the provider defaults should be used.
-	 */
-	public String getDefaultFetch() {
-		return customized(DEFAULT_FETCH);
-	}
-	public void setDefaultFetch(String fetch) {
-		assert(fetch == null || fetch.equals(LAZY_FETCH) || fetch.equals(EAGER_FETCH));
-		setCustomized(DEFAULT_FETCH, fetch);
-	}
-	public String[] getSupportedCollectionTypes() {
-		return new String[] {SET_COLLECTION_TYPE, LIST_COLLECTION_TYPE};
-	}
-	/**
-	 * Returns one of {@link #LIST_COLLECTION_TYPE}|{@link #SET_COLLECTION_TYPE} indicating  
-	 * the Java type (full class name) used for properties of collection types.
-	 * This does not return null (defaults to list).
-	 */
-	public String getDefaultCollectionType() {
-		String cType = customized(DEFAULT_COLLECTION_TYPE);
-		if (cType == null) {
-			cType = SET_COLLECTION_TYPE;
-		}
-		return cType;
-	}
-	public void setDefaultCollectionType(String cType) {
-		assert(cType.equals(LIST_COLLECTION_TYPE) || cType.equals(SET_COLLECTION_TYPE));
-		setCustomized(DEFAULT_COLLECTION_TYPE, cType);
-	}
-	/**
-	 * Returns true if the primary key is compound and any of its 
-	 * columns should be included in the <code>equals</code> method 
-	 * implementation.
-	 */
-	public boolean isCompoundKeyUseInEquals()  {
-		if (isCompositeKey()) {
-			for (Iterator<ORMGenColumn> iter = getPrimaryKeyColumns().iterator(); iter.hasNext();) {
-				ORMGenColumn column = (ORMGenColumn) iter.next();
-				if (column.isUseInEquals()) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-	public boolean isRoleUseInEquals(AssociationRole role)  {
-		for (Iterator<ORMGenColumn> iter = role.getReferrerColumns().iterator(); iter.hasNext();) {
-			ORMGenColumn column = (ORMGenColumn) iter.next();
-			if (column.isUseInEquals()) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	
-	/**
-	 * Return true if the values of name element in the @Table is default
-	 * so we can skip generating the annotation
-	 * 
-	 * @return true
-	 */
-	public boolean isDefaultname(){
-		String className = this.getClassName();
-		String tableName = this.getDbTable().getName();
-		return className.equalsIgnoreCase( tableName) ;
-	}
-	
-	/**
-	 * Qualifies a class name if there is a package.
-	 */
-	private String qualify(String className) {
-		String pkg = getPackage();
-		if (pkg != null && pkg.length() != 0) {
-			className = pkg + '.' + className;
-		}
-		return className;
-	}
-	/**
-	 * Returns true if the given column is part of any association.
-	 */
-	private boolean isColumnInAsscociation(ORMGenColumn column, List<AssociationRole> roles) {
-		for (int i = 0, n = roles.size(); i < n; ++i) {
-			AssociationRole role = (AssociationRole)roles.get(i);
-			List<ORMGenColumn> cols = role.getReferrerColumns();
-			for( ORMGenColumn col : cols ){
-				if (col.getName().equals( column.getName() )) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Print the clause to be used in the generated equals() method
-	 * @return String
-	 */
-	public String getPrimaryKeyEqualsClause() {
-		StringBuilder buf = new StringBuilder();
-		Iterator<ORMGenColumn> columns = this.getPrimaryKeyColumns().iterator();
-		while (columns.hasNext()) {
-			this.printPrimaryKeyEqualsClauseOn(columns.next(), buf);
-			if (columns.hasNext()) {
-				buf.append("\n");
-				buf.append("\t\t\t");
-				buf.append("&& ");
-			}
-		}
-		buf.append(";");
-		return buf.toString();
-	}
-	
-	private void printPrimaryKeyEqualsClauseOn(ORMGenColumn column, StringBuilder buf) {
-		String fieldName = column.getPropertyName();
-		JavaType javaType = column.getDbColumn().getPrimaryKeyJavaType();
-		if (javaType.isPrimitive()) {
-			this.printPrimitiveEqualsClauseOn(fieldName, buf);
-		} else {
-			this.printReferenceEqualsClauseOn(fieldName, buf);
-		}
-	}
-
-	private void printPrimitiveEqualsClauseOn(String fieldName, StringBuilder buf)  {
-		buf.append("(this.");
-		buf.append(fieldName);
-		buf.append(" == castOther.");
-		buf.append(fieldName);
-		buf.append(')');
-	}
-
-	private void printReferenceEqualsClauseOn(String fieldName, StringBuilder buf)  {
-		buf.append("this.");
-		buf.append(fieldName);
-		buf.append(".equals(castOther.");
-		buf.append(fieldName);
-		buf.append(')');
-	}
-	
-	/**
-	 * Print the clause to be used in the generated hasCode() method
-	 * @return String
-	 */
-	public String getPrimaryKeyHashCodeClause() {
-		StringBuilder buf = new StringBuilder();
-		Iterator<ORMGenColumn> columns = this.getPrimaryKeyColumns().iterator();
-		while (columns.hasNext()) {
-			buf.append("hash = hash * prime + ");
-			this.printPrimaryKeyHashCodeClauseOn(columns.next(), buf);
-			buf.append(';');
-			buf.append('\n');
-			buf.append("\t\t");
-		}
-		return buf.toString();
-	}
-	
-	private void printPrimaryKeyHashCodeClauseOn(ORMGenColumn column, StringBuilder buf) {
-		String fieldName = column.getPropertyName();
-		JavaType javaType = column.getDbColumn().getPrimaryKeyJavaType();
-		if (javaType.isPrimitive()) {
-			this.printPrimitiveHashCodeClauseOn(javaType.getElementTypeName(), fieldName, buf);
-		} else {
-			this.printReferenceHashCodeClauseOn(fieldName, buf);
-		}
-	}	
-	
-	private void printPrimitiveHashCodeClauseOn(String primitiveName, String fieldName, StringBuilder buf) {
-		if (primitiveName.equals("int")) {
-			// this.value
-			buf.append("this.");
-			buf.append(fieldName);
-		} else if (primitiveName.equals("short") || primitiveName.equals("byte") || primitiveName.equals("char")) {  // explicit cast
-			// ((int) this.value)
-			buf.append("((int) this.");
-			buf.append(fieldName);
-			buf.append(')');
-		} else if (primitiveName.equals("long")) {  // cribbed from Long#hashCode()
-			// ((int) (this.value ^ (this.value >>> 32)))
-			buf.append("((int) (this.");
-			buf.append(fieldName);
-			buf.append(" ^ (this.");
-			buf.append(fieldName);
-			buf.append(" >>> 32)))");
-		} else if (primitiveName.equals("float")) {  // cribbed from Float#hashCode()
-			// java.lang.Float.floatToIntBits(this.value)
-			buf.append("java.lang.Float");
-			buf.append(".floatToIntBits(this.");
-			buf.append(fieldName);
-			buf.append(')');
-		} else if (primitiveName.equals("double")) {  // cribbed from Double#hashCode()
-			//	((int) (java.lang.Double.doubleToLongBits(this.value) ^ (java.lang.Double.doubleToLongBits(this.value) >>> 32)))
-			buf.append("((int) (");
-			buf.append("java.lang.Double");
-			buf.append(".doubleToLongBits(this.");
-			buf.append(fieldName);
-			buf.append(") ^ (");
-			buf.append("java.lang.Double");
-			buf.append(".doubleToLongBits(this.");
-			buf.append(fieldName);
-			buf.append(") >>> 32)))");
-		} else if (primitiveName.equals("boolean")) {
-			// (this.value ? 1 : 0)
-			buf.append("(this.");
-			buf.append(fieldName);
-			buf.append(" ? 1 : 0)");
-		} else {
-			throw new IllegalArgumentException(primitiveName);
-		}
-	}
-
-	private void printReferenceHashCodeClauseOn(String fieldName, StringBuilder buf)  {
-		buf.append("this.");
-		buf.append(fieldName);
-		buf.append(".hashCode()");
-	}
-	
-	public String toString(){
-		return "name="+ this.getName() + "; columns=" + Arrays.toString( this.getColumnNames().toArray()) ;
-	}
-	
-	/*class scopes*/
-	public static final String PUBLIC_SCOPE = "public";
-	public static final String PROTECTED_SCOPE = "protected";
-	public static final String PRIVATE_SCOPE = "private";
-	
-	/*access constants. Note that these strings are used in the ui*/
-	public static final String PROPERTY_ACCESS = "property";
-	public static final String FIELD_ACCESS = "field";
-	
-	/*default fech constants. Note that these strings are used in the gen velocity templates.*/
-	public static final String LAZY_FETCH = "lazy";
-	public static final String EAGER_FETCH = "eager";
-	
-	/*default collection type constants. Note that these strings are used in the gen velocity templates.*/
-	public static final String LIST_COLLECTION_TYPE = "java.util.List";
-	public static final String SET_COLLECTION_TYPE = "java.util.Set";
-	
-	/**
-	 * The pattern replaced by the table name in the id generator 
-	 * sequence name param.
-	 */
-	public static final String TABLE_SEQ_PATTERN = "$table";
-	/**
-	 * The pattern replaced by the primary key in the id generator 
-	 * sequence name param.
-	 */
-	public static final String PK_SEQ_PATTERN = "$pk";
-
-	/*customization properties*/
-	private static final String PACKAGE = "package";
-	private static final String SRC_FOLDER = "srcFolder";
-	private static final String CLASS_NAME = "className";
-	private static final String CLASS_DESC = "classDesc";
-	private static final String CLASS_SCOPE = "classScope";
-	private static final String EXTENDS = "extends";
-	private static final String IMPLEMENTS = "implements";
-	private static final String ID_GENERATOR = "idGenerator";
-	private static final String SEQUENCE = "sequence";
-	private static final String COMPOSITE_KEY_CLASS_NAME = "compositeKeyClassName";
-	private static final String IMPLEMENT_EQUALS = "implementEquals";
-	private static final String GENERATE_DDL_ANNOTATION = "generateDDLAnnotations";
-	private static final String ACCESS = "access";
-	static final String DEFAULT_FETCH = "defaultFetch";
-	private static final String DEFAULT_COLLECTION_TYPE = "defaultCollectionType";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/OverwriteConfirmer.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/OverwriteConfirmer.java
deleted file mode 100644
index 105174c4d7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/OverwriteConfirmer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.jpt.gen.internal2;
-
-public interface OverwriteConfirmer {
-	/**
-	 * Return whether the entity generator should overwrite the specified
-	 * file.
-	 */
-	boolean overwrite(String className);
-
-
-	final class Always implements OverwriteConfirmer {
-		public static final OverwriteConfirmer INSTANCE = new Always();
-		public static OverwriteConfirmer instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Always() {
-			super();
-		}
-		// everything will be overwritten
-		public boolean overwrite(String arg0) {
-			return true;
-		}
-		@Override
-		public String toString() {
-			return "OverwriteConfirmer.Always";  //$NON-NLS-1$
-		}
-	}
-
-
-	final class Never implements OverwriteConfirmer {
-		public static final OverwriteConfirmer INSTANCE = new Never();
-		public static OverwriteConfirmer instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Never() {
-			super();
-		}
-		// nothing will be overwritten
-		public boolean overwrite(String arg0) {
-			return false;
-		}
-		@Override
-		public String toString() {
-			return "OverwriteConfirmer.Never";  //$NON-NLS-1$
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/PackageGenerator2.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/PackageGenerator2.java
deleted file mode 100644
index 3b85b09fd0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/PackageGenerator2.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.gen.internal2;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-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.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jpt.gen.internal2.util.CompilationUnitModifier;
-import org.eclipse.jpt.gen.internal2.util.FileUtil;
-import org.eclipse.jpt.gen.internal2.util.UrlUtil;
-import org.eclipse.osgi.util.NLS;
-import org.osgi.framework.Bundle;
-
-/**
- * This generator will generate a package of entities for a set of tables.
- */
-public class PackageGenerator2 { 
-
-	private IJavaProject javaProject;
-	private ORMGenCustomizer customizer ; 
-
-	/**
-	 * @param customizer
-	 * @param synchronizePersistenceXml
-	 * @param copyJdbcDrive
-	 * @throws Exception 
-	 */
-	static public void generate(IJavaProject jpaProject, ORMGenCustomizer customizer, IProgressMonitor monitor ) throws CoreException {
-		PackageGenerator2 generator = new PackageGenerator2();
-		generator.setProject(jpaProject);
-		generator.setCustomizer(customizer);
-		
-		try {
-			generator.doGenerate(  monitor);
-		} catch (Exception e) {
-			throw new CoreException(new Status(IStatus.ERROR, JptGenPlugin.PLUGIN_ID, JptGenMessages.Error_Generating_Entities, e));
-		}
-	}
-	
-	private Object getCustomizer() {
-		return this.customizer;
-	}
-
-	private void setCustomizer(ORMGenCustomizer customizer2) {
-		this.customizer = customizer2;
-	}
-	
-	private void setProject(IJavaProject proj ){
-		this.javaProject = proj;
-	}
-	
-	protected void doGenerate(  IProgressMonitor monitor ) throws Exception {
-		generateInternal( monitor );
-	}
-
-	protected void generateInternal( IProgressMonitor progress) throws Exception {
-		File templDir = prepareTemplatesFolder();
-
-		List<String> genClasses = new java.util.ArrayList<String>();
-		List<String> tableNames = customizer.getGenTableNames();
-
-		/* .java per table, persistence.xml, refresh package folder */
-		String taskName = NLS.bind(JptGenMessages.EntityGenerator_taskName, "Total "+ tableNames.size() + 2);//$NON-NLS-1$
-		progress.beginTask(taskName, tableNames.size() + 2);
-
-
-		for (Iterator<String> iter = tableNames.iterator(); iter.hasNext();) {
-			String tableName = (String) iter.next();
-			ORMGenTable table = (ORMGenTable) customizer.getTable(tableName);
-
-			generateClass(table, templDir.getAbsolutePath(), progress);
-			progress.worked(1);
-
-			genClasses.add(table.getQualifiedClassName());
-			/*
-			 * add the composite key class to persistence.xml because some 
-			 * JPA provider(e.g. Kodo) requires it. Hibernate doesn't seem to care). 
-			 */
-			if (table.isCompositeKey()) {
-				genClasses.add(table.getQualifiedCompositeKeyClassName());
-			}
-		}
-		progress.done();
-	}
-
-	private File prepareTemplatesFolder() throws IOException, Exception,
-			CoreException {
-		//Prepare the Velocity template folder:
-		//If the plug-in is packaged as a JAR, we need extract the template 
-		//folder into the plug-in state location. This is required by Velocity
-		//since we use included templates.
-		Bundle bundle = Platform.getBundle(JptGenPlugin.PLUGIN_ID);
-		String templatesPath = "templates/entities/";  //$NON-NLS-1$
-		Path path = new Path( templatesPath);
-		URL url = FileLocator.find(bundle, path, null);
-		if ( url ==null  ) {
-			throw new CoreException(new Status(IStatus.ERROR, JptGenPlugin.PLUGIN_ID,  JptGenMessages.Templates_notFound + " "+  JptGenPlugin.PLUGIN_ID + "/" + templatesPath) );//$NON-NLS-1$
-		}		
-		URL templUrl = FileLocator.resolve(url);
-		
-		//Have this check so that the code would work in both PDE and JARed plug-in at runtime
-		File templDir = null;
-		if( UrlUtil.isJarUrl(templUrl) ){
-			templDir = FileUtil.extractFilesFromBundle( templUrl, bundle, templatesPath );
-		}else{
-			templDir = UrlUtil.getUrlFile(templUrl);
-		}
-		
-
-		if (templDir==null || !templDir.exists()) {
-			throw new CoreException(new Status(IStatus.ERROR, JptGenPlugin.PLUGIN_ID,  JptGenMessages.Templates_notFound + " "+  JptGenPlugin.PLUGIN_ID ) );//$NON-NLS-1$
-		}
-		return templDir;
-	}
-	
-	/**
-	 * Saves/Creates the .java file corresponding to a database table 
-	 * with the given content.
-	 * 
-	 * @param templDir The velocity template file directory. It is assumed 
-	 * that this directory contains the 2 files <em>main.java.vm</em> 
-	 * and <em>pk.java.vm</em> 
-	 * @param progress 
-	 */
-	protected void generateClass(ORMGenTable table, String templateDirPath, IProgressMonitor monitor) throws Exception {
-
-		String subTaskName = NLS.bind(JptGenMessages.EntityGenerator_taskName, table.getName());
-		SubMonitor sm = SubMonitor.convert(monitor, subTaskName, 100);
-
-		try{
-			IFolder javaPackageFolder = getJavaPackageFolder(table, monitor);
-			IFile javaFile = javaPackageFolder.getFile( table.getClassName() + ".java"); //$NON-NLS-1$
-			
-			Properties vep = new Properties();
-			vep.setProperty("file.resource.loader.path", templateDirPath); //$NON-NLS-1$
-			VelocityEngine ve = new VelocityEngine();
-		    ve.init(vep);
-		    sm.worked(20);
-		    
-		    generateJavaFile(table, javaFile, ve, "main.java.vm", true/*isDomainClass*/, monitor); //$NON-NLS-1$
-		    sm.worked(80);
-		    
-		    if (table.isCompositeKey()) {
-		    	IFile compositeKeyFile = javaPackageFolder.getFile( table.getCompositeKeyClassName()+".java"); //$NON-NLS-1$
-		    	generateJavaFile(table, compositeKeyFile, ve, "pk.java.vm", false/*isDomainClass*/, monitor ); //$NON-NLS-1$
-		    }
-		    
-			javaFile.refreshLocal(1, new NullProgressMonitor());
-			
-		} catch(Throwable e){
-			CoreException ce = new CoreException(new Status(IStatus.ERROR, JptGenPlugin.PLUGIN_ID, JptGenMessages.Templates_notFound + "" + JptGenPlugin.PLUGIN_ID , e) );//$NON-NLS-1$
-			JptGenPlugin.logException( ce );
-		}
-		sm.setWorkRemaining(0);
-	}
-	
-	private void generateJavaFile(ORMGenTable table, IFile javaFile, VelocityEngine ve
-			, String templateName, boolean isDomainClass, IProgressMonitor monitor) throws Exception {
-		VelocityContext context = new VelocityContext();
-        context.put("table", table); //$NON-NLS-1$
-        context.put("customizer", getCustomizer()); //$NON-NLS-1$
-        
-		StringWriter w = new StringWriter();
-		ve.mergeTemplate(templateName, context, w);
-		
-		String fileContent = w.toString();
-		if (javaFile.exists()) {
-			if (isDomainClass) {
-				updateExistingDomainClass(table.getQualifiedClassName(), javaFile, fileContent);
-			} else {
-				javaFile.setContents(new ByteArrayInputStream(fileContent.getBytes()), true, true, monitor );
-			}
-		} else {
-			createFile(javaFile, new ByteArrayInputStream(fileContent.getBytes()));
-		}		
-	}
-	
-	
-	/**
-	 * Updates the (existing) Java file corresponding to the given class.
-	 * 
-	 * @param className The qualified class name.
-	 * 
-	 * @param javaFile The existing Java file of the class to update.
-	 * 
-	 * @param fileContent The new file content.
-	 */
-	protected void updateExistingDomainClass(String className, IFile javaFile, String fileContent) throws Exception {
-		/*use CompilationUnitModifier instead of calling WideEnv.getEnv().setFileContent 
-		 * so that if the unit is up to date if it is used before file change 
-		 * notifications are delivered (see EJB3ImportSchemaWizard.updateExistingDomainClass for example)*/
-		IJavaProject project = javaProject.getJavaProject();
-		CompilationUnitModifier modifier = new CompilationUnitModifier(project, className);
-		modifier.setJavaSource(fileContent);
-		modifier.save();
-	}
-	
-	public void createFile(IFile file, java.io.InputStream contents) throws CoreException {		
-		file.create(contents, false, null/*monitor*/);
-	}
-	
-	public IFolder getJavaPackageFolder(ORMGenTable table, IProgressMonitor monitor) throws CoreException {
-		IPackageFragmentRoot root = getDefaultJavaSrouceLocation ( javaProject ) ;
-		String packageName = table.getPackage();
-		if( packageName==null ) packageName ="";
-		IPackageFragment packageFragment = root.getPackageFragment(packageName);
-		if( !packageFragment.exists()){
-			root.createPackageFragment(packageName, true, monitor);
-		}		
-		return (IFolder)packageFragment.getResource();
-	}
-	
-	private IPackageFragmentRoot getDefaultJavaSrouceLocation(IJavaProject jproject){
-		if (jproject != null) {
-			try {
-				if (jproject.exists()) {
-					IPackageFragmentRoot[] roots = jproject.getPackageFragmentRoots();
-					for (int i= 0; i < roots.length; i++) {
-						if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE) {
-							return roots[i] ; 
-						}
-					}							
-				}
-			} catch (JavaModelException e) {
-				JptGenPlugin.logException(e);
-			}
-		}
-		return null;
-	}
-
-	
-	// ********** annotation name builder **********
-
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/TagNames.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/TagNames.java
deleted file mode 100644
index 92a60fed77..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/TagNames.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal2;
-
-/**
- * TODO: merge with JPA class ?
- * The JPA mapping tag and attribute names.
- * 
- */
-public class TagNames
-{
-	public static final String BASIC_TAG = "basic";
-	public static final String CASCADE_TAG = "cascade";
-	public static final String COLUMN_TAG = "column";
-	public static final String EMBEDDED_TAG = "embedded";
-	public static final String EMBEDDED_ID_TAG = "embedded-id";
-	public static final String GENERATED_VALUE_TAG = "generated-value";
-	public static final String ID_TAG = "id";
-	public static final String ID_CLASS_TAG = "id";
-	public static final String JOIN_COLUMN_TAG = "join-column";
-	public static final String INVERSE_JOIN_COLUMN_TAG = "inverse-join-column";
-	public static final String LOB_TAG = "lob";
-	public static final String MANY_TO_MANY_TAG = "many-to-many";
-	public static final String MANY_TO_ONE_TAG = "many-to-one";
-	public static final String MAPPED_BY_TAG = "mapped-by";
-	public static final String ONE_TO_MANY_TAG = "one-to-many";
-	public static final String ONE_TO_ONE_TAG = "one-to-one";
-	public static final String PK_JOIN_COLUMN_TAG = "primary-key-join-column";
-	public static final String TABLE_TAG = "table";
-	public static final String VERSION_TAG = "version";
-	public static final String JOIN_TABLE_TAG = "join-table";
-
-	/*cascade tags*/
-	public static final String ALL_CASCADE = "all";
-	public static final String PERSIST_CASCADE = "persist";
-	public static final String MERGE_CASCADE = "merge";
-	public static final String REMOVE_CASCADE = "remove";
-	public static final String REFRESH_CASCADE = "refresh";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/util/CompilationUnitModifier.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/util/CompilationUnitModifier.java
deleted file mode 100644
index a238b7910e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/util/CompilationUnitModifier.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal2.util;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jface.text.Document;
-import org.eclipse.text.edits.TextEdit;
-
-
-/**
- * Performs the grunt work needed for modifying a compilation 
- * unit and performs the modified compilation unit save.
- * 
- * The typical usage is as follows:
- * <ol><li>Create an instance.
- * 
- * <li>Modify the compilation unit using AST operations performed 
- * 	on the node returned by {@link #getCompilationUnitNode()}.
- *  Alternatively you can call <code>setJavaSource</code> to change the entire source code. 
- * 
- * <li>Call the {@link #save()} method.
- * 
- */
-public class CompilationUnitModifier
-{
-	private IJavaProject mProject;
-	private ICompilationUnit mCompilationUnit;
-	private CompilationUnit mCompilationUnitNode;
-	private Document mDocument;
-	
-	public CompilationUnitModifier(IJavaProject project, String className) throws Exception {
-		super();
-		
-		mProject = project;
-		
-		IType type = project.findType(className);
-		if (type == null) {
-			throw new Exception("The class " + className + " does not exist.");
-		}
-		mCompilationUnit = type.getCompilationUnit();
-		if (mCompilationUnit == null) {
-			throw new Exception("The source code for " + className + " does not exist.");
-		}
-	}
-	public CompilationUnitModifier(IJavaProject project, ICompilationUnit cu) throws Exception {
-		super();
-		
-		mProject = project;
-		mCompilationUnit = cu;
-	}
-	public CompilationUnitModifier(IJavaProject project, ICompilationUnit cu, CompilationUnit cuNode) throws Exception {
-		super();
-		
-		mProject = project;
-		mCompilationUnit = cu;
-		mCompilationUnitNode = cuNode;
-		
-		getCompilationUnitNode(); //to create mDocument (the caller in this case does not have to call getCompilationUnitNode)
-	}
-	public ICompilationUnit getCompilationUnit() {
-		return mCompilationUnit;
-	}
-	/**
-	 * Returns the compilation unit node that should be used for 
-	 * tyhe modification AST operations.
-	 */
-	public CompilationUnit getCompilationUnitNode() {
-		if (mCompilationUnitNode == null) {
-			ASTParser c = ASTParser.newParser(AST.JLS3);
-			c.setSource(mCompilationUnit);
-			c.setResolveBindings(true);
-			mCompilationUnitNode = (CompilationUnit)c.createAST(null);
-		}
-		if (mDocument == null) {
-			try {
-				mDocument = new Document(mCompilationUnit.getBuffer().getContents());
-			} catch (JavaModelException e) {
-				e.printStackTrace();
-			}
-			
-			mCompilationUnitNode.recordModifications();
-		}
-		
-		return mCompilationUnitNode;
-	}
-	/**
-	 * Changes the entire Java source code of the compilation unit.
-	 */
-	public void setJavaSource(String newSource) {
-		try {
-			mCompilationUnit.getBuffer().setContents(newSource);
-		} catch (JavaModelException e) {
-			e.printStackTrace();
-		}
-	}
-	/**
-	 * Saves the compilation unit modifications.
-	 */
-	public void save() throws Exception {
-		if (mCompilationUnitNode != null) {
-			assert(mDocument != null); //see getCompilationUnitNode
-			
-			//computation of the text edits
-			TextEdit edits = mCompilationUnitNode.rewrite(mDocument, mProject.getOptions(true));
-			//computation of the new source code
-			edits.apply(mDocument);
-			String newSource = mDocument.get();
-			// update of the compilation unit
-			mCompilationUnit.getBuffer().setContents(newSource);
-		}
-		
-		if (mCompilationUnit.isWorkingCopy()) {
-			mCompilationUnit.commitWorkingCopy(true/*force*/, null/*monitor*/);
-		} else {
-			mCompilationUnit.save(null/*monitor*/, true/*force*/);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/util/DTPUtil.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/util/DTPUtil.java
deleted file mode 100644
index dcf3ef9b1a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/util/DTPUtil.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal2.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.db.ForeignKey;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.db.ForeignKey.ColumnPair;
-import org.eclipse.jpt.gen.internal2.ForeignKeyInfo;
-
-/**
- * Collection of utility methods to access DTP and other jpt.db APIs 
- *
- */
-public class DTPUtil {
-
-	/**
-	 * Return list of the pk names
-	 * @param dbTable
-	 * @return
-	 */
-	public static List<String> getPrimaryKeyColumnNames(Table dbTable ) {
-		Iterator<Column> pkColumns = dbTable.primaryKeyColumns();
-		ArrayList<String> ret = new ArrayList<String>();
-		while( pkColumns.hasNext() ){
-			ret.add( pkColumns.next().getName() );
-		}
-		return ret;
-	}
-
-	/**
-	 * 
-	 * @param dbTable
-	 * @return
-	 */
-	public static List<Column> getPrimaryKeyColumns(Table dbTable ) {
-		Iterator<Column> pkColumns = dbTable.primaryKeyColumns();
-		ArrayList<Column> ret = new ArrayList<Column>();
-		while( pkColumns.hasNext() ){
-			ret.add( pkColumns.next() );
-		}
-		return ret;
-	}
-	
-	public static boolean isAutoIncrement(Column c){
-		//@ TODO
-		//Blocked by DTP bug
-		//https://bugs.eclipse.org/bugs/show_bug.cgi?id=250023
-		//The Dali bug is
-		//https://bugs.eclipse.org/bugs/show_bug.cgi?id=249658
-		//
-		return false;
-	}
-
-	/**
-	 * Return list of fk
-	 * @param dbTable
-	 * @return
-	 */
-	public static List<ForeignKeyInfo> getForeignKeys(Table dbTable) {
-		List<ForeignKeyInfo> ret = new ArrayList<ForeignKeyInfo>();
-		if(dbTable!=null){
-			Iterator<ForeignKey> fks = dbTable.foreignKeys();
-			while( fks.hasNext() ){
-				ForeignKey fk  = fks.next();
-				ColumnPair columnPair = fk.getColumnPair();
-
-				String tableName = dbTable.getName();
-				String referencedTableName = "";
-				Table referencedTable = fk.getReferencedTable();
-				referencedTableName = referencedTable.getName();
-				ForeignKeyInfo fkInfo = new ForeignKeyInfo(fk, tableName, referencedTableName );
-				String baseColName = columnPair.getBaseColumn().getName();
-				String referencedColName = columnPair.getReferencedColumn().getName();
-				fkInfo.addColumnMapping( baseColName,  referencedColName );
-				ret.add( fkInfo );
-			}
-		}
-		return ret;
-	}
-
-	public static String getJavaType(Schema schema, Column dbColumn) {
-		if( isPrimaryKey(dbColumn) )
-			return dbColumn.getPrimaryKeyJavaTypeDeclaration();
-		return dbColumn.getJavaTypeDeclaration();
-	}
-
-	public static boolean isPrimaryKey(Column dbColumn){
-		Table dbTable = dbColumn.getTable();
-		Iterator<Column> pkColumns = dbTable.primaryKeyColumns();		
-		while( pkColumns.hasNext() ){
-			if( pkColumns.next().equals( dbColumn )){
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	public static boolean isDefaultSchema(Table dbTable){
-		String schemaName = dbTable.getSchema().getName();
-		Schema defaultSchema = dbTable.getSchema().getConnectionProfile().getDatabase().getDefaultSchema();
-		return defaultSchema.getName() == schemaName;
-	}	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/util/FileUtil.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/util/FileUtil.java
deleted file mode 100644
index 1235d6adf5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/util/FileUtil.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal2.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.jar.JarInputStream;
-import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.osgi.framework.Bundle;
-
-/**
- * Collections of utility methods handling files.
- * 
- */
-public class FileUtil
-{
-	
-	private static String DELETE_FOLDER_ERR = "The directory %s could not be deleted.";
-	private static String DELETE_FILE_ERR = "The file %s could not be deleted.";
-	private static String FILE_READONLY_ERR = "The file %s could not be modified because write access is denied.\nPlease make sure that the file is not marked as readonly in the file system.";
-
-	public static void deleteFolder(File folder)
-		throws IOException
-	{
-		File[] files = folder.listFiles();
-		//empty the folder first (java.io.file.delete requires it empty)
-		if (files != null) {
-			for (int i = 0; i < files.length; ++i) {
-				File f = files[i];
-				if (f.isDirectory())
-					deleteFolder(f);
-				else
-					deletePath(f);
-			}
-		}
-		deletePath(folder);
-	}
-
-	public static void deletePath(File f)
-		throws IOException
-	{
-		if (!f.delete()) {
-			String msgId = f.isDirectory() ?  DELETE_FOLDER_ERR :  DELETE_FILE_ERR;
-			throw new IOException( String.format(msgId,f.getPath()));
-		}
-	}
-	
-	public static byte[] readFile(File src)
-		throws IOException
-	{
-		java.io.FileInputStream fin = new java.io.FileInputStream(src);
-		try {
-			long fileLen = src.length();
-			if (fileLen > Integer.MAX_VALUE)
-				throw new IOException("file length too big to be read by FileUtil.readFile: " + fileLen);
-		
-			byte[] bytes = new byte[(int)fileLen];
-			fin.read(bytes);
-			return bytes;
-		}
-		finally {
-			fin.close();
-		}
-	}
-
-	public static void writeFile(File dest, byte[] bytes)
-		throws IOException
-	{
-		if (dest.exists() && !dest.canWrite())
-			throw new IOException( FILE_READONLY_ERR );  //throw with a clear error because otherwise FileOutputStream throws FileNotFoundException!
-		java.io.FileOutputStream fout = new java.io.FileOutputStream(dest.getPath(), false/*append*/);
-		try {
-			fout.write(bytes);
-		}
-		finally {
-			fout.flush();
-			fout.close();
-		}
-	}
-
-	/**
-	 * Returns the url for a file.
-	 * This basically the same as file.toUrl() but without the non-sense exception.
-	 */
-	public static URL getFileUrl(File file) {
-		try {
-			return file.toURI().toURL();
-		} catch (MalformedURLException e) {
-			return null; //should not happen as file.toURL() does not really throw an exception
-		}
-	}
-
-	public static void setFileContent(File file, java.io.InputStream contents) throws java.io.IOException {
-		Path path = new Path(file.getAbsolutePath());
-		try {
-			IFile iFile = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(path);
-			if (iFile == null) {
-				throw new IOException("The path " + file + " does not seem to be a valid file path.");
-			}
-			iFile.setContents(contents, true/*force*/, true/*keepHistory*/, null/*monitor*/);
-		} catch (CoreException ex) {
-			throw new IOException(ex.getMessage());
-		}
-	}	
-	
-    /**
-     * Extract the contents of a Jar archive to the specified destination.
-     */
-    public static void unjar(InputStream in, File dest) throws IOException {
-        if (!dest.exists()) {
-            dest.mkdirs();
-        }
-        if (!dest.isDirectory()) {
-            throw new IOException("Destination must be a directory.");//$NON-NLS-1$
-        }
-        JarInputStream jin = new JarInputStream(in);
-        byte[] buffer = new byte[1024];
-
-        ZipEntry entry = jin.getNextEntry();
-        while (entry != null) {
-            String fileName = entry.getName();
-            if (fileName.charAt(fileName.length() - 1) == '/') {
-                fileName = fileName.substring(0, fileName.length() - 1);
-            }
-            if (fileName.charAt(0) == '/') {
-                fileName = fileName.substring(1);
-            }
-            if (File.separatorChar != '/') {
-                fileName = fileName.replace('/', File.separatorChar);
-            }
-            File file = new File(dest, fileName);
-            if (entry.isDirectory()) {
-                // make sure the directory exists
-                file.mkdirs();
-                jin.closeEntry();
-            } else {
-                // make sure the directory exists
-                File parent = file.getParentFile();
-                if (parent != null && !parent.exists()) {
-                    parent.mkdirs();
-                }
-
-                // dump the file
-                OutputStream out = new FileOutputStream(file);
-                int len = 0;
-                while ((len = jin.read(buffer, 0, buffer.length)) != -1) {
-                    out.write(buffer, 0, len);
-                }
-                out.flush();
-                out.close();
-                jin.closeEntry();
-                file.setLastModified(entry.getTime());
-            }
-            entry = jin.getNextEntry();
-        }
-        /* Explicitly write out the META-INF/MANIFEST.MF so that any headers such
-         as the Class-Path are seen for the unpackaged jar
-         */
-        Manifest mf = jin.getManifest();
-        if (mf != null) {
-            File file = new File(dest, "META-INF/MANIFEST.MF");//$NON-NLS-1$
-            File parent = file.getParentFile();
-            if (parent.exists() == false) {
-                parent.mkdirs();
-            }
-            OutputStream out = new FileOutputStream(file);
-            mf.write(out);
-            out.flush();
-            out.close();
-        }
-        jin.close();
-    }
-    
-	//Used to Unzip the a specific folder packed inside a plug-in bundle to the plug-in state location
-	public static File extractFilesFromBundle( URL url, Bundle bundle, String path ) throws Exception {
-		URL jarUrl = UrlUtil.getJarFileUrl(url);
-		File jarFile = new File(jarUrl.getFile() );
-		Location configLocation = Platform.getConfigurationLocation();
-		String pluginId = bundle.getSymbolicName();
-		File configFolder = new File( configLocation.getURL().getFile(), pluginId);
-		File templDir = new File( configFolder, path );
-		if( !templDir.exists() ){
-			FileUtil.unjar( new FileInputStream( jarFile ), configFolder );
-			//Delete un-related files and folders
-			File[] files = configFolder.listFiles();
-			for( File f : files ){
-				if( f.isFile() )
-					f.delete();
-				else if(  templDir.getPath().indexOf( f.getPath() ) !=0  ){
-					FileUtil.deleteFolder(f);
-				}
-			}
-		}
-		return templDir ;
-	}	
-}
-
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/util/StringUtil.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/util/StringUtil.java
deleted file mode 100644
index 45efe138a2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/util/StringUtil.java
+++ /dev/null
@@ -1,648 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.gen.internal2.util;
-
-import java.beans.Introspector;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-public class StringUtil
-{
-	/**
-	 * Pads a string by adding a sequence of an arbitrary character at the beginning.
-	 * @param padChar The character to be used for padding.
-	 * @param len The desired length after padding.
-	 * @return The padded string. For example if <code>str</code> is "f4e" and <code>padChar</code> is '0' 
-	 * and <code>len</code> is 6 then this method returns "000f4e"
-	 */
-	public static String padLeft(String str, char padChar, int len) {
-		if(str == null) {
-			return null;
-		}
-		int strLen = str.length();
-		if (strLen < len) {
-			StringBuffer buffer = new StringBuffer(len);
-			int count = len-strLen;
-			for (int i = 0; i < count; ++i)
-				buffer.append(padChar);
-			buffer.append(str);
-			str = buffer.toString();
-		}
-		return str;
-	}
-	/**
-	 * Inserts a given character at the beginning and at the end of the specified string.
-	 * For example if the string is <tt>extreme</tt> and the char is <tt>'</tt> then 
-	 * the returned string is <tt>'exterme'</tt>.
-	 */
-	public static String quote(String str, char c) {
-		assert(str != null);
-		StringBuffer buffer = new StringBuffer(str.length()+2);
-		buffer.append(c);
-		buffer.append(str);
-		buffer.append(c);
-		return buffer.toString();
-	}
-	public static String doubleQuote(String str) {
-		return quote(str, '"');
-	}
-	/**
-	 * Removes the first and last single or double quotes (if they exist).
-	 */
-	public static String unquote(String quoted) {
-		if (quoted != null && quoted.length() >= 2){
-			int len = quoted.length();
-			char firstChar = quoted.charAt(0);
-			char lastChar = quoted.charAt(len-1);
-			if (firstChar == lastChar && (firstChar == '\'' || firstChar == '"')) {
-				return quoted.substring(1, len-1);
-			}
-		}
-		return quoted;
-	}
-	/**
-	 * Truncates a string and adds "..." in the result string.
-	 * If the string length is less or equal to the max len then 
-	 * the original string is returned.
-	 */
-	public static String truncate(String s, int maxLen) {
-		if (s == null) {
-			return null;
-		}
-		int len = s.length();
-		if (len > maxLen) {
-			int segmentLen = maxLen/2;
-			s = s.substring(0, segmentLen) + "..." + s.substring(len-segmentLen);
-		}
-		return s;
-	}
-	/**
-	 * Returns a string containing the same character repeated.
-	 */
-	public static String repeat(char c, int count) {
-		StringBuffer buffer = new StringBuffer(count);
-		for (int i = 0; i < count; ++i) {
-			buffer.append(c);
-		}
-		return buffer.toString();
-	}
-	/**
-	 * Returns the given string unless it is emtpty where it returns null.
-	 */
-	public static String nullIfEmpty(String s) {
-		if (s != null && s.length() == 0) {
-			s = null;
-		}
-		return s;
-	}
-	/**
-     * Returns a string containing the same characters as the argument string 
-	 * except that the control characters are replaced by the their hex code.
-	 * For example if the string is "ab\nc" the returned string is "ab{0xA}c".
-	 */
-	public static String getVisibleString(String s) {
-		if (s == null)
-			return null;
-		int len = s.length();
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0; i < len; ++i) {
-			char c = s.charAt(i);
-			if (c <= 0x1F || (c == 0x20 && (i == 0 || i == len-1))) {
-				buffer.append("(0x" + Integer.toHexString((int)c).toUpperCase() + ")");
-			}
-			else buffer.append(c);
-		}
-		return buffer.toString();
-	}
-	/**
-	 * Replaces a portion of string.
-	 * @param str The original string.
-	 * @param offset The offset in the original string where the replace starts
-	 * @param len The replace length the original string
-	 * @param replaceStr The replacement string
-	 */
-	public static String strReplace(String str, int offset, int len, String replaceStr) {
-		StringBuffer buffer = new StringBuffer(str.length()-len+replaceStr.length());
-		buffer.append(str.substring(0, offset));
-		buffer.append(replaceStr);
-		buffer.append(str.substring(offset+len));
-		
-		return buffer.toString();
-	}
-	public static String strReplace(String str, String pattern, String replaceStr)
-	{
-		if(str == null) {
-			return null;
-		}
-		if(pattern == null || pattern.equals("")) {
-			return str;
-		}
-		int index = str.indexOf(pattern);
-		if (index < 0)
-			return str;
-		
-		if (replaceStr == null)
-			replaceStr = "";
-		return str.substring(0, index) + replaceStr + str.substring(index + pattern.length());
-	}
-	public static String strReplaceAll(String str, String pattern, String replaceStr)
-	{
-		if(str == null) {
-			return null;
-		}
-		if (replaceStr == null)
-			replaceStr = "";
-		if(pattern == null || pattern.equals("")) {
-			return str;
-		}
-		int index = str.indexOf(pattern);
-		while (index >= 0) {
-			str = str.substring(0, index) + replaceStr + str.substring(index + pattern.length());
-			index = str.indexOf(pattern, index+replaceStr.length());
-		}
-		return str;
-	}
-	public static String strInsert(String str, int index, String insertStr)
-	{
-		return str.substring(0, index)
-				+ insertStr
-				+ str.substring(index);
-	}
-    /**
-     * Tokenize the specified string into a <code>List</code> of
-     * words.
-     * If the string specified is <code>null</code> or empty, this
-     * method will return <code>null</code>.
-     * 
-     * @param s      The string to tokenize into a <code>List</code>.
-     * @param sep    The separator character to use to split
-     *               the string.
-     * @param trim   If <code>true</code>, run <code>trim</code> on
-     *               each element in the result <code>List</code>.
-     * 
-     * @return A <code>List</code> containing all tokenized words
-     *         in the parameter string.
-     *         Each element is of type <code>String</code>.
-     */
-	public static List<String> strToList(String s, char sep, boolean trim)
-	{
-	//ex: if sep is ';' then s should be someting like "Red;Black"
-		if (s == null || s.length() == 0)
-			return null;
-			
-		ArrayList<String> result = new ArrayList<String>();
-		
-		char delimiters[] = {sep};
-		java.util.StringTokenizer tokenizer = new java.util.StringTokenizer(s, new String(delimiters), true/*returnDelimiters*/);
-		String lastTok=null;
-		while (tokenizer.hasMoreTokens()) {
-			String tok = tokenizer.nextToken();
-			if (tok.length()==1 && tok.charAt(0)==sep){//delimiter
-			    if (tok.equals(lastTok)||lastTok==null/*first element is empty*/)
-			        result.add("");
-			}
-			else{
-			    if (trim)
-			        tok = tok.trim();
-			    result.add(tok);
-			}
-			lastTok=tok;
-		}
-		if(lastTok.length()==1 && lastTok.charAt(0)==sep)//last element is empty
-		    result.add("");
-		result.trimToSize();
-		return result;
-	}
-	public static List<String> strToList(String s, char sep)
-	{
-		return strToList(s, sep, false/*trim*/);
-	}
-	
-	@SuppressWarnings("unchecked")
-	public static String listToStr(Collection a, char sep)
-	{
-		return listToStr(a, String.valueOf(sep));
-	}
-	
-	public static String listToStr(Collection<Object> a, String sep) {
-		//reverse of strToList
-		if (a == null)
-			return null;
-		int count = a.size();
-		if (count == 0)
-			return null;
-		
-		StringBuffer buffer = null;
-		for (Iterator<Object> iter = a.iterator(); iter.hasNext(); )
-		{
-			Object obj = iter.next();
-			if (obj == null)
-				continue;
-			
-			if (buffer == null)
-				buffer = new StringBuffer();
-			else
-				buffer.append(sep);
-			if (obj instanceof String)
-				buffer.append((String)obj);
-			else
-				buffer.append(obj);
-		}
-		return (buffer != null) ? buffer.toString() : null;
-	}
-	/**
-	 * Convert the text of a String into a Map of Strings, where each
-	 * key and value in the Map is of type String.
-	 * 
-	 * @param s      The string to be converted to a Map.
-	 * @param sep1   The separator between keys and their
-	 *               values.
-	 * @param sep2   The separator between key-value pairs.
-	 * 
-	 * @return The string converted to a Map.
-	 */
-	public static java.util.Map<String, String> strToMap(String s, char sep1, char sep2)
-	{
-		return strToMap(s, sep1, sep2, false/*lowercaseKeys*/);
-	}
-	/**
-	 * Convert the text of a String into a Map of Strings, where each
-	 * key and value in the Map is of type String.
-	 * This form also allows you to specify that all keys will be
-	 * converted to lower-case before adding to the Map.
-	 * 
-	 * @param s      The string to be converted to a Map.
-	 * @param sep1   The separator between keys and their
-	 *               values.
-	 * @param sep2   The separator between key-value pairs.
-	 * @param lowercaseKeys
-	 *               Whether to convert keys to lower case
-	 *               before adding to the Map.
-	 * 
-	 * @return The string converted to a Map.
-	 */
-	public static java.util.Map<String, String> strToMap(String s, char sep1, char sep2, boolean lowercaseKeys)
-	{
-		//ex: if sep1 is ':' and sep2 is ',' then s should be something like "color:Red,size:XL"
-		
-		if (s == null || s.length() == 0) {
-			return Collections.emptyMap();
-		}
-			
-		java.util.List<String> a = strToList(s, sep2);
-		if (a == null) {
-			return Collections.emptyMap();
-		}
-		
-		java.util.HashMap<String, String> hm = new java.util.HashMap<String, String>();
-		int count = a.size();
-		for (int i = 0; i < count; ++i)
-		{
-			String s2 = (String)a.get(i); //ex: color:Red
-			int pos = s2.indexOf(sep1);
-			if (pos >= 0)
-			{
-				String name = s2.substring(0, pos);
-				String val = s2.substring(pos+1);
-				if (lowercaseKeys)
-					name = name.toLowerCase();
-				hm.put(name, val);
-			}
-		}
-		return hm;
-	}
-	
-	@SuppressWarnings("unchecked")
-	public static String mapToStr(java.util.Map hm, char sep1, char sep2)
-	//reverse of strToMap
-	{
-		if (hm == null || hm.isEmpty())
-			return null;
-		
-		StringBuffer buffer = new StringBuffer();
-		java.util.Iterator<java.util.Map.Entry> iter = hm.entrySet().iterator();
-		while (iter.hasNext()) {
-			java.util.Map.Entry entry = (java.util.Map.Entry)iter.next();
-			buffer.append(entry.getKey());
-			buffer.append(sep1);
-			buffer.append(entry.getValue());
-			if (iter.hasNext()) {
-				buffer.append(sep2);
-			}
-		}
-		return buffer.toString();
-	}
-    /**
-     * Perform a <em>case insensitive</em> comparison between
-     * the string representations of two objects.
-     * 
-     * @param obj1   The first object to compare.
-     * @param obj2   The second object to compare.
-     * 
-     * @return <code>true</code> if both objects have the
-     *         same case-insensitive string representation.
-     */
-	public static boolean compareAsStrings(Object obj1, Object obj2)
-	{	
-		if (obj1 == null || obj2 == null)
-			return obj1 == obj2;
-		
-		String s1, s2;
-		if (obj1 instanceof String) {
-			s1 = (String)obj1;
-        } else {
-			s1 = obj1.toString();
-        }
-		if (obj2 instanceof String) {
-			s2 = (String)obj2;
-        }
-        else {
-			s2 = obj2.toString();
-        }
-		
-		return s1.equalsIgnoreCase(s2);
-	}
-	/**
-	 * Tests whether a string starts with any of a list of strings.
-	 */
-	public static boolean startsWithAny(String s, List<String> prefixes) {
-		int count = prefixes.size();
-		for (int i = 0; i < count; ++i) {
-			if (s.startsWith((String)prefixes.get(i))) {
-				return true;
-			}
-		}
-		return false;
-	}
-	/**
-	 * Returns the argument string with the first char upper-case.
-	 */
-	public static String initUpper(String str) {
-		if (str == null || str.length() == 0) {
-			return str;
-		}
-		return Character.toUpperCase(str.charAt(0)) + str.substring(1);
-	}
-	/**
-	 * Returns the argument string with the first char lower-case.
-	 */
-	public static String initLower(String str) {
-		if (str == null || str.length() == 0) {
-			return str;
-		}
-		return Character.toLowerCase(str.charAt(0)) + str.substring(1);
-	}
-	/**
-	 * Tests whether all characters in the given string are upper
-	 * case.
-	 */
-	public static boolean isUpperCase(String s) {
-		return s.toUpperCase().equals(s);
-	}
-	/**
-	 * Returns the first non-white char index starting from the 
-	 * specified index.
-	 */
-	public static int skipWhiteSpaces(String str, int index) {
-		int len = str.length();
-		while (index < len) {
-			if (!Character.isWhitespace(str.charAt(index))) {
-				break;
-			}
-			++index;
-		}
-		return index;
-	}
-	/**
-	 * Collapses consecutive white spaces into one space.
-	 */
-	public static String collapseWhiteSpaces(String str){
-	    String result=null;
-	    if (str!=null){
-	        StringBuffer buffer=new StringBuffer();
-	        boolean isInWhiteSpace=false;
-	        for (int i=0;i<str.length();i++){
-	            char c=str.charAt(i);
-	            if (Character.isWhitespace(c)){
-	                isInWhiteSpace=true;
-	            }
-	            else {
-	                if (isInWhiteSpace)
-	                    buffer.append(" ");
-	                isInWhiteSpace=false;   
-	                buffer.append(c);
-	            }
-	        }
-	        result=buffer.toString();
-	    }
-	    return result;
-	}
-	
-	/**
-	 * Utility methods used to convert DB object names to  
-	 * appropriate Java type and field name 
-	 */
-	public static String pluralise(String name) {
-		String result = name;
-		if (name.length() == 1) {
-			result += 's';
-		} else if (!seemsPluralised(name)) {
-			String lower = name.toLowerCase();
-			if (!lower.endsWith("data")) { //orderData --> orderDatas is dumb
-				char secondLast = lower.charAt(name.length() - 2);
-				if (!isVowel(secondLast) && lower.endsWith("y")) {
-					// city, body etc --> cities, bodies
-					result = name.substring(0, name.length() - 1) + "ies";
-				} else if (lower.endsWith("ch") || lower.endsWith("s")) {
-					// switch --> switches  or bus --> buses
-					result = name + "es";
-				} else {
-					result = name + "s";
-				}
-			}
-		}
-		return result;
-	}
-
-	public static String singularise(String name) {
-		String result = name;
-		if (seemsPluralised(name)) {
-			String lower = name.toLowerCase();
-			if (lower.endsWith("ies")) {
-				// cities --> city
-				result = name.substring(0, name.length() - 3) + "y";
-			} else if (lower.endsWith("ches") || lower.endsWith("ses")) {
-				// switches --> switch or buses --> bus
-				result = name.substring(0, name.length() - 2);
-			} else if (lower.endsWith("s")) {
-				// customers --> customer
-				result = name.substring(0, name.length() - 1);
-			}
-		}
-		return result;
-	}
-	private final static boolean isVowel(char c) {
-		boolean vowel = false;
-		vowel |= c == 'a';
-		vowel |= c == 'e';
-		vowel |= c == 'i';
-		vowel |= c == 'o';
-		vowel |= c == 'u';
-		vowel |= c == 'y';
-		return vowel;
-	}
-	private static boolean seemsPluralised(String name) {
-		name = name.toLowerCase();
-		boolean pluralised = false;
-		pluralised |= name.endsWith("es");
-		pluralised |= name.endsWith("s");
-		pluralised &= !(name.endsWith("ss") || name.endsWith("us"));
-		return pluralised;
-	}
-	
-	/**
-	 * Returns the package name of a class name.
-	 * For example if given <code>oracle.util.ObjectUtil</code> it would return 
-	 * <code>oracle.util</code>. If the class is not in a package then null is returned.
-	 */
-	public static String getPackageName(String className) {
-		if(className == null) {
-			return null;
-		}
-		int lastDotIndex = className.lastIndexOf('.');
-		if (lastDotIndex < 0)
-			return null;
-		return className.substring(0, lastDotIndex);
-	}
-	/**
-	 * Returns the class name given a full class name.
-	 * For example if given <code>oracle.util.ObjectUtil</code> it would return 
-	 * <code>ObjectUtil</code>
-	 */
-	public static String getClassName(String fullClassName) {
-		if(fullClassName == null) {
-			return null;
-		}
-		int lastDotIndex = fullClassName.lastIndexOf('.');
-		if (lastDotIndex < 0)
-			return fullClassName;
-		return fullClassName.substring(lastDotIndex+1);
-	}
-
-	
-	/**
-	 * Converts a database column name to a Java variable name (<em>first letter
-	 * not capitalized</em>).
-	 */
-	public static String columnNameToVarName(String columnName) {
-		return dbNameToVarName(columnName);
-	}
-	/**
-	 * Converts a database table name to a Java variable name (<em>first letter
-	 * not capitalized</em>).
-	 */
-	public static String tableNameToVarName(String tableName) {
-		return dbNameToVarName(tableName);
-	}
-	/**
-	 * Converts a database name (table or column) to a java name (<em>first letter
-	 * not capitalized</em>). employee_name or employee-name -> employeeName
-	 */
-	private static String dbNameToVarName(String s) {
-		if ("".equals(s)) {
-			return s;
-		}
-		StringBuffer result = new StringBuffer();
-
-		boolean capitalize = true;
-		boolean lastCapital = false;
-		boolean lastDecapitalized = false;
-		String p = null;
-		for (int i = 0; i < s.length(); i++) {
-			String c = s.substring(i, i + 1);
-			if ("_".equals(c) || " ".equals(c)) {
-				capitalize = true;
-				continue;
-			}
-
-			if (c.toUpperCase().equals(c)) {
-				if (lastDecapitalized && !lastCapital) {
-					capitalize = true;
-				}
-				lastCapital = true;
-			} else {
-				lastCapital = false;
-			}
-
-			if (capitalize) {
-				if (p == null || !p.equals("_")) {
-					result.append(c.toUpperCase());
-					capitalize = false;
-					p = c;
-				} else {
-					result.append(c.toLowerCase());
-					capitalize = false;
-					p = c;
-				}
-			} else {
-				result.append(c.toLowerCase());
-				lastDecapitalized = true;
-				p = c;
-			}
-
-		}
-		/*this was using StringUtil.initLower. Changed to Introspector.decapitalize so that 
-		 * it returns the correct bean property name when called from columnNameToVarName.
-		 * This is necessary because otherwise URL would be uRL which would cause 
-		 * an "The property uRL is undefined for the type xx" error because 
-		 * Introspector.getBeanInfo (used by JavaTypeIntrospector) returns 
-		 * the property name as URL.*/
-		String resultStr = Introspector.decapitalize(result.toString());
-		if (resultStr.equals("class")) {
-			// "class" is illegal becauseOf Object.getClass() clash
-			resultStr = "clazz";
-		}
-		return resultStr;
-	}
-	
-	/**
-	 * Compare two objects. If both String, ignore case
-	 * @param o1
-	 * @param o2
-	 * @param ignoreCaseIfStr
-	 * @return
-	 */
-	public static boolean equalObjects(Object o1, Object o2, boolean ignoreCaseIfStr)
-	{
-		if (o1 == o2) {
-			return true;
-		}
-	    boolean result;
-	    if (o1 == null || o2 == null) {
-	    	return false; //we already checked o1 == o2 above
-	    }
-	    if (ignoreCaseIfStr && o1 instanceof String && o2 instanceof String)
-	        result = ((String)o1).equalsIgnoreCase((String)o2);
-	    else
-	        result = o1.equals(o2);
-	
-	    return result;
-	}
-
-	public static boolean equalObjects(Object o1, Object o2)
-	{
-	    return equalObjects(o1, o2, false/*ignoreCaseIfStr*/);
-	}
-	
-}
-
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/util/UrlUtil.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/util/UrlUtil.java
deleted file mode 100644
index f6b5276726..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/util/UrlUtil.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.gen.internal2.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-
-/**
- * Collections of utility methods handling URLs.
- * 
- */
-public class UrlUtil
-{
-	/**
-	 * The <code>file</code> string indicating a url file protocol.
-	 */
-	public static final String FILE_PROTOCOL = "file";
-	/**
-	 * The <code>file</code> string indicating a url http protocol.
-	 */
-	public static final String HTTP_PROTOCOL = "http";
-	/**
-	 * The <code>file</code> string indicating a url http protocol.
-	 */
-	public static final String HTTPS_PROTOCOL = "https";
-	/**
-	 * The <code>file</code> string indicating a url file protocol.
-	 */
-	public static final String JAR_PROTOCOL = "jar";
-
-	
-	/**
-	 * Returns true if the specified url is to a file, i.e its protocol is <code>file</code>.
-	 */
-	public static boolean isFileUrl(URL url) {
-		return url != null && FILE_PROTOCOL.equals(url.getProtocol());
-	}
-	/**
-	 * Returns true if the specified url is to a jar, i.e its protocol is <code>jar</code>.
-	 * For example <code>jar:file:/C:/testapps/example/WEB-INF/lib/struts.jar!/META-INF/tlds/struts-bean.tld</code>.
-	 */
-	public static boolean isJarUrl(URL url) {
-		return url != null && JAR_PROTOCOL.equals(url.getProtocol());
-	}
-	/**
-	 * Returns true if the specified url protocol is http.
-	 */
-	public static boolean isHttpUrl(URL url) {
-		String protocol =  url.getProtocol();
-		return url != null && (HTTP_PROTOCOL.equals(protocol) || HTTPS_PROTOCOL.equals(protocol));
-	}
-	/**
-	 * Returns the <code>File</code> corresponding to a url, or null if the url 
-	 * protocol is not file.
-	 */
-	public static java.io.File getUrlFile(URL url) {
-		if (isFileUrl(url) && !isJarUrl( url ) ){
-			File ret = new java.io.File(url.getFile());
-			return ret ;
-		}
-		return null;
- 	}
-
-	
-	/**
-	 * Returns the url to a jar file given a url to a file inside 
-	 * the jar.
-	 * For example if given 
-	 * <code>jar:file:/C:/testapps/example/WEB-INF/lib/struts.jar!/META-INF/tlds/struts-bean.tld</code>
-	 * this method returns <code>file:/C:/testapps/example/WEB-INF/lib/struts.jar</code>.
-	 * 
-	 * <p>Returns null if the given url is not recognized as a url to a file 
-	 * inside a jar.
-	 */
-	public static URL getJarFileUrl(URL url) {
-		if (!isJarUrl(url)) {
-			return null;
-		}
-		String file = url.getFile(); //file:/C:/testapps/example/WEB-INF/lib/struts.jar!/META-INF/tlds/struts-bean.tld
-		int index = file.indexOf('!');
-		if (index < 0) {
-			return null;
-		}
-		String jarFileUrlStr = file.substring(0, index);
-		try {
-			return new URL(jarFileUrlStr);
-		} catch (MalformedURLException e) {
-			return null;
-		}
-	}
-	
-	public static boolean isRemote(String url){
-		return url.startsWith("http:")||url.startsWith("https:")||url.startsWith("www.");
-	}
-	
-	public static File getTemplateFolder(String plugId , String strPath ){
-		Bundle bundle = Platform.getBundle( plugId );
-		Path path = new Path( strPath );
-		URL url = FileLocator.find(bundle, path, null);
-		try {
-			URL templUrl;
-			templUrl = FileLocator.resolve(url);
-			File templDir = UrlUtil.getUrlFile(templUrl);
-			return templDir ;
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/column.vm b/jpa/plugins/org.eclipse.jpt.gen/templates/entities/column.vm
deleted file mode 100644
index 8bb49108b2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/column.vm
+++ /dev/null
@@ -1,52 +0,0 @@
-##included template. Generates the @Column annotation.
-##Assumes that the context has a "column" and a "table" object
-##generate annotation only the parameters for the column NOT default
-##and the generateDLLAnnotation property is not set on the table
-###------------------------------------------------
-#macro( append $members $parameters )
-#if( $members == "")
-#set( $members = $parameters )
-#else
-#set( $members = "$members, $parameters" ) 
-#end	
-#end
-###------------------------------------------------
-#if ( $column.dataTypeLOB)
-    @Lob()
-#end
-#if ( $column.needMapTemporalType)
-    @Temporal( TemporalType.$column.temporalType)
-#end
-#set ($members = "")
-#if ( !$column.default || $table.generateDDLAnnotations )
-#set ($members = "name=$customizer.quote($column.name)")
-#if (!$column.insertable)
-#set ($members = "$members, insertable=false")
-#end
-#if (!$column.updateable)
-#set ($members = "$members, updatable=false")
-#end
-#end
-#if( $table.generateDDLAnnotations )
-#if ($column.unique)
-#append($members  "unique=true")
-#end
-#if (!$column.nullable)
-#append($members  "nullable=false")
-#end
-#if ($column.size > 0)
-#if ($column.numeric)
-#append($members "precision=$column.size")
-#if ($column.decimalDigits != 0 && $column.decimalDigits != -1)
-#append($members "scale=$column.decimalDigits")
-#end
-#else
-#if ( !$column.dataTypeLOB)
-#append($members "length=$column.size")
-#end
-#end
-#end
-#end
-#if( $members !="" )
-	@Column($members)
-#end
diff --git a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/join.vm b/jpa/plugins/org.eclipse.jpt.gen/templates/entities/join.vm
deleted file mode 100644
index ece3ff4c3f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/join.vm
+++ /dev/null
@@ -1,61 +0,0 @@
-##included template. Generates the @JoinTable, @JoinColumn or @JoinColumns annotation.
-##Assumes that the context has a "role" object representing the generated AssociationRole
-##
-##macro joinColumn uses $column, $referencedColumn
-#macro (joinColumn $column $referencedColumn)
-#set ($members = "name=$customizer.quote($column.joinColumnName)")
-#if( !$referencedColumn.primaryKey )
-#set ($members = "$members, referencedColumnName=$customizer.quote($referencedColumn.name)")
-#end
-#if( $table.generateDDLAnnotations )
-#if ($column.unique && !$column.primaryKey)
-#set ($members = "$members, unique=true")
-#end
-#if (!$column.nullable)
-#set ($members = "$members, nullable=false")
-#end
-#end
-#if (!$role.association.joinTable && !$role.referrerTable.isColumnUpdateInsert($role, $column))
-#set ($members = "$members, insertable=false, updatable=false")
-#end
-@JoinColumn($members)#end
-##
-##
-##
-#if ($role.association.joinTable)
-#set ($joinTable = $role.association.joinTable)
-	@JoinTable(
-		name="${joinTable.joinTableAnnotationName}"
-#if ($joinTable.schema!="")
-		, schema="${joinTable.schema}"
-#end
-		, joinColumns={
-#foreach ($column in $role.referrerColumns)
-#set ($referencedColumn = $role.getReferencedColumn(${column.name}))
-##$referencedColumn is the column in the join table
-			#joinColumn($referencedColumn $column),
-#end
-			}
-		, inverseJoinColumns={
-#foreach ($column in $role.referencedColumns)
-#set ($referencedColumn = $role.getReferrerColumn(${column.name}))
-##$referencedColumn is the column in the join table
-			#joinColumn($referencedColumn $column),
-#end
-			}
-		)
-#else
-#if ($role.referrerColumns.size() == 1)
-#set ($column = $role.referrerColumns.get(0))
-#set ($referencedColumn = $role.getReferencedColumn(${column.name}))
-	#joinColumn($column $referencedColumn)
-
-#else
-	@JoinColumns({
-#foreach ($column in $role.referrerColumns)
-#set ($referencedColumn = $role.getReferencedColumn(${column.name}))
-		#joinColumn($column $referencedColumn),
-#end		
-		})
-#end
-#end
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/main.java.vm b/jpa/plugins/org.eclipse.jpt.gen/templates/entities/main.java.vm
deleted file mode 100644
index 28c861c844..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/main.java.vm
+++ /dev/null
@@ -1,129 +0,0 @@
-#if ($table.package != "")
-package ${table.package};
-#end
-import java.io.Serializable;
-import javax.persistence.*;
-
-/**
- * The persistent class for the ${table.name} database table.
- * 
- */
-@Entity
-@Table(name="${table.name}")
-public class ${table.className} ${table.generateExtendsImplements()} {
-	private static final long serialVersionUID = 1L;
-#####
-##### fields
-#####
-#if ($table.compositeKey)
-#if ($table.access == "field")
-
-	@EmbeddedId
-#end
-	private ${table.compositeKeyClassName} ${table.compositeKeyPropertyName};
-#end
-#foreach ($column in $table.getSimpleColumns(true, true, false))
-#if ($table.access == "field")
-
-#parse("mappingKind.vm")
-#parse("column.vm")
-#end
-	${column.fieldScope} ${column.propertyType} ${column.propertyName};
-#end
-#foreach ($role in $table.associationRoles)
-#####
-##### field annotations
-#####
-#if ($table.access == "field")
-
-	//${role.description}
-#if ($role.cardinality == "many-to-one")
-#parse("manyToOne.vm")
-#elseif ($role.cardinality == "many-to-many")
-#parse("manyToMany.vm")
-#elseif ($role.cardinality == "one-to-many")
-#parse("oneToMany.vm")
-#elseif ($role.cardinality == "one-to-one")
-#parse("oneToOne.vm")
-#end
-#end
-#####
-##### field declaration
-#####
-#if ($role.cardinality == "many-to-one" || $role.cardinality == "one-to-one")
-#set ($propertyType = ${role.referencedTable.className})
-#elseif ($role.cardinality == "many-to-many" || $role.cardinality == "one-to-many")
-#set ($propertyType = "${role.referencedTable.defaultCollectionType}<${role.referencedTable.className}>")
-#end
-	private $propertyType $role.propertyName;
-#end
-
-    public ${table.className}() {
-    }
-#####
-##### simple properties getters and setters
-#####
-#if ($table.compositeKey)
-#if ($table.access == "property")
-
-	@EmbeddedId
-#end
-	public $table.compositeKeyClassName $customizer.propertyGetter($table.compositeKeyPropertyName)() {
-		return this.${table.compositeKeyPropertyName};
-	}
-
-	public void $customizer.propertySetter($table.compositeKeyPropertyName)($table.compositeKeyClassName $table.compositeKeyPropertyName) {
-		this.${table.compositeKeyPropertyName} = ${table.compositeKeyPropertyName};
-	}
-	
-#end
-#foreach ($column in $table.getSimpleColumns(true, true, false))
-#if ($table.access == "property")
-
-#parse("mappingKind.vm")
-#parse("column.vm")
-#end
-	$column.propertyGetScope $column.propertyType $customizer.propertyGetter($column.propertyName)() {
-		return this.${column.propertyName};
-	}
-
-	$column.propertySetScope void $customizer.propertySetter($column.propertyName)($column.propertyType $column.propertyName) {
-		this.${column.propertyName} = ${column.propertyName};
-	}
-
-#end
-#####
-##### associations getters and setters
-#####
-#foreach ($role in $table.associationRoles)
-#if ($table.access == "property")
-
-	//${role.description}
-#if ($role.cardinality == "many-to-one")
-#parse("manyToOne.vm")
-#elseif ($role.cardinality == "many-to-many")
-#parse("manyToMany.vm")
-#elseif ($role.cardinality == "one-to-many")
-#parse("oneToMany.vm")
-#elseif ($role.cardinality == "one-to-one")
-#parse("oneToOne.vm")
-#end
-#end
-##
-#if ($role.cardinality == "many-to-one" || $role.cardinality == "one-to-one")
-#set ($propertyType = $role.referencedTable.className)
-#elseif ($role.cardinality == "many-to-many" || $role.cardinality == "one-to-many")
-#set ($propertyType = "${role.referencedTable.defaultCollectionType}<${role.referencedTable.className}>")
-#end
-	public $propertyType $customizer.propertyGetter($role.propertyName)() {
-		return this.${role.propertyName};
-	}
-
-	public void ${customizer.propertySetter($role.propertyName)}($propertyType $role.propertyName) {
-		this.${role.propertyName} = $role.propertyName;
-	}
-	
-##
-#end
-##
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/manyToMany.vm b/jpa/plugins/org.eclipse.jpt.gen/templates/entities/manyToMany.vm
deleted file mode 100644
index fe3bfedd8b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/manyToMany.vm
+++ /dev/null
@@ -1,14 +0,0 @@
-##included template. Generates the @ManyToMany annotation.
-##Assumes that the context has a "role" object representing the generated AssociationRole
-##
-#if ($role.association.bidirectional && !$role.isReferrerRole())##the owning side (either side for many-to-many)
-#set ($members = $customizer.appendAnnotation("", "mappedBy", $role.oppositeRole.propertyName, true))
-#set ($members = $customizer.appendAnnotation($members, "cascade", $customizer.genCascades($role), false))
-#set ($members = $customizer.appendAnnotation($members, "fetch", $customizer.genFetch($role.referrerTable), false))
-	@ManyToMany($members)
-#else
-#set ($members = $customizer.appendAnnotation("", "cascade", $customizer.genCascades($role), false))
-#set ($members = $customizer.appendAnnotation($members, "fetch", $customizer.genFetch($role.referrerTable), false))
-	@ManyToMany($members)
-#parse("join.vm")
-#end
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/manyToOne.vm b/jpa/plugins/org.eclipse.jpt.gen/templates/entities/manyToOne.vm
deleted file mode 100644
index 8253462972..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/manyToOne.vm
+++ /dev/null
@@ -1,7 +0,0 @@
-##included template. Generates the @ManyToOne annotation.
-##Assumes that the context has a "role" object representing the generated AssociationRole
-##
-#set ($members = $customizer.appendAnnotation("", "cascade", $customizer.genCascades($role), false))
-#set ($members = $customizer.appendAnnotation($members, "fetch", $customizer.genFetch($role.referrerTable), false))
-	@ManyToOne($members)
-#parse("join.vm")
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/mappingKind.vm b/jpa/plugins/org.eclipse.jpt.gen/templates/entities/mappingKind.vm
deleted file mode 100644
index 4bc95386e3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/mappingKind.vm
+++ /dev/null
@@ -1,30 +0,0 @@
-##included template. Generates the @Basic, @Id, @Version annotations.
-##Assumes that the context has a "column" object
-##
-#set ($mappingKind = $column.mappingKind)
-#if ($mappingKind == "id")
-	@Id
-#set ($idGenerator = $table.idGenerator)
-#if ($idGenerator == "auto")
-#set ($generationType = "GenerationType.AUTO")
-#elseif ($idGenerator == "identity")
-#set ($generationType = "GenerationType.IDENTITY")
-#elseif ($idGenerator == "sequence")
-#set ($generationType = "GenerationType.SEQUENCE")
-#elseif ($idGenerator == "table")
-#set ($generationType = "GenerationType.TABLE")
-#else
-#set ($generationType = "")
-#end
-#if ($idGenerator == "sequence" || ($idGenerator == "auto" && $table.sequence))
-#set ($generatorName = "${table.name.toUpperCase()}_${column.propertyName.toUpperCase()}_GENERATOR")
-	@SequenceGenerator(name="$generatorName", sequenceName="$table.formattedSequence")
-	@GeneratedValue(strategy=$generationType, generator="$generatorName")
-#elseif ($generationType != "")
-	@GeneratedValue(strategy=$generationType)
-#end      
-#elseif ($mappingKind == "version")
-	@Version()
-#else
-##DEFAULT is @Basic(), no need to generate
-#end
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/oneToMany.vm b/jpa/plugins/org.eclipse.jpt.gen/templates/entities/oneToMany.vm
deleted file mode 100644
index bb89d5b885..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/oneToMany.vm
+++ /dev/null
@@ -1,14 +0,0 @@
-##included template. Generates the @OneToMany annotation.
-##Assumes that the context has a "role" object representing the generated AssociationRole
-##
-#if ($role.association.bidirectional)
-#set ($members = $customizer.appendAnnotation("", "mappedBy", $role.oppositeRole.propertyName, true))
-#set ($members = $customizer.appendAnnotation($members, "cascade", $customizer.genCascades($role), false))
-#set ($members = $customizer.appendAnnotation($members, "fetch", $customizer.genFetch($role.referrerTable), false))
-	@OneToMany($members)
-#else
-#set ($members = $customizer.appendAnnotation("", "cascade", $customizer.genCascades($role), false))
-#set ($members = $customizer.appendAnnotation($members, "fetch", $customizer.genFetch($role.referrerTable), false))
-	@OneToMany($members)
-#parse("join.vm")
-#end
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/oneToOne.vm b/jpa/plugins/org.eclipse.jpt.gen/templates/entities/oneToOne.vm
deleted file mode 100644
index 862c967802..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/oneToOne.vm
+++ /dev/null
@@ -1,14 +0,0 @@
-##included template. Generates the @OneToOne annotation.
-##Assumes that the context has a "role" object representing the generated AssociationRole
-##
-#if ($role.association.bidirectional && !$role.isReferrerRole())##the owning side (either side for one-to-one)
-#set ($members = $customizer.appendAnnotation("", "mappedBy", $role.oppositeRole.propertyName, true))
-#set ($members = $customizer.appendAnnotation($members, "cascade", $customizer.genCascades($role), false))
-#set ($members = $customizer.appendAnnotation($members, "fetch", $customizer.genFetch($role.referrerTable), false))
-	@OneToOne($members)
-#else
-#set ($members = $customizer.appendAnnotation("", "cascade", $customizer.genCascades($role), false))
-#set ($members = $customizer.appendAnnotation($members, "fetch", $customizer.genFetch($role.referrerTable), false))
-	@OneToOne($members)
-#parse("join.vm")
-#end
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/pk.java.vm b/jpa/plugins/org.eclipse.jpt.gen/templates/entities/pk.java.vm
deleted file mode 100644
index 780037e8a9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/pk.java.vm
+++ /dev/null
@@ -1,65 +0,0 @@
-#if ($table.package != "")
-package ${table.package};
-#end
-import java.io.Serializable;
-import javax.persistence.*;
-
-/**
- * The primary key class for the ${table.name} database table.
- * 
- */
-@Embeddable()
-public class ${table.compositeKeyClassName} implements Serializable {
-	//default serial version id, required for serializable classes.
-	private static final long serialVersionUID = 1L;
-#####
-##### fields
-#####
-#foreach ($column in $table.primaryKeyColumns)
-#if ($table.access == "field")
-
-#parse("column.vm")
-#end
-	${column.fieldScope} ${column.propertyType} ${column.propertyName};
-#end
-
-    public ${table.compositeKeyClassName}() {
-    }
-#####
-##### simple properties getters and setters
-#####
-#foreach ($column in $table.primaryKeyColumns)
-#if ($table.access == "property")
-
-#parse("column.vm")
-#end
-	$column.propertyGetScope $column.propertyType $customizer.propertyGetter($column.propertyName)() {
-		return this.${column.propertyName};
-	}
-	$column.propertySetScope void $customizer.propertySetter($column.propertyName)($column.propertyType $column.propertyName) {
-		this.${column.propertyName} = ${column.propertyName};
-	}
-#end
-##
-## equals/hashCode
-
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (!(other instanceof ${table.compositeKeyClassName})) {
-			return false;
-		}
-		${table.compositeKeyClassName} castOther = (${table.compositeKeyClassName})other;
-		return 
-			${table.primaryKeyEqualsClause}
-
-    }
-    
-	public int hashCode() {
-		final int prime = 31;
-		int hash = 17;
-		${table.primaryKeyHashCodeClause}
-		return hash;
-    }
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.utility/.classpath b/jpa/plugins/org.eclipse.jpt.utility/.classpath
deleted file mode 100644
index 304e86186a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/jpa/plugins/org.eclipse.jpt.utility/.cvsignore b/jpa/plugins/org.eclipse.jpt.utility/.cvsignore
deleted file mode 100644
index a128605b1f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-@dot
-temp.folder
-build.xml
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.utility/.project b/jpa/plugins/org.eclipse.jpt.utility/.project
deleted file mode 100644
index 99b389b9c5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jpt.utility</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/jpa/plugins/org.eclipse.jpt.utility/.settings/org.eclipse.core.resources.prefs b/jpa/plugins/org.eclipse.jpt.utility/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 8e5b2c2b65..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Jan 15 11:12:22 EST 2008
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/jpa/plugins/org.eclipse.jpt.utility/.settings/org.eclipse.jdt.core.prefs b/jpa/plugins/org.eclipse.jpt.utility/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 443826069d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sun May 27 14:55:37 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jpa/plugins/org.eclipse.jpt.utility/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.utility/META-INF/MANIFEST.MF
deleted file mode 100644
index 9f1f09d92a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,67 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.jpt.utility
-Bundle-Version: 1.3.0.qualifier
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jpt.utility,
- org.eclipse.jpt.utility.internal;
-  x-friends:="org.eclipse.jpt.core,
-   org.eclipse.jpt.db,
-   org.eclipse.jpt.db.ui,
-   org.eclipse.jpt.gen,
-   org.eclipse.jpt.ui",
- org.eclipse.jpt.utility.internal.iterators;
-  x-friends:="org.eclipse.jpt.core,
-   org.eclipse.jpt.db,
-   org.eclipse.jpt.db.ui,
-   org.eclipse.jpt.gen,
-   org.eclipse.jpt.ui",
- org.eclipse.jpt.utility.internal.model;
-  x-friends:="org.eclipse.jpt.core,
-   org.eclipse.jpt.db,
-   org.eclipse.jpt.db.ui,
-   org.eclipse.jpt.gen,
-   org.eclipse.jpt.ui",
- org.eclipse.jpt.utility.internal.model.listener.awt;
-  x-friends:="org.eclipse.jpt.core,
-   org.eclipse.jpt.db,
-   org.eclipse.jpt.db.ui,
-   org.eclipse.jpt.gen,
-   org.eclipse.jpt.ui",
- org.eclipse.jpt.utility.internal.model.value;
-  x-friends:="org.eclipse.jpt.core,
-   org.eclipse.jpt.db,
-   org.eclipse.jpt.db.ui,
-   org.eclipse.jpt.gen,
-   org.eclipse.jpt.ui",
- org.eclipse.jpt.utility.internal.model.value.prefs;
-  x-friends:="org.eclipse.jpt.core,
-   org.eclipse.jpt.db,
-   org.eclipse.jpt.db.ui,
-   org.eclipse.jpt.gen,
-   org.eclipse.jpt.ui",
- org.eclipse.jpt.utility.internal.model.value.swing;
-  x-friends:="org.eclipse.jpt.core,
-   org.eclipse.jpt.db,
-   org.eclipse.jpt.db.ui,
-   org.eclipse.jpt.gen,
-   org.eclipse.jpt.ui",
- org.eclipse.jpt.utility.internal.node;
-  x-friends:="org.eclipse.jpt.core,
-   org.eclipse.jpt.db,
-   org.eclipse.jpt.db.ui,
-   org.eclipse.jpt.gen,
-   org.eclipse.jpt.ui",
- org.eclipse.jpt.utility.internal.swing;
-  x-friends:="org.eclipse.jpt.core,
-   org.eclipse.jpt.db,
-   org.eclipse.jpt.db.ui,
-   org.eclipse.jpt.gen,
-   org.eclipse.jpt.ui",
- org.eclipse.jpt.utility.model,
- org.eclipse.jpt.utility.model.event,
- org.eclipse.jpt.utility.model.listener,
- org.eclipse.jpt.utility.model.value
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jpa/plugins/org.eclipse.jpt.utility/about.html b/jpa/plugins/org.eclipse.jpt.utility/about.html
deleted file mode 100644
index be534ba44f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 02, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor's license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/jpa/plugins/org.eclipse.jpt.utility/build.properties b/jpa/plugins/org.eclipse.jpt.utility/build.properties
deleted file mode 100644
index 11ab8d42f6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2007 Oracle. All rights reserved.
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v1.0, which accompanies this distribution
-# and is available at http://www.eclipse.org/legal/epl-v10.html.
-# 
-# Contributors:
-#     Oracle - initial API and implementation
-################################################################################
-javacSource=1.5
-javacTarget=1.5
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               META-INF/,\
-               about.html,\
-               plugin.properties
diff --git a/jpa/plugins/org.eclipse.jpt.utility/component.xml b/jpa/plugins/org.eclipse.jpt.utility/component.xml
deleted file mode 100644
index b210b281dd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jpt.utility"><description url=""></description><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jpt.utility" fragment="false"/></component>
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.utility/plugin.properties b/jpa/plugins/org.eclipse.jpt.utility/plugin.properties
deleted file mode 100644
index 95c029d5d8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/plugin.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2007 Oracle. All rights reserved.
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v1.0, which accompanies this distribution
-# and is available at http://www.eclipse.org/legal/epl-v10.html.
-# 
-# Contributors:
-#     Oracle - initial API and implementation
-################################################################################
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = Java Persistence API Tools - Utility
-providerName = Eclipse.org
-
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/Command.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/Command.java
deleted file mode 100644
index 60fbfaf6b6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/Command.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility;
-
-/**
- * Simple interface for implementing the GOF Command design pattern,
- * and it doesn't carry the baggage of java.lang.Runnable.
- * 
- * 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 Command {
-
-	/**
-	 * Execute the command. The semantics of the command
-	 * is determined by the contract between the client and server.
-	 */
-	void execute();
-
-	/**
-	 * Singleton implementation of the command interface that will do nothing
-	 * when executed.
-	 */
-	final class Null implements Command {
-		public static final Command INSTANCE = new Null();
-		public static Command instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Null() {
-			super();
-		}
-		public void execute() {
-			// do nothing
-		}
-		@Override
-		public String toString() {
-			return "Command.Null"; //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Singleton implementation of the command interface that will throw an
-	 * exception when executed.
-	 */
-	final class Disabled implements Command {
-		public static final Command INSTANCE = new Disabled();
-		public static Command instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Disabled() {
-			super();
-		}
-		// throw an exception
-		public void execute() {
-			throw new UnsupportedOperationException();
-		}
-		@Override
-		public String toString() {
-			return "Command.Disabled"; //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/CommandExecutor.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/CommandExecutor.java
deleted file mode 100644
index dde714a27e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/CommandExecutor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility;
-
-/**
- * This interface allows clients to control how a command is executed.
- * This is useful when the server provides the command but the client provides
- * the context (e.g. the client would like to dispatch the command to the UI
- * thread).
- * 
- * 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 CommandExecutor {
-
-	/**
-	 * Execute the specified command.
-	 */
-	void execute(Command command);
-
-
-	/**
-	 * Singleton implementation of the command executor interface
-	 * that simply executes the command without any sort of enhancement.
-	 */
-	final class Default implements CommandExecutor {
-		public static final CommandExecutor INSTANCE = new Default();
-		public static CommandExecutor instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Default() {
-			super();
-		}
-		public void execute(Command command) {
-			command.execute();
-		}
-		@Override
-		public String toString() {
-			return "CommandExecutor.Default"; //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/Filter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/Filter.java
deleted file mode 100644
index a1285a5847..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/Filter.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility;
-
-/**
- * Used by various "pluggable" classes to filter objects.
- * 
- * 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 Filter<T> {
-
-	/**
-	 * Return whether the specified object is "accepted" by the
-	 * filter. The semantics of "accept" is determined by the
-	 * contract between the client and the server.
-	 */
-	boolean accept(T o);
-
-
-	/**
-	 * Singleton implemetation of the filter interface that accepts all the
-	 * objects (i.e. it does no filtering).
-	 */
-	final class Null<S> implements Filter<S> {
-		@SuppressWarnings("unchecked")
-		public static final Filter INSTANCE = new Null();
-		@SuppressWarnings("unchecked")
-		public static <R> Filter<R> instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Null() {
-			super();
-		}
-		// nothing is filtered - everything is accepted
-		public boolean accept(S o) {
-			return true;
-		}
-		@Override
-		public String toString() {
-			return "Filter.Null";  //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Singleton implemetation of the filter interface that accepts none of the
-	 * objects (i.e. it filters out all the objects).
-	 */
-	final class Opaque<S> implements Filter<S> {
-		@SuppressWarnings("unchecked")
-		public static final Filter INSTANCE = new Opaque();
-		@SuppressWarnings("unchecked")
-		public static <R> Filter<R> instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Opaque() {
-			super();
-		}
-		// everything is filtered - nothing is accepted
-		public boolean accept(S o) {
-			return false;
-		}
-		@Override
-		public String toString() {
-			return "Filter.Opaque";  //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Singleton implemetation of the filter interface that throws an exception
-	 * if called.
-	 */
-	final class Disabled<S> implements Filter<S> {
-		@SuppressWarnings("unchecked")
-		public static final Filter INSTANCE = new Disabled();
-		@SuppressWarnings("unchecked")
-		public static <R> Filter<R> instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Disabled() {
-			super();
-		}
-		// throw an exception
-		public boolean accept(S o) {
-			throw new UnsupportedOperationException();
-		}
-		@Override
-		public String toString() {
-			return "Filter.Disabled";  //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/JavaType.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/JavaType.java
deleted file mode 100644
index cfba58e7a9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/JavaType.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility;
-
-import java.io.PrintWriter;
-
-/**
- * This interface describes a Java type; i.e. its "element type"
- * and its "array depth". The element type is referenced by name,
- * allowing us to reference classes that are not (or cannot be) loaded.
- * 
- * 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.
- * 
- * This interface is not intended to be implemented by clients.
- */
-public interface JavaType
-	extends Comparable<JavaType>
-{
-
-	/**
-	 * Return the name of the type's "element type".
-	 * A member type will have one or more '$' characters in its name.
-	 */
-	String getElementTypeName();
-
-	/**
-	 * Return the type's "array depth".
-	 */
-	int getArrayDepth();
-
-	/**
-	 * Return whether the type is an array (i.e. its "array depth" is greater
-	 * than zero).
-	 */
-	boolean isArray();
-
-	/**
-	 * Return whether the type is a "primitive" (e.g. 'int', 'float').
-	 * NB: void.class.isPrimitive() == true
-	 */
-	boolean isPrimitive();
-
-	/**
-	 * Return whether the type is a "primitive" (e.g. 'java.lang.Integer',
-	 * 'java.lang.Float').
-	 * NB: void.class.isPrimitive() == true
-	 */
-	boolean isPrimitiveWrapper();
-
-	/**
-	 * Return whether the type is a "variable primitive" (e.g. 'int', 'float',
-	 * but not 'void').
-	 * NB: variables cannot be declared 'void'
-	 */
-	boolean isVariablePrimitive();
-
-	/**
-	 * Return whether the type is a "variable primitive" (e.g.
-	 * 'java.lang.Integer', 'java.lang.Float', but not 'java.lang.Void').
-	 * NB: variables cannot be declared 'void'
-	 */
-	boolean isVariablePrimitiveWrapper();
-
-	/**
-	 * Return the class corresponding to the type's element type and array depth.
-	 */
-	Class<?> getJavaClass() throws ClassNotFoundException;
-
-	/**
-	 * Return the version of the type's name that matches that
-	 * returned by java.lang.Class#getName()
-	 * (e.g. "[[J", "[Ljava.lang.Object;", "java.util.Map$Entry").
-	 */
-	String getJavaClassName();
-
-	/**
-	 * Return whether the type is equal to the specified type.
-	 */
-	boolean equals(String otherElementTypeName, int otherArrayDepth);
-
-	/**
-	 * Return whether the type describes to the specified type.
-	 */
-	boolean describes(String className);
-
-	/**
-	 * Return whether the type describes to the specified type.
-	 */
-	boolean describes(Class<?> javaClass);
-
-	/**
-	 * Return whether the type is equal to the specified type.
-	 */
-	boolean equals(JavaType other);
-
-	/**
-	 * Return the version of the type's name that can be used in source code:
-	 *     "[[J" => "long[][]"
-	 *     "java.util.Map$Entry" => "java.util.Map.Entry"
-	 */
-	String declaration();
-
-	/**
-	 * Append the version of the type's name that can be used in source code:
-	 *     "[[J" => "long[][]"
-	 *     "java.util.Map$Entry" => "java.util.Map.Entry"
-	 */
-	void appendDeclarationTo(StringBuilder sb);
-
-	/**
-	 * Print the version of the type's name that can be used in source code:
-	 *     "[[J" => "long[][]"
-	 *     "java.util.Map$Entry" => "java.util.Map.Entry"
-	 */
-	void printDeclarationOn(PrintWriter pw);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/MethodSignature.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/MethodSignature.java
deleted file mode 100644
index 00adfd998e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/MethodSignature.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility;
-
-import java.io.PrintWriter;
-import java.lang.reflect.Method;
-
-/**
- * This interface describes a Java method signature; i.e. its "name"
- * and its "parameter types". The parameter types are referenced by name,
- * allowing us to reference classes that are not (or cannot be) loaded.
- * 
- * 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.
- * 
- * This interface is not intended to be implemented by clients.
- */
-public interface MethodSignature
-	extends Comparable<MethodSignature>
-{
-
-	/**
-	 * Return the method's name.
-	 */
-	String getName();
-
-	/**
-	 * Return the method's parameter types.
-	 */
-	JavaType[] getParameterTypes();
-
-	/**
-	 * Return whether the method signature describes the specified method.
-	 */
-	boolean describes(Method method);
-
-	/**
-	 * Return whether the method signature equals the specified signature.
-	 */
-	boolean equals(String otherName, JavaType[] otherParameterTypes);
-
-	/**
-	 * Return whether the method signature equals the specified signature.
-	 */
-	boolean equals(MethodSignature other);
-
-	/**
-	 * Return a string representation of the method's signature:
-	 *     "foo(int, java.lang.String)"
-	 */
-	String getSignature();
-
-	/**
-	 * Append a string representation of the method's signature:
-	 *     "foo(int, java.lang.String)"
-	 */
-	void appendSignatureTo(StringBuilder sb);
-
-	/**
-	 * Print a string representation of the method's signature:
-	 *     "foo(int, java.lang.String)"
-	 */
-	void printSignatureOn(PrintWriter pw);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/AbstractAssociation.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/AbstractAssociation.java
deleted file mode 100644
index 6a9eb210af..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/AbstractAssociation.java
+++ /dev/null
@@ -1,50 +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.utility.internal;
-
-/**
- * Implement some of the methods in Association that can
- * be defined in terms of the other methods.
- */
-public abstract class AbstractAssociation<K, V>
-	implements Association<K, V>
-{
-
-	/**
-	 * Default constructor.
-	 */
-	protected AbstractAssociation() {
-		super();
-	}
-
-	@Override
-	public synchronized boolean equals(Object o) {
-		if ( ! (o instanceof Association)) {
-			return false;
-		}
-		Association<?, ?> other = (Association<?, ?>) o;
-		return (this.key() == null ?
-					other.key() == null : this.key().equals(other.key()))
-			&& (this.value() == null ?
-					other.value() == null : this.value().equals(other.value()));
-	}
-
-	@Override
-	public synchronized int hashCode() {
-		return (this.key() == null ? 0 : this.key().hashCode())
-			^ (this.value() == null ? 0 : this.value().hashCode());
-	}
-
-	@Override
-	public synchronized String toString() {
-		return this.key() + " => " + this.value(); //$NON-NLS-1$
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Association.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Association.java
deleted file mode 100644
index 03130e89be..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Association.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-/**
- * Straightforward definition of an object pairing.
- * The key is immutable.
- */
-public interface Association<K, V> {
-
-	/**
-	 * Return the association's key.
-	 */
-	K key();
-
-	/**
-	 * Return the association's value.
-	 */
-	V value();
-
-	/**
-	 * Set the association's value.
-	 * Return the previous value.
-	 */
-	V setValue(V value);
-
-	/**
-	 * Return true if both the associations' keys and values
-	 * are equal.
-	 */
-	boolean equals(Object o);
-
-	/**
-	 * Return a hash code based on the association's
-	 * key and value.
-	 */
-	int hashCode();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Bag.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Bag.java
deleted file mode 100644
index b2c7223a40..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Bag.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import java.io.Serializable;
-import java.util.AbstractCollection;
-import java.util.Iterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-
-/**
- * A collection that allows duplicate elements.
- * <p>
- * The <code>Bag</code> interface places additional stipulations,
- * beyond those inherited from the <code>java.util.Collection</code> interface,
- * on the contracts of the <code>equals</code> and <code>hashCode</code> methods.
- * 
- * @see HashBag
- */
-
-public interface Bag<E> extends java.util.Collection<E> {
-
-	/**
-	 * Compares the specified object with this bag for equality. Returns
-	 * <code>true</code> if the specified object is also a bag, the two bags
-	 * have the same size, and every member of the specified bag is
-	 * contained in this bag with the same number of occurrences (or equivalently,
-	 * every member of this bag is contained in the specified bag with the same
-	 * number of occurrences). This definition ensures that the
-	 * equals method works properly across different implementations of the
-	 * bag interface.
-	 */
-	boolean equals(Object o);
-
-	/**
-	 * Returns the hash code value for this bag. The hash code of a bag is
-	 * defined to be the sum of the hash codes of the elements in the bag,
-	 * where the hashcode of a <code>null</code> element is defined to be zero.
-	 * This ensures that <code>b1.equals(b2)</code> implies that
-	 * <code>b1.hashCode() == b2.hashCode()</code> for any two bags
-	 * <code>b1</code> and <code>b2</code>, as required by the general
-	 * contract of the <code>Object.hashCode</code> method.
-	 */
-	int hashCode();
-
-	/**
-	 * Return the number of times the specified object occurs in the bag.
-	 */
-	int count(Object o);
-
-	/**
-	 * Add the specified object the specified number of times to the bag.
-	 */
-	boolean add(E o, int count);
-
-	/**
-	 * Remove the specified number of occurrences of the specified object
-	 * from the bag. Return whether the bag changed.
-	 */
-	boolean remove(Object o, int count);
-
-	/**
-	 * Return an iterator that returns each item in the bag
-	 * once and only once, irrespective of how many times
-	 * the item was added to the bag.
-	 */
-	java.util.Iterator<E> uniqueIterator();
-
-	/**
-	 * Return an iterator that returns an entry for each item in the bag
-	 * once and only once, irrespective of how many times
-	 * the item was added to the bag. The entry will indicate the item's
-	 * count.
-	 */
-	java.util.Iterator<Entry<E>> entries();
-
-
-	/**
-	 * A bag entry (element-count pair).
-	 * The <code>Bag.entries</code> method returns an iterator whose
-	 * elements are of this class. The <i>only</i> way to obtain a reference
-	 * to a bag entry is from the iterator returned by this method. These
-	 * <code>Bag.Entry</code> objects are valid <i>only</i> for the duration
-	 * of the iteration; more formally, the behavior of a bag entry is
-	 * undefined if the backing bag has been modified after the entry was
-	 * returned by the iterator, except through the <code>setCount</code>
-	 * operation on the bag entry.
-	 */
-	interface Entry<E> {
-
-		/**
-		 * Return the entry's element.
-		 */
-		E getElement();
-
-		/**
-		 * Return entry's count; i.e. the number of times the entry's element
-		 * occurs in the bag.
-		 * @see Bag#count(Object)
-		 */
-		int getCount();
-
-		/**
-		 * Set the entry's count; i.e. the number of times the entry's element
-		 * occurs in the bag. The new count must be a positive number.
-		 * Return the previous count of the entry's element.
-		 * NB: Use the iterator's <code>remove</code> method to set the
-		 * count to zero.
-		 */
-		int setCount(int count);
-
-		/**
-		 * Return whether the entry is equal to the specified object;
-		 * i.e. the specified object is a <code>Bag.Entry</code> and its
-		 * element and count are the same as the entry's.
-		 */
-		boolean equals(Object obj);
-
-		/**
-		 * Return the entry's hash code.
-		 */
-		int hashCode();
-
-	}
-
-
-	final class Empty<E> extends AbstractCollection<E> implements Bag<E>, Serializable {
-		@SuppressWarnings("unchecked")
-		public static final Bag INSTANCE = new Empty();
-		@SuppressWarnings("unchecked")
-		public static <T> Bag<T> instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Empty() {
-			super();
-		}
-		@Override
-		public Iterator<E> iterator() {
-			return EmptyIterator.instance();
-		}
-		@Override
-		public int size() {
-			return 0;
-		}
-		public Iterator<E> uniqueIterator() {
-			return EmptyIterator.instance();
-		}
-		public int count(Object o) {
-			return 0;
-		}
-		public Iterator<Bag.Entry<E>> entries() {
-			return EmptyIterator.instance();
-		}
-		public boolean remove(Object o, int count) {
-			return false;
-		}
-		public boolean add(E o, int count) {
-			throw new UnsupportedOperationException();
-		}
-		@Override
-		public boolean equals(Object o) {
-			if (o == this) {
-				return true;
-			}
-			if ( ! (o instanceof Bag)) {
-				return false;
-			}
-			return ((Bag<?>) o).size() == 0;
-		}
-		@Override
-		public int hashCode() {
-			return 0;
-		}
-		private static final long serialVersionUID = 1L;
-		private Object readResolve() {
-			return INSTANCE;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/BidiFilter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/BidiFilter.java
deleted file mode 100644
index e7bdf8c663..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/BidiFilter.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import org.eclipse.jpt.utility.Filter;
-
-/**
- * Used by various "pluggable" classes to filter objects
- * in both directions.
- * 
- * If anyone can come up with a better class name
- * and/or method name, I would love to hear it.  ~bjv
- */
-public interface BidiFilter<T> extends Filter<T> {
-
-	/**
-	 * Return whether the specified object is "accepted" by the
-	 * "reverse" filter. What that means is determined by the client.
-	 */
-	boolean reverseAccept(T o);
-
-
-	final class Null<S> implements BidiFilter<S> {
-		@SuppressWarnings("unchecked")
-		public static final BidiFilter INSTANCE = new Null();
-		@SuppressWarnings("unchecked")
-		public static <R> BidiFilter<R> instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Null() {
-			super();
-		}
-		// nothing is filtered - everything is accepted
-		public boolean accept(S o) {
-			return true;
-		}
-		// nothing is "reverse-filtered" - everything is accepted
-		public boolean reverseAccept(S o) {
-			return true;
-		}
-		@Override
-		public String toString() {
-			return "BidiFilter.Null"; //$NON-NLS-1$
-		}
-	}
-
-	final class Opaque<S> implements BidiFilter<S> {
-		@SuppressWarnings("unchecked")
-		public static final BidiFilter INSTANCE = new Opaque();
-		@SuppressWarnings("unchecked")
-		public static <R> BidiFilter<R> instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Opaque() {
-			super();
-		}
-		// everything is filtered - nothing is accepted
-		public boolean accept(S o) {
-			return false;
-		}
-		// everything is "reverse-filtered" - nothing is accepted
-		public boolean reverseAccept(S o) {
-			return false;
-		}
-		@Override
-		public String toString() {
-			return "BidiFilter.Opaque"; //$NON-NLS-1$
-		}
-	}
-
-	final class Disabled<S> implements BidiFilter<S> {
-		@SuppressWarnings("unchecked")
-		public static final BidiFilter INSTANCE = new Disabled();
-		@SuppressWarnings("unchecked")
-		public static <R> BidiFilter<R> instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Disabled() {
-			super();
-		}
-		// throw an exception
-		public boolean accept(S o) {
-			throw new UnsupportedOperationException();
-		}
-		// throw an exception
-		public boolean reverseAccept(S o) {
-			throw new UnsupportedOperationException();
-		}
-		@Override
-		public String toString() {
-			return "BidiFilter.Disabled"; //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/BidiStringConverter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/BidiStringConverter.java
deleted file mode 100644
index 5d2259d824..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/BidiStringConverter.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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.utility.internal;
-
-/**
- * Used by various "pluggable" classes to transform objects
- * into strings and vice versa.
- * 
- * If anyone can come up with a better class name
- * and/or method name, I would love to hear it.  ~bjv
- */
-public interface BidiStringConverter<T> extends StringConverter<T> {
-
-	/**
-	 * Convert the specified string into an object.
-	 * The semantics of "convert to object" is determined by the
-	 * contract between the client and the server.
-	 * Typically, if the string is null, null is returned.
-	 */
-	T convertToObject(String s);
-
-
-	final class Default<S> implements BidiStringConverter<S> {
-		@SuppressWarnings("unchecked")
-		public static final BidiStringConverter INSTANCE = new Default();
-		@SuppressWarnings("unchecked")
-		public static <R> BidiStringConverter<R> instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Default() {
-			super();
-		}
-		// simply return the object's #toString() result
-		public String convertToString(S o) {
-			return (o == null) ? null : o.toString();
-		}
-		// simply return the string
-		@SuppressWarnings("unchecked")
-		public S convertToObject(String s) {
-			return (S) s;
-		}
-		@Override
-		public String toString() {
-			return "BidiStringConverter.Default"; //$NON-NLS-1$
-		}
-	}
-
-	final class Disabled<S> implements BidiStringConverter<S> {
-		@SuppressWarnings("unchecked")
-		public static final BidiStringConverter INSTANCE = new Disabled();
-		@SuppressWarnings("unchecked")
-		public static <R> BidiStringConverter<R> instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Disabled() {
-			super();
-		}
-		// throw an exception
-		public String convertToString(S o) {
-			throw new UnsupportedOperationException();
-		}
-		// throw an exception
-		public S convertToObject(String s) {
-			throw new UnsupportedOperationException();
-		}
-		@Override
-		public String toString() {
-			return "BidiStringConverter.Disabled"; //$NON-NLS-1$
-		}
-	}
-
-	final class BooleanConverter implements BidiStringConverter<Boolean> {
-		public static final BidiStringConverter<Boolean> INSTANCE = new BooleanConverter();
-		public static BidiStringConverter<Boolean> instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private BooleanConverter() {
-			super();
-		}
-		/** Return "true" if the Boolean is true, otherwise return "false". */
-		public String convertToString(Boolean b) {
-			return (b == null) ? null : b.toString();
-		}
-		/** Return Boolean.TRUE if the string is "true" (case-insensitive), otherwise return Boolean.FALSE. */
-		public Boolean convertToObject(String s) {
-			return (s == null) ? null : Boolean.valueOf(s);
-		}
-		@Override
-		public String toString() {
-			return "BidiStringConverter.BooleanConverter"; //$NON-NLS-1$
-		}
-	}
-
-	final class IntegerConverter implements BidiStringConverter<Integer> {
-		public static final BidiStringConverter<Integer> INSTANCE = new IntegerConverter();
-		public static BidiStringConverter<Integer> instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private IntegerConverter() {
-			super();
-		}
-		/** Integer's #toString() works well. */
-		public String convertToString(Integer integer) {
-			return (integer == null) ? null : integer.toString();
-		}
-		/** Convert the string to an Integer, if possible. */
-		public Integer convertToObject(String s) {
-			return (s == null) ? null : Integer.valueOf(s);
-		}
-		@Override
-		public String toString() {
-			return "BidiStringConverter.IntegerConverter"; //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/BidiTransformer.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/BidiTransformer.java
deleted file mode 100644
index 80161bccba..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/BidiTransformer.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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.utility.internal;
-
-/**
- * Used by various "pluggable" classes to transform objects
- * in both directions.
- * 
- * If anyone can come up with a better class name
- * and/or method name, I would love to hear it.  ~bjv
- */
-public interface BidiTransformer<T1, T2> extends Transformer<T1, T2> {
-
-	/**
-	 * Return the "reverse-transformed" object.
-	 * The semantics of "reverse-transform" is determined by the
-	 * contract between the client and the server.
-	 */
-	T1 reverseTransform(T2 o);
-
-
-	final class Null<S1, S2> implements BidiTransformer<S1, S2> {
-		@SuppressWarnings("unchecked")
-		public static final BidiTransformer INSTANCE = new Null();
-		@SuppressWarnings("unchecked")
-		public static <R1, R2> BidiTransformer<R1, R2> instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Null() {
-			super();
-		}
-		// simply return the object, unchanged
-		@SuppressWarnings("unchecked")
-		public S2 transform(S1 o) {
-			return (S2) o;
-		}
-		// simply return the object, unchanged
-		@SuppressWarnings("unchecked")
-		public S1 reverseTransform(S2 o) {
-			return (S1) o;
-		}
-		@Override
-		public String toString() {
-			return "BidiTransformer.Null"; //$NON-NLS-1$
-		}
-	}
-
-	final class Disabled<S1, S2> implements BidiTransformer<S1, S2> {
-		@SuppressWarnings("unchecked")
-		public static final BidiTransformer INSTANCE = new Disabled();
-		@SuppressWarnings("unchecked")
-		public static <R1, R2> BidiTransformer<R1, R2> instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Disabled() {
-			super();
-		}
-		// throw an exception
-		public S2 transform(S1 o) {
-			throw new UnsupportedOperationException();
-		}
-		// throw an exception
-		public S1 reverseTransform(S2 o) {
-			throw new UnsupportedOperationException();
-		}
-		@Override
-		public String toString() {
-			return "BidiTransformer.Disabled"; //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/BitTools.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/BitTools.java
deleted file mode 100644
index 544f5bba82..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/BitTools.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-/**
- * Assorted bit tools
- */
-public class BitTools {
-
-	/**
-	 * Return whether the specified 'flags' has the specified
-	 * 'flagToCheck' set.
-	 */
-	public static boolean flagIsSet(int flags, int flagToCheck) {
-		return allFlagsAreSet(flags, flagToCheck);
-	}
-
-	/**
-	 * Return whether the specified 'flags' has the specified
-	 * 'flagToCheck' turned off.
-	 */
-	public static boolean flagIsOff(int flags, int flagToCheck) {
-		return allFlagsAreOff(flags, flagToCheck);
-	}
-
-	/**
-	 * Return whether the specified 'flags' has ONLY the specified
-	 * 'flagToCheck' set.
-	 */
-	public static boolean onlyFlagIsSet(int flags, int flagToCheck) {
-		return onlyFlagsAreSet(flags, flagToCheck);
-	}
-
-	/**
-	 * Return whether the specified 'flags' has ONLY the specified
-	 * 'flagToCheck' turned off.
-	 */
-	public static boolean onlyFlagIsOff(int flags, int flagToCheck) {
-		return onlyFlagsAreOff(flags, flagToCheck);
-	}
-
-	/**
-	 * Return whether the specified 'flags' has all the specified
-	 * 'flagsToCheck' set.
-	 */
-	public static boolean allFlagsAreSet(int flags, int flagsToCheck) {
-		return (flags & flagsToCheck) == flagsToCheck;
-	}
-
-	/**
-	 * Return whether the specified 'flags' has all the specified
-	 * 'flagsToCheck' turned off.
-	 */
-	public static boolean allFlagsAreOff(int flags, int flagsToCheck) {
-		return (flags & flagsToCheck) == 0;
-	}
-
-	/**
-	 * Return whether the specified 'flags' has ONLY the specified
-	 * 'flagsToCheck' set.
-	 */
-	public static boolean onlyFlagsAreSet(int flags, int flagsToCheck) {
-		return allFlagsAreSet(flags, flagsToCheck) && allFlagsAreOff(flags, ~flagsToCheck);
-	}
-
-	/**
-	 * Return whether the specified 'flags' has ONLY the specified
-	 * 'flagsToCheck' turned off.
-	 */
-	public static boolean onlyFlagsAreOff(int flags, int flagsToCheck) {
-		return allFlagsAreOff(flags, flagsToCheck) && allFlagsAreSet(flags, ~flagsToCheck);
-	}
-
-	/**
-	 * Return whether the specified 'flags' has any one of the specified
-	 * 'flagsToCheck' set.
-	 */
-	public static boolean anyFlagsAreSet(int flags, int flagsToCheck) {
-		return (flags & flagsToCheck) != 0;
-	}
-
-	/**
-	 * Return whether the specified 'flags' has any one of the specified
-	 * 'flagsToCheck' turned off.
-	 */
-	public static boolean anyFlagsAreOff(int flags, int flagsToCheck) {
-		return (flags & flagsToCheck) != flagsToCheck;
-	}
-
-	/**
-	 * Return whether the specified 'flags' has all the specified
-	 * 'flagsToCheck' set.
-	 */
-	public static boolean allFlagsAreSet(int flags, int[] flagsToCheck) {
-		for (int i = flagsToCheck.length; i-- > 0; ) {
-			if ( ! allFlagsAreSet(flags, flagsToCheck[i])) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Return whether the specified 'flags' has all the specified
-	 * 'flagsToCheck' turned off.
-	 */
-	public static boolean allFlagsAreOff(int flags, int[] flagsToCheck) {
-		for (int i = flagsToCheck.length; i-- > 0; ) {
-			if ( ! allFlagsAreOff(flags, flagsToCheck[i])) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Return whether the specified 'flags' has ONLY the specified
-	 * 'flagsToCheck' set.
-	 */
-	public static boolean onlyFlagsAreSet(int flags, int[] flagsToCheck) {
-		int combinedFlags = orFlags(flagsToCheck);
-		return allFlagsAreSet(flags, combinedFlags) && allFlagsAreOff(flags, ~combinedFlags);
-	}
-
-	/**
-	 * Return whether the specified 'flags' has ONLY the specified
-	 * 'flagsToCheck' turned off.
-	 */
-	public static boolean onlyFlagsAreOff(int flags, int[] flagsToCheck) {
-		int combinedFlags = orFlags(flagsToCheck);
-		return allFlagsAreOff(flags, combinedFlags) && allFlagsAreSet(flags, ~combinedFlags);
-	}
-
-	/**
-	 * Return whether the specified 'flags' has any one of the specified
-	 * 'flagsToCheck' set.
-	 */
-	public static boolean anyFlagsAreSet(int flags, int[] flagsToCheck) {
-		for (int i = flagsToCheck.length; i-- > 0; ) {
-			if (anyFlagsAreSet(flags, flagsToCheck[i])) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Return whether the specified 'flags' has any one of the specified
-	 * 'flagsToCheck' turned off.
-	 */
-	public static boolean anyFlagsAreOff(int flags, int[] flagsToCheck) {
-		for (int i = flagsToCheck.length; i-- > 0; ) {
-			if (anyFlagsAreOff(flags, flagsToCheck[i])) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * OR all the specified 'flags' together and return the result.
-	 */
-	public static int orFlags(int[] flags) {
-		int last = flags.length - 1;
-		int result = flags[last];
-		for (int i = last; i-- > 0; ) {
-			result |= flags[i];
-		}
-		return result;
-	}
-
-	/**
-	 * AND all the specified 'flags' together and return the result.
-	 */
-	public static int andFlags(int[] flags) {
-		int last = flags.length - 1;
-		int result = flags[last];
-		for (int i = last; i-- > 0; ) {
-			result &= flags[i];
-		}
-		return result;
-	}
-
-	/**
-	 * XOR all the specified 'flags' together and return the result.
-	 */
-	public static int xorFlags(int[] flags) {
-		int last = flags.length - 1;
-		int result = flags[last];
-		for (int i = last; i-- > 0; ) {
-			result ^= flags[i];
-		}
-		return result;
-	}
-
-
-	// ********** constructor **********
-
-	/**
-	 * Suppress default constructor, ensuring non-instantiability.
-	 */
-	private BitTools() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/BooleanHolder.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/BooleanHolder.java
deleted file mode 100644
index e014e4eea1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/BooleanHolder.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import java.io.Serializable;
-
-/**
- * Provide a container for passing a flag that can be changed by the recipient.
- * @see SynchronizedBoolean
- */
-public class BooleanHolder
-	implements Cloneable, Serializable
-{
-	/** Backing boolean. */
-	private boolean value;
-
-	private static final long serialVersionUID = 1L;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Create a boolean holder with the specified initial value.
-	 */
-	public BooleanHolder(boolean value) {
-		super();
-		this.value = value;
-	}
-
-	/**
-	 * Create a boolean holder with an initial value of false.
-	 */
-	public BooleanHolder() {
-		this(false);
-	}
-
-
-	// ********** accessors **********
-
-	/**
-	 * Return the current boolean value.
-	 */
-	public boolean getValue() {
-		return this.value;
-	}
-
-	/**
-	 * Return whether the current boolean value is true.
-	 */
-	public boolean isTrue() {
-		return this.value;
-	}
-
-	/**
-	 * Return whether the current boolean value is false.
-	 */
-	public boolean isFalse() {
-		return ! this.value;
-	}
-
-	/**
-	 * Return whether the current boolean value is the specified value.
-	 */
-	public boolean is(boolean v) {
-		return this.value == v;
-	}
-
-	/**
-	 * Set the boolean value.
-	 */
-	public void setValue(boolean value) {
-		this.value = value;
-	}
-
-	/**
-	 * Set the boolean value to true.
-	 */
-	public void setTrue() {
-		this.value = true;
-	}
-
-	/**
-	 * Set the boolean value to false.
-	 */
-	public void setFalse() {
-		this.value = false;
-	}
-
-
-	// ********** standard methods **********
-
-	@Override
-	public Object clone() {
-		try {
-			return super.clone();
-		} catch (CloneNotSupportedException ex) {
-			throw new InternalError();
-		}
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (o instanceof BooleanHolder) {
-			return this.value == ((BooleanHolder) o).value;
-		}
-		return false;
-	}
-
-	@Override
-	public int hashCode() {
-		return this.value ? 1 : 0;
-	}
-
-	@Override
-	public String toString() {
-		return '[' + String.valueOf(this.value) + ']';
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/ClassTools.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/ClassTools.java
deleted file mode 100644
index 358a4b6950..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/ClassTools.java
+++ /dev/null
@@ -1,1711 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.utility.internal;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Collections;
-import java.util.Stack;
-
-/**
- * Convenience methods related to the java.lang.reflect package.
- * These methods provide shortcuts for manipulating objects via
- * reflection; particularly when dealing with fields and/or methods that
- * are not publicly accessible or are inherited.
- * 
- * In most cases, all the exceptions are handled and
- * wrapped in java.lang.RuntimeExceptions; so these methods should
- * be used when you are confident that you will not having any problems
- * using reflection.
- * 
- * There are also a number of methods whose names
- * begin with "attempt". These methods will throw a NoSuchMethodException
- * or NoSuchFieldException when appropriate, allowing you to probe
- * for methods that should be present but might not.
- */
-public final class ClassTools {
-
-	public static final Class<?>[] ZERO_PARAMETER_TYPES = new Class[0];
-	public static final Object[] ZERO_PARAMETERS = new Object[0];
-	private static final String CR = StringTools.CR;
-
-	public static final char NESTED_CLASS_NAME_SEPARATOR = '$';
-
-	public static final char ARRAY_INDICATOR = '[';
-	public static final char TYPE_DECLARATION_ARRAY_OPEN = '[';
-	public static final char TYPE_DECLARATION_ARRAY_CLOSE = ']';
-
-	public static final char REFERENCE_CLASS_CODE = 'L';
-	public static final char REFERENCE_CLASS_NAME_DELIMITER = ';';
-	
-	private static Primitive[] PRIMITIVES;  // pseudo-'final' - lazy-initialized
-	public static final char BYTE_CODE = 'B';
-	public static final char CHAR_CODE = 'C';
-	public static final char DOUBLE_CODE = 'D';
-	public static final char FLOAT_CODE = 'F';
-	public static final char INT_CODE = 'I';
-	public static final char LONG_CODE = 'J';
-	public static final char SHORT_CODE = 'S';
-	public static final char BOOLEAN_CODE = 'Z';
-	public static final char VOID_CODE = 'V';
-	private static int MAX_PRIMITIVE_CLASS_NAME_LENGTH = -1;  // pseudo-'final' - lazy-initialized
-	private static int MAX_PRIMITIVE_WRAPPER_CLASS_NAME_LENGTH = -1;  // pseudo-'final' - lazy-initialized
-
-	public static final String VOID_CLASS_NAME = void.class.getName();
-	public static final String VOID_WRAPPER_CLASS_NAME = java.lang.Void.class.getName();
-
-
-	/**
-	 * Return all the fields for the
-	 * specified class, including inherited fields.
-	 * Class#allFields()
-	 */
-	public static Field[] allFields(Class<?> javaClass) {
-		Stack<Field> stack = new Stack<Field>();
-		for (Class<?> tempClass = javaClass; tempClass != null; tempClass = tempClass.getSuperclass()) {
-			pushDeclaredFields(tempClass, stack);
-		}
-		Collections.reverse(stack);
-		return stack.toArray(new Field[stack.size()]);
-	}
-	
-	/**
-	 * Return all the methods for the
-	 * specified class, including inherited methods.
-	 * Class#allMethods()
-	 */
-	public static Method[] allMethods(Class<?> javaClass) {
-		Stack<Method> stack = new Stack<Method>();
-		for (Class<?> tempClass = javaClass; tempClass != null; tempClass = tempClass.getSuperclass()) {
-			pushDeclaredMethods(tempClass, stack);
-		}
-		Collections.reverse(stack);
-		return stack.toArray(new Method[stack.size()]);
-	}
-	
-	/**
-	 * Convenience method.
-	 * Return a new instance of the specified class,
-	 * using the class's default (zero-argument) constructor.
-	 * Throw an exception if the default constructor is not defined.
-	 * Class#newInstance() throws NoSuchMethodException
-	 */
-	public static <T> T attemptNewInstance(Class<T> javaClass) throws NoSuchMethodException {
-		return attemptNewInstance(javaClass, ZERO_PARAMETER_TYPES, ZERO_PARAMETERS);
-	}
-	
-	/**
-	 * Return a new instance of the specified class,
-	 * given the constructor parameter types and parameters.
-	 * Throw an exception if the constructor is not defined.
-	 * Class#newInstance(Class<?>[] parameterTypes, Object[] parameters) throws NoSuchMethodException
-	 */
-	public static <T> T attemptNewInstance(Class<T> javaClass, Class<?>[] parameterTypes, Object[] parameters) throws NoSuchMethodException {
-		try {
-			return constructor(javaClass, parameterTypes).newInstance(parameters);
-		} catch (InstantiationException ie) {
-			throw new RuntimeException(ie + CR + fullyQualifiedConstructorSignature(javaClass, parameterTypes), ie);
-		} catch (IllegalAccessException iae) {
-			throw new RuntimeException(iae + CR + fullyQualifiedConstructorSignature(javaClass, parameterTypes), iae);
-		} catch (InvocationTargetException ite) {
-			throw new RuntimeException(fullyQualifiedConstructorSignature(javaClass, parameterTypes) + CR + ite.getTargetException(), ite);
-		}
-	}
-	
-	/**
-	 * Convenience method.
-	 * Return a new instance of the specified class,
-	 * given the constructor parameter type and parameter.
-	 * Throw an exception if the constructor is not defined.
-	 * Class#newInstance(Class<?> parameterType, Object parameter) throws NoSuchMethodException
-	 */
-	public static <T> T attemptNewInstance(Class<T> javaClass, Class<?> parameterType, Object parameter) throws NoSuchMethodException {
-		return attemptNewInstance(javaClass, new Class[] {parameterType}, new Object[] {parameter});
-	}
-	
-	/**
-	 * Attempt to get a field value, given the containing object and field name.
-	 * Return its result.
-	 * Useful for accessing private, package, or protected fields.
-	 * Throw an exception if the field is not defined.
-	 * Object#getFieldValue(String fieldName) throws NoSuchFieldException
-	 */
-	public static Object attemptToGetFieldValue(Object object, String fieldName) throws NoSuchFieldException {
-		try {
-			return field(object, fieldName).get(object);
-		} catch (IllegalAccessException iae) {
-			throw new RuntimeException(iae + CR + fullyQualifiedFieldName(object, fieldName), iae);
-		}
-	}
-	
-	/**
-	 * Attempt to get a static field value, given the containing object and field name.
-	 * Return its result.
-	 * Useful for accessing private, package, or protected fields.
-	 * Throw an exception if the field is not defined.
-	 * Class#getStaticFieldValue(String fieldName) throws NoSuchFieldException
-	 */
-	public static Object attemptToGetStaticFieldValue(Class<?> javaClass, String fieldName) throws NoSuchFieldException {
-		try {
-			return field(javaClass, fieldName).get(null);
-		} catch (IllegalAccessException iae) {
-			throw new RuntimeException(iae + CR + fullyQualifiedFieldName(javaClass, fieldName), iae);
-		}
-	}
-	
-	/**
-	 * Convenience method.
-	 * Attempt to execute a zero-argument method,
-	 * given the receiver and method name.
-	 * Return its result.
-	 * Throw an exception if the method is not found.
-	 * Useful for invoking private, package, or protected methods.
-	 * Object#execute(String methodName) throws NoSuchMethodException
-	 */
-	public static Object attemptToExecuteMethod(Object receiver, String methodName) throws NoSuchMethodException {
-		return attemptToExecuteMethod(receiver, methodName, ZERO_PARAMETER_TYPES, ZERO_PARAMETERS);
-	}
-	
-	/**
-	 * Convenience method.
-	 * Attempt to execute a method, given the receiver,
-	 * method name, parameter type, and parameter.
-	 * Return its result.
-	 * Throw an exception if the method is not found.
-	 * Useful for invoking private, package, or protected methods.
-	 * Object#execute(String methodName, Class<?> parameterType, Object parameter) throws NoSuchMethodException
-	 */
-	public static Object attemptToExecuteMethod(Object receiver, String methodName, Class<?> parameterType, Object parameter) throws NoSuchMethodException {
-		return attemptToExecuteMethod(receiver, methodName, new Class[] {parameterType}, new Object[] {parameter});
-	}
-	
-	/**
-	 * Attempt to execute a method, given the receiver,
-	 * method name, parameter types, and parameters.
-	 * Return its result.
-	 * Throw an exception if the method is not found.
-	 * Useful for invoking private, package, or protected methods.
-	 * Object#execute(String methodName, Class<?>[] parameterTypes, Object[] parameters) throws NoSuchMethodException
-	 */
-	public static Object attemptToExecuteMethod(Object receiver, String methodName, Class<?>[] parameterTypes, Object[] parameters) throws NoSuchMethodException {
-		return executeMethod(method(receiver, methodName, parameterTypes), receiver, parameters);
-	}
-	
-	/**
-	 * Attempt to execute a method, given the receiver,
-	 * method name, parameter types, and parameters.
-	 * Return its result.
-	 * Throw an exception if the method is not found.
-	 * If the executed method throws an exception, rethrow that exception.
-	 * Useful for invoking private, package, or protected methods.
-	 * Object#execute(String methodName, Class<?>[] parameterTypes, Object[] parameters) throws NoSuchMethodException
-	 */
-	public static Object attemptToExecuteMethodWithException(Object receiver, String methodName, Class<?>[] parameterTypes, Object[] parameters) 
-		throws Throwable, NoSuchMethodException 
-	{
-		return executeMethodWithException(method(receiver, methodName, parameterTypes), receiver, parameters);
-	}
-	
-	/**
-	 * Convenience method.
-	 * Attempt to execute a zero-argument static method,
-	 * given the class and method name.
-	 * Return its result.
-	 * Throw an exception if the method is not found.
-	 * Useful for invoking private, package, or protected methods.
-	 * Class#executeStaticMethod(String methodName) throws NoSuchMethodException
-	 */
-	public static Object attemptToExecuteStaticMethod(Class<?> javaClass, String methodName) throws NoSuchMethodException {
-		return attemptToExecuteStaticMethod(javaClass, methodName, ZERO_PARAMETER_TYPES, ZERO_PARAMETERS);
-	}
-	
-	/**
-	 * Attempt to execute a static method, given the class,
-	 * method name, parameter types, and parameters.
-	 * Return its result.
-	 * Throw an exception if the method is not found.
-	 * Useful for invoking private, package, or protected methods.
-	 * Class#executeStaticMethod(String methodName, Class<?>[] parameterTypes, Object[] parameters) throws NoSuchMethodException
-	 */
-	public static Object attemptToExecuteStaticMethod(Class<?> javaClass, String methodName, Class<?>[] parameterTypes, Object[] parameters) throws NoSuchMethodException {
-		return executeStaticMethod(staticMethod(javaClass, methodName, parameterTypes), parameters);
-	}
-	
-	/**
-	 * Convenience method.
-	 * Attempt to execute a static method, given the class,
-	 * method name, parameter type, and parameter.
-	 * Return its result.
-	 * Throw an exception if the method is not found.
-	 * Useful for invoking private, package, or protected methods.
-	 * Class#executeStaticMethod(String methodName, Class<?> parameterType, Object parameter) throws NoSuchMethodException
-	 */
-	public static Object attemptToExecuteStaticMethod(Class<?> javaClass, String methodName, Class<?> parameterType, Object parameter) throws NoSuchMethodException {
-		return attemptToExecuteStaticMethod(javaClass, methodName, new Class[] {parameterType}, new Object[] {parameter});
-	}
-	
-	/**
-	 * Attempt to set a field value, given the
-	 * containing object, field name, and new field value.
-	 * Useful for accessing private, package, or protected fields.
-	 * Throw an exception if the field is not defined.
-	 * Object#setFieldValue(String fieldName, Object fieldValue) throws NoSuchFieldException
-	 */
-	public static void attemptToSetFieldValue(Object object, String fieldName, Object fieldValue) throws NoSuchFieldException {
-		try {
-			field(object, fieldName).set(object, fieldValue);
-		} catch (IllegalAccessException iae) {
-			throw new RuntimeException(iae + CR + fullyQualifiedFieldName(object, fieldName), iae);
-		}
-	}
-	
-	/**
-	 * Attempt to set a static field value, given the
-	 * containing class, field name, and new field value.
-	 * Useful for accessing private, package, or protected fields.
-	 * Throw an exception if the field is not defined.
-	 * Class#setStaticFieldValue(String fieldName, Object fieldValue) throws NoSuchFieldException
-	 */
-	public static void attemptToSetStaticFieldValue(Class<?> javaClass, String fieldName, Object fieldValue) throws NoSuchFieldException {
-		try {
-			field(javaClass, fieldName).set(null, fieldValue);
-		} catch (IllegalAccessException iae) {
-			throw new RuntimeException(iae + CR + fullyQualifiedFieldName(javaClass, fieldName), iae);
-		}
-	}
-	
-	/**
-	 * Convenience method.
-	 * Return the default (zero-argument) constructor
-	 * for the specified class.
-	 * Set accessible to true, so we can access
-	 * private/package/protected constructors.
-	 * Class#constructor() throws NoSuchMethodException
-	 */
-	public static <T> Constructor<T> constructor(Class<T> javaClass) throws NoSuchMethodException {
-		return constructor(javaClass, ZERO_PARAMETER_TYPES);
-	}
-	
-	/**
-	 * Return the constructor for the specified class
-	 * and formal parameter types.
-	 * Set accessible to true, so we can access
-	 * private/package/protected constructors.
-	 * Class#constructor(Class<?>[] parameterTypes) throws NoSuchMethodException
-	 */
-	public static <T> Constructor<T> constructor(Class<T> javaClass, Class<?>[] parameterTypes) throws NoSuchMethodException {
-		Constructor<T> constructor = javaClass.getDeclaredConstructor(parameterTypes);
-		constructor.setAccessible(true);
-		return constructor;
-	}
-	
-	/**
-	 * Convenience method.
-	 * Return the constructor for the specified class
-	 * and formal parameter type.
-	 * Set accessible to true, so we can access
-	 * private/package/protected constructors.
-	 * Class#constructor(Class<?> parameterType) throws NoSuchMethodException
-	 */
-	public static <T> Constructor<T> constructor(Class<T> javaClass, Class<?> parameterType) throws NoSuchMethodException {
-		return constructor(javaClass, new Class[] {parameterType});
-	}
-	
-	/**
-	 * Return the declared fields for the specified class.
-	 * Set accessible to true, so we can access
-	 * private/package/protected fields.
-	 * Class#accessibleDeclaredFields()
-	 */
-	public static Field[] declaredFields(Class<?> javaClass) {
-		Field[] fields = javaClass.getDeclaredFields();
-		for (Field field : fields) {
-			field.setAccessible(true);
-		}
-		return fields;
-	}
-	
-	/**
-	 * Return the declared methods for the
-	 * specified class.
-	 * Set accessible to true, so we can access
-	 * private/package/protected methods.
-	 * Class#accessibleDeclaredMethods()
-	 */
-	public static Method[] declaredMethods(Class<?> javaClass) {
-		Method[] methods = javaClass.getDeclaredMethods();
-		for (Method method : methods) {
-			method.setAccessible(true);
-		}
-		return methods;
-	}
-	
-	/**
-	 * Return the default (zero-argument) constructor
-	 * for the specified class.
-	 * Set accessible to true, so we can access
-	 * private/package/protected constructors.
-	 * Class#defaultConstructor()
-	 */
-	public static <T> Constructor<T> defaultConstructor(Class<T> javaClass) throws NoSuchMethodException {
-		return constructor(javaClass);
-	}
-	
-	/**
-	 * Return a field for the specified class and field name.
-	 * If the class does not directly
-	 * define the field, look for it in the class's superclasses.
-	 * Set accessible to true, so we can access
-	 * private/package/protected fields.
-	 */
-	public static Field field(Class<?> javaClass, String fieldName) throws NoSuchFieldException {
-		Field field = null;
-		try {
-			field = javaClass.getDeclaredField(fieldName);
-		} catch (NoSuchFieldException ex) {
-			Class<?> superclass = javaClass.getSuperclass();
-			if (superclass == null) {
-				throw ex;
-			}
-			// recurse
-			return field(superclass, fieldName);
-		}
-		field.setAccessible(true);
-		return field;
-	}
-	
-	/**
-	 * Convenience method.
-	 * Return a field for the specified object and field name.
-	 * If the object's class does not directly
-	 * define the field, look for it in the class's superclasses.
-	 * Set accessible to true, so we can access
-	 * private/package/protected fields.
-	 */
-	public static Field field(Object object, String fieldName) throws NoSuchFieldException {
-		return field(object.getClass(), fieldName);
-	}
-	
-	/*
-	 * Return a string representation of the specified constructor.
-	 */
-	private static String fullyQualifiedConstructorSignature(Class<?> javaClass, Class<?>[] parameterTypes) {
-		return fullyQualifiedMethodSignature(javaClass, null, parameterTypes);
-	}
-	
-	/*
-	 * Return a string representation of the specified field.
-	 */
-	private static String fullyQualifiedFieldName(Class<?> javaClass, String fieldName) {
-		StringBuilder sb = new StringBuilder(200);
-		sb.append(javaClass.getName());
-		sb.append('.');
-		sb.append(fieldName);
-		return sb.toString();
-	}
-	
-	/*
-	 * Return a string representation of the specified field.
-	 */
-	private static String fullyQualifiedFieldName(Object object, String fieldName) {
-		return fullyQualifiedFieldName(object.getClass(), fieldName);
-	}
-	
-	/*
-	 * Return a string representation of the specified method.
-	 */
-	private static String fullyQualifiedMethodSignature(Class<?> javaClass, String methodName, Class<?>[] parameterTypes) {
-		StringBuilder sb = new StringBuilder(200);
-		sb.append(javaClass.getName());
-		// this check allows us to use this code for constructors, where the methodName is null
-		if (methodName != null) {
-			sb.append('.');
-			sb.append(methodName);
-		}
-		sb.append('(');
-		int max = parameterTypes.length - 1;
-		if (max != -1) {
-			// stop one short of the end of the array
-			for (int i = 0; i < max; i++) {
-				sb.append(parameterTypes[i].getName());
-				sb.append(", "); //$NON-NLS-1$
-			}
-			sb.append(parameterTypes[max].getName());
-		}
-		sb.append(')');
-		return sb.toString();
-	}
-	
-	/*
-	 * Return a string representation of the specified method.
-	 */
-	private static String fullyQualifiedMethodSignature(Object receiver, String methodName, Class<?>[] parameterTypes) {
-		return fullyQualifiedMethodSignature(receiver.getClass(), methodName, parameterTypes);
-	}
-	
-	/**
-	 * Get a field value, given the containing object and field name.
-	 * Return its result.
-	 * Useful for accessing private, package, or protected fields.
-	 * Object#getFieldValue(String fieldName)
-	 */
-	public static Object fieldValue(Object object, String fieldName) {
-		try {
-			return attemptToGetFieldValue(object, fieldName);
-		} catch (NoSuchFieldException nsfe) {
-			throw new RuntimeException(nsfe + CR + fullyQualifiedFieldName(object, fieldName), nsfe);
-		}
-	}
-	
-	/**
-	 * Get a static field value, given the containing class and field name.
-	 * Return its result.
-	 * Useful for accessing private, package, or protected fields.
-	 * Class#getStaticFieldValue(String fieldName)
-	 */
-	public static Object staticFieldValue(Class<?> javaClass, String fieldName) {
-		try {
-			return attemptToGetStaticFieldValue(javaClass, fieldName);
-		} catch (NoSuchFieldException nsfe) {
-			throw new RuntimeException(nsfe + CR + fullyQualifiedFieldName(javaClass, fieldName), nsfe);
-		}
-	}
-	
-	/**
-	 * Convenience method.
-	 * Execute a zero-argument method, given the receiver and method name.
-	 * Return its result.
-	 * Useful for invoking private, package, or protected methods.
-	 * Object#execute(String methodName)
-	 */
-	public static Object executeMethod(Object receiver, String methodName) {
-		return executeMethod(receiver, methodName, ZERO_PARAMETER_TYPES, ZERO_PARAMETERS);
-	}
-	
-	/**
-	 * Execute a method, given the receiver,
-	 * method name, parameter types, and parameters.
-	 * Return its result.
-	 * Useful for invoking private, package, or protected methods.
-	 * Object#execute(String methodName, Class<?>[] parameterTypes, Object[] parameters)
-	 */
-	public static Object executeMethod(Object receiver, String methodName, Class<?>[] parameterTypes, Object[] parameters) {
-		try {
-			return attemptToExecuteMethod(receiver, methodName, parameterTypes, parameters);
-		} catch (NoSuchMethodException nsme) {
-			throw new RuntimeException(nsme + CR + fullyQualifiedMethodSignature(receiver, methodName, parameterTypes), nsme);
-		}
-	}
-	
-	/**
-	 * Convenience method.
-	 * Execute a one-argument method, given the receiver,
-	 * method name, parameter type, and parameter.
-	 * Return its result.
-	 * Useful for invoking private, package, or protected methods.
-	 * Object#execute(String methodName, Class<?> parameterType, Object parameter)
-	 */
-	public static Object executeMethod(Object receiver, String methodName, Class<?> parameterType, Object parameter) {
-		return executeMethod(receiver, methodName, new Class[] {parameterType}, new Object[] {parameter});
-	}
-	
-	/**
-	 * Convenience method.
-	 * Execute a zero-argument method, given the receiver and method name.
-	 * Return its result.
-	 * If the method throws an exception, rethrow that exception.
-	 * Useful for invoking private, package, or protected methods.
-	 * Object#execute(String methodName)
-	 */
-	public static Object executeMethodWithException(Object receiver, String methodName) 
-		throws Throwable
-	{
-		return executeMethodWithException(receiver, methodName, ZERO_PARAMETER_TYPES, ZERO_PARAMETERS);
-	}
-	
-	/**
-	 * Convenience method.
-	 * Execute a one-argument method, given the receiver,
-	 * method name, parameter type, and parameter.
-	 * Return its result.
-	 * If the method throws an exception, rethrow that exception.
-	 * Useful for invoking private, package, or protected methods.
-	 * Object#execute(String methodName, Class<?> parameterType, Object parameter)
-	 */
-	public static Object executeMethodWithException(Object receiver, String methodName, Class<?> parameterType, Object parameter) 
-		throws Throwable
-	{
-		return executeMethodWithException(receiver, methodName, new Class[] {parameterType}, new Object[] {parameter});
-	}
-	
-	/**
-	 * Execute a method, given the receiver,
-	 * method name, parameter types, and parameters.
-	 * Return its result.
-	 * If the method throws an exception, rethrow that exception.
-	 * Useful for invoking private, package, or protected methods.
-	 * Object#execute(String methodName, Class<?>[] parameterTypes, Object[] parameters)
-	 */
-	public static Object executeMethodWithException(Object receiver, String methodName, Class<?>[] parameterTypes, Object[] parameters) 
-		throws Throwable
-	{
-		try {
-			return attemptToExecuteMethodWithException(receiver, methodName, parameterTypes, parameters);
-		} catch (NoSuchMethodException nsme) {
-			throw new RuntimeException(nsme + CR + fullyQualifiedMethodSignature(receiver, methodName, parameterTypes), nsme);
-		}
-	}
-	
-	/**
-	 * Execute the specified method with the specified parameters.
-	 * Return its result.
-	 * Convert exceptions to RuntimeExceptions.
-	 */
-	public static Object executeMethod(Method method, Object receiver, Object[] parameters) {
-		try {
-			return method.invoke(receiver, parameters);
-		} catch (IllegalAccessException iae) {
-			throw new RuntimeException(iae + CR + method, iae);
-		} catch (InvocationTargetException ite) {
-			throw new RuntimeException(method + CR + ite.getTargetException(), ite);
-		}
-	}
-	
-	/**
-	 * Execute the specified method with the specified parameters.
-	 * Return its result.
-	 * If the method throws an exception, rethrow that exception.
-	 * Convert all other exceptions to RuntimeExceptions.
-	 */
-	public static Object executeMethodWithException(Method method, Object receiver, Object[] parameters)
-		throws Throwable
-	{
-		try {
-			return method.invoke(receiver, parameters);
-		} catch (IllegalAccessException iae) {
-			throw new RuntimeException(iae + CR + method, iae);
-		} catch (InvocationTargetException ite) {
-			Throwable cause = ite.getCause();
-			if (cause == null) {
-				throw new RuntimeException(method.toString(), ite);
-			}
-			throw cause;
-		}
-	}
-	
-	/**
-	 * Convenience method.
-	 * Execute a zero-argument static method,
-	 * given the class and method name.
-	 * Return its result.
-	 * Useful for invoking private, package, or protected methods.
-	 * Class#executeStaticMethod(String methodName)
-	 */
-	public static Object executeStaticMethod(Class<?> javaClass, String methodName) {
-		return executeStaticMethod(javaClass, methodName, ZERO_PARAMETER_TYPES, ZERO_PARAMETERS);
-	}
-	
-	/**
-	 * Execute a static method, given the class,
-	 * method name, parameter types, and parameters.
-	 * Return its result.
-	 * Useful for invoking private, package, or protected methods.
-	 * Class#executeStaticMethod(String methodName, Class<?>[] parameterTypes, Object[] parameters)
-	 */
-	public static Object executeStaticMethod(Class<?> javaClass, String methodName, Class<?>[] parameterTypes, Object[] parameters) {
-		try {
-			return attemptToExecuteStaticMethod(javaClass, methodName, parameterTypes, parameters);
-		} catch (NoSuchMethodException nsme) {
-			throw new RuntimeException(nsme + CR + fullyQualifiedMethodSignature(javaClass, methodName, parameterTypes), nsme);
-		}
-	}
-	
-	/**
-	 * Convenience method.
-	 * Execute a static method, given the class,
-	 * method name, parameter type, and parameter.
-	 * Return its result.
-	 * Useful for invoking private, package, or protected methods.
-	 * Class#executeStaticMethod(String methodName, Class<?> parameterType, Object parameter)
-	 */
-	public static Object executeStaticMethod(Class<?> javaClass, String methodName, Class<?> parameterType, Object parameter) {
-		return executeStaticMethod(javaClass, methodName, new Class[] {parameterType}, new Object[] {parameter});
-	}
-	
-	/**
-	 * Execute the specified static method with the specified parameters.
-	 * Return its result.
-	 * Convert exceptions to RuntimeExceptions.
-	 */
-	public static Object executeStaticMethod(Method method, Object[] parameters) {
-		return executeMethod(method, null, parameters);
-	}
-	
-	/**
-	 * Convenience method.
-	 * Return a zero-argument method for the specified class
-	 * and method name. If the class does not directly
-	 * implement the method, look for it in the class's superclasses.
-	 * Set accessible to true, so we can access
-	 * private/package/protected methods.
-	 */
-	public static Method method(Class<?> javaClass, String methodName) throws NoSuchMethodException {
-		return method(javaClass, methodName, ZERO_PARAMETER_TYPES);
-	}
-	
-	/**
-	 * Return a method for the specified class, method name,
-	 * and formal parameter types. If the class does not directly
-	 * implement the method, look for it in the class's superclasses.
-	 * Set accessible to true, so we can access
-	 * private/package/protected methods.
-	 */
-	public static Method method(Class<?> javaClass, String methodName, Class<?>[] parameterTypes) throws NoSuchMethodException {
-		Method method = null;
-		try {
-			method = javaClass.getDeclaredMethod(methodName, parameterTypes);
-		} catch (NoSuchMethodException ex) {
-			Class<?> superclass = javaClass.getSuperclass();
-			if (superclass == null) {
-				throw ex;
-			}
-			// recurse
-			return method(superclass, methodName, parameterTypes);
-		}
-		method.setAccessible(true);
-		return method;
-	}
-	
-	/**
-	 * Convenience method.
-	 * Return a method for the specified class, method name,
-	 * and formal parameter type. If the class does not directly
-	 * implement the method, look for it in the class's superclasses.
-	 * Set accessible to true, so we can access
-	 * private/package/protected methods.
-	 */
-	public static Method method(Class<?> javaClass, String methodName, Class<?> parameterType) throws NoSuchMethodException {
-		return method(javaClass, methodName, new Class[] {parameterType});
-	}
-	
-	/**
-	 * Convenience method.
-	 * Return a zero-argument method for the specified object
-	 * and method name. If the object's class does not directly
-	 * implement the method, look for it in the class's superclasses.
-	 * Set accessible to true, so we can access
-	 * private/package/protected methods.
-	 */
-	public static Method method(Object object, String methodName) throws NoSuchMethodException {
-		return method(object.getClass(), methodName);
-	}
-	
-	/**
-	 * Convenience method.
-	 * Return a method for the specified object, method name,
-	 * and formal parameter types. If the object's class does not directly
-	 * implement the method, look for it in the class's superclasses.
-	 * Set accessible to true, so we can access
-	 * private/package/protected methods.
-	 */
-	public static Method method(Object object, String methodName, Class<?>[] parameterTypes) throws NoSuchMethodException {
-		return method(object.getClass(), methodName, parameterTypes);
-	}
-	
-	/**
-	 * Convenience method.
-	 * Return a method for the specified object, method name,
-	 * and formal parameter type. If the object's class does not directly
-	 * implement the method, look for it in the class's superclasses.
-	 * Set accessible to true, so we can access
-	 * private/package/protected methods.
-	 */
-	public static Method method(Object object, String methodName, Class<?> parameterType) throws NoSuchMethodException {
-		return method(object.getClass(), methodName, parameterType);
-	}
-	
-	/**
-	 * Convenience method.
-	 * Return the specified class (without the checked exception).
-	 */
-	public static Class<?> classForName(String className) {
-		try {
-			return Class.forName(className);
-		} catch (ClassNotFoundException ex) {
-			throw new RuntimeException(className, ex);
-		}
-	}
-	
-	/**
-	 * Convenience method.
-	 * Return a new instance of the specified class,
-	 * using the class's default (zero-argument) constructor.
-	 * Class#newInstance()
-	 */
-	public static <T> T newInstance(Class<T> javaClass) {
-		return newInstance(javaClass, ZERO_PARAMETER_TYPES, ZERO_PARAMETERS);
-	}
-	
-	/**
-	 * Convenience method.
-	 * Return a new instance of the specified class,
-	 * using the class's default (zero-argument) constructor.
-	 * Class#newInstance()
-	 */
-	public static Object newInstance(String className) throws ClassNotFoundException {
-		return newInstance(className, null);
-	}
-	
-	/**
-	 * Convenience method.
-	 * Return a new instance of the specified class,
-	 * using the class's default (zero-argument) constructor.
-	 * Class#newInstance()
-	 */
-	public static Object newInstance(String className, ClassLoader classLoader) throws ClassNotFoundException {
-		return newInstance(Class.forName(className, true, classLoader));
-	}
-	
-	/**
-	 * Return a new instance of the specified class,
-	 * given the constructor parameter types and parameters.
-	 * Class#newInstance(Class<?>[] parameterTypes, Object[] parameters)
-	 */
-	public static <T> T newInstance(Class<T> javaClass, Class<?>[] parameterTypes, Object[] parameters) {
-		try {
-			return attemptNewInstance(javaClass, parameterTypes, parameters);
-		} catch (NoSuchMethodException nsme) {
-			throw new RuntimeException(nsme + CR + fullyQualifiedConstructorSignature(javaClass, parameterTypes), nsme);
-		}
-	}
-	
-	/**
-	 * Return a new instance of the specified class,
-	 * given the constructor parameter types and parameters.
-	 * Class#newInstance(Class<?>[] parameterTypes, Object[] parameters)
-	 */
-	public static Object newInstance(String className, Class<?>[] parameterTypes, Object[] parameters) throws ClassNotFoundException {
-		return newInstance(className, parameterTypes, parameters, null);
-	}
-	
-	/**
-	 * Return a new instance of the specified class,
-	 * given the constructor parameter types and parameters.
-	 * Class#newInstance(Class<?>[] parameterTypes, Object[] parameters)
-	 */
-	public static Object newInstance(String className, Class<?>[] parameterTypes, Object[] parameters, ClassLoader classLoader) throws ClassNotFoundException {
-		return newInstance(Class.forName(className, true, classLoader), parameterTypes, parameters);
-	}
-	
-	/**
-	 * Convenience method.
-	 * Return a new instance of the specified class,
-	 * given the constructor parameter type and parameter.
-	 * Class#newInstance(Class<?> parameterType, Object parameter)
-	 */
-	public static <T> T newInstance(Class<T> javaClass, Class<?> parameterType, Object parameter) {
-		return newInstance(javaClass, new Class[] {parameterType}, new Object[] {parameter});
-	}
-	
-	/**
-	 * Return a new instance of the specified class,
-	 * given the constructor parameter type and parameter.
-	 * Class#newInstance(Class<?> parameterType, Object parameter)
-	 */
-	public static Object newInstance(String className, Class<?> parameterType, Object parameter) throws ClassNotFoundException {
-		return newInstance(className, parameterType, parameter, null);
-	}
-	
-	/**
-	 * Return a new instance of the specified class,
-	 * given the constructor parameter type and parameter.
-	 * Class#newInstance(Class<?> parameterType, Object parameter)
-	 */
-	public static Object newInstance(String className, Class<?> parameterType, Object parameter, ClassLoader classLoader) throws ClassNotFoundException {
-		return newInstance(Class.forName(className, false, classLoader), parameterType, parameter);
-	}
-	
-	/*
-	 * Push the declared fields for the specified class
-	 * onto the top of the stack.
-	 */
-	private static void pushDeclaredFields(Class<?> javaClass, Stack<Field> stack) {
-		Field[] fields = declaredFields(javaClass);
-		for (int i = fields.length; i-- > 0; ) {
-			stack.push(fields[i]);
-		}
-	}
-	
-	/*
-	 * Push the declared methods for the specified class
-	 * onto the top of the stack.
-	 */
-	private static void pushDeclaredMethods(Class<?> javaClass, Stack<Method> stack) {
-		Method[] methods = declaredMethods(javaClass);
-		for (int i = methods.length; i-- > 0; ) {
-			stack.push(methods[i]);
-		}
-	}
-	
-	/**
-	 * Set a field value, given the containing object, field name, and new field value.
-	 * Useful for accessing private, package, or protected fields.
-	 * Object#setFieldValue(String fieldName, Object fieldValue)
-	 */
-	public static void setFieldValue(Object object, String fieldName, Object fieldValue) {
-		try {
-			attemptToSetFieldValue(object, fieldName, fieldValue);
-		} catch (NoSuchFieldException nsfe) {
-			throw new RuntimeException(nsfe + CR + fullyQualifiedFieldName(object, fieldName), nsfe);
-		}
-	}
-	
-	/**
-	 * Set a static field value, given the containing class, field name, and new field value.
-	 * Useful for accessing private, package, or protected fields.
-	 * Class#setStaticFieldValue(String fieldName, Object fieldValue)
-	 */
-	public static void setStaticFieldValue(Class<?> javaClass, String fieldName, Object fieldValue) {
-		try {
-			attemptToSetStaticFieldValue(javaClass, fieldName, fieldValue);
-		} catch (NoSuchFieldException nsfe) {
-			throw new RuntimeException(nsfe + CR + fullyQualifiedFieldName(javaClass, fieldName), nsfe);
-		}
-	}
-	
-	/**
-	 * Return the short name of the object's class.
-	 * Class#getShortName()
-	 */
-	public static String shortClassNameForObject(Object object) {
-		return shortNameFor(object.getClass());
-	}
-	
-	/**
-	 * Return the short name of the class (e.g. "Object").
-	 * Class#getShortName()
-	 */
-	public static String shortNameForClassNamed(String className) {
-		return className.substring(className.lastIndexOf('.') + 1);
-	}
-	
-	/**
-	 * Return the short name of the class (e.g. "Object").
-	 * Class#getShortName()
-	 */
-	public static String shortNameFor(Class<?> javaClass) {
-		return shortNameForClassNamed(javaClass.getName());
-	}
-	
-	/**
-	 * Return the nested name of the object's class.
-	 * Class#getNestedName()
-	 */
-	public static String nestedClassNameForObject(Object object) {
-		return nestedNameFor(object.getClass());
-	}
-	
-	/**
-	 * Return the nested name of the class (e.g. "Entry").
-	 * Class#getNestedName()
-	 */
-	public static String nestedNameForClassNamed(String className) {
-		return className.substring(className.lastIndexOf(NESTED_CLASS_NAME_SEPARATOR) + 1);
-	}
-	
-	/**
-	 * Return the nested name of the class (e.g. "Entry").
-	 * Class#getNestedName()
-	 */
-	public static String nestedNameFor(Class<?> javaClass) {
-		return nestedNameForClassNamed(javaClass.getName());
-	}
-	
-	/**
-	 * Return the "toString()" name of the object's class.
-	 */
-	public static String toStringClassNameForObject(Object object) {
-		return toStringNameFor(object.getClass());
-	}
-	
-	/**
-	 * Return the "toString()" name of the class.
-	 * "Member" classes will return only the final name:
-	 *     "com.foo.bar.TopLevelClass$MemberClass$NestedMemberClass"
-	 *         => "NestedMemberClass"
-	 * "Local" and "anonymous" classes will still return the embedded '$'s:
-	 *     "com.foo.bar.TopLevelClass$1LocalClass"
-	 *         => "TopLevelClass$1LocalClass"
-	 *     "com.foo.bar.TopLevelClass$1"
-	 *         => "TopLevelClass$1"
-	 */
-	public static String toStringNameForClassNamed(String className) {
-		return classNamedIsMember(className) ?
-			className.substring(className.lastIndexOf(NESTED_CLASS_NAME_SEPARATOR) + 1)
-		:
-			className.substring(className.lastIndexOf('.') + 1);
-	}
-	
-	/**
-	 * Return the "toString()" name of the class.
-	 */
-	public static String toStringNameFor(Class<?> javaClass) {
-		return toStringNameForClassNamed(javaClass.getName());
-	}
-	
-	/**
-	 * Return the package name of the class (e.g. "java.lang").
-	 * Class#getPackageName()
-	 */
-	public static String packageNameFor(Class<?> javaClass) {
-		return packageNameForClassNamed(javaClass.getName());
-	}
-	
-	/**
-	 * Return the package name of the class (e.g. "java.lang").
-	 * Class#getPackageName()
-	 */
-	public static String packageNameForClassNamed(String className) {
-		int lastPeriod = className.lastIndexOf('.');
-		if (lastPeriod == -1) {
-			return ""; //$NON-NLS-1$
-		}
-		return className.substring(0, lastPeriod);
-	}
-	
-	/**
-	 * Return the short name of the class,
-	 * followed by its package name (e.g. "Object (java.lang)").
-	 * Class#getShortNameWithPackage()
-	 */
-	public static String shortNameWithPackage(Class<?> javaClass) {
-		StringBuilder sb = new StringBuilder(200);
-		sb.append(shortNameFor(javaClass));
-		if ( ! javaClass.isPrimitive()) {
-			sb.append(" ("); //$NON-NLS-1$
-			sb.append(packageNameFor(javaClass));
-			sb.append(')');
-		}
-		return sb.toString();
-	}
-	
-	/**
-	 * Convenience method.
-	 * Return a zero-argument, static method for the specified class
-	 * and method name. If the class does not directly
-	 * implement the method, look for it in the class's superclasses.
-	 * Set accessible to true, so we can access
-	 * private/package/protected methods.
-	 */
-	public static Method staticMethod(Class<?> javaClass, String methodName) throws NoSuchMethodException {
-		return staticMethod(javaClass, methodName, ZERO_PARAMETER_TYPES);
-	}
-	
-	/**
-	 * Return a static method for the specified class, method name,
-	 * and formal parameter types. If the class does not directly
-	 * implement the method, look for it in the class's superclasses.
-	 * Set accessible to true, so we can access
-	 * private/package/protected methods.
-	 */
-	public static Method staticMethod(Class<?> javaClass, String methodName, Class<?>[] parameterTypes) throws NoSuchMethodException {
-		Method method = method(javaClass, methodName, parameterTypes);
-		if (Modifier.isStatic(method.getModifiers())) {
-			return method;
-		}
-		throw new NoSuchMethodException(fullyQualifiedMethodSignature(javaClass, methodName, parameterTypes));
-	}
-	
-	/**
-	 * Convenience method.
-	 * Return a static method for the specified class, method name,
-	 * and formal parameter type. If the class does not directly
-	 * implement the method, look for it in the class's superclasses.
-	 * Set accessible to true, so we can access
-	 * private/package/protected methods.
-	 */
-	public static Method staticMethod(Class<?> javaClass, String methodName, Class<?> parameterTypes) throws NoSuchMethodException {
-		return staticMethod(javaClass, methodName, new Class[] {parameterTypes});
-	}
-
-	/**
-	 * Return whether the specified class can be "declared" in code;
-	 * i.e. it is either a "top-level" class or a "member" class, but it
-	 * is not an "array" class. This method rolls together all the checks
-	 * from the other methods for a bit of a performance tweak.
-	 * Class#isDeclarable()
-	 */
-	public static boolean classNamedIsDeclarable(String className) {
-		if (className.charAt(0) == ARRAY_INDICATOR) {
-			return false;		// it is an "array" class
-		}
-		int index = className.indexOf(NESTED_CLASS_NAME_SEPARATOR);
-		if (index == -1) {
-			return true;		// it is a "top-level" class
-		}
-		do {
-			// the character immediately after each dollar sign cannot be a digit
-			index++;
-			if (Character.isDigit(className.charAt(index))) {
-				return false;
-			}
-			index = className.indexOf(NESTED_CLASS_NAME_SEPARATOR, index);
-		} while (index != -1);
-		return true;
-	}
-	
-	/**
-	 * Return whether the specified class is a "top-level" class,
-	 * as opposed to a "member", "local", or "anonymous" class,
-	 * using the standard jdk naming conventions (i.e. the class
-	 * name does NOT contain a '$': "TopLevelClass").
-	 * Class#isTopLevel()
-	 */
-	public static boolean classNamedIsTopLevel(String className) {
-		if (classNamedIsArray(className)) {
-			return false;
-		}
-		return className.indexOf(NESTED_CLASS_NAME_SEPARATOR) == -1;
-	}
-
-	/**
-	 * Return whether the specified class is a "member" class,
-	 * as opposed to a "top-level", "local", or "anonymous" class,
-	 * using the standard jdk naming conventions (i.e. the class
-	 * name contains at least one '$' and all the names between
-	 * each '$' are legal class names:
-	 * "TopLevelClass$MemberClass$NestedMemberClass").
-	 * Class#isMember()
-	 */
-	public static boolean classNamedIsMember(String className) {
-		if (classNamedIsArray(className)) {
-			return false;
-		}
-		int index = className.indexOf(NESTED_CLASS_NAME_SEPARATOR);
-		if (index == -1) {
-			return false;	// it is a "top-level" class
-		}
-		do {
-			// the character immediately after each dollar sign cannot be a digit
-			index++;
-			if (Character.isDigit(className.charAt(index))) {
-				return false;
-			}
-			index = className.indexOf(NESTED_CLASS_NAME_SEPARATOR, index);
-		} while (index != -1);
-		return true;
-	}
-
-	/**
-	 * Return whether the specified class is a "local" class,
-	 * as opposed to a "top-level", "member", or "anonymous" class,
-	 * using the standard jdk (or Eclipse) naming conventions.
-	 * In the jdk, the class name ends with '$nnnXXX' where the '$' is
-	 * followed by a series of numeric digits which are followed by the
-	 * local class name: "TopLevelClass$1LocalClass".
-	 * In Eclipse, the class name ends with '$nnn$XXX' where the '$' is
-	 * followed by a series of numeric digits which are separated from
-	 * the local class name by another '$': "TopLevelClass$1$LocalClass".
-	 * Class#isLocal()
-	 */
-	public static boolean classNamedIsLocal(String className) {
-		if (classNamedIsArray(className)) {
-			return false;
-		}
-		int dollar = className.indexOf(NESTED_CLASS_NAME_SEPARATOR);
-		if (dollar == -1) {
-			return false;
-		}
-		if ( ! Character.isDigit(className.charAt(dollar + 1))) {
-			return false;
-		}
-		int len = className.length();
-		for (int i = dollar + 2; i < len; i++) {
-			if (Character.isJavaIdentifierStart(className.charAt(i))) {
-				return true;
-			}
-		}
-		// all the characters past the $ are digits (anonymous)
-		return false;
-	}
-
-	/**
-	 * Return whether the specified class is an "anonymous" class,
-	 * as opposed to a "top-level", "member", or "local" class,
-	 * using the standard jdk naming conventions (i.e. the class
-	 * name ends with '$nnn' where all the characters past the
-	 * last '$' are numeric digits: "TopLevelClass$1").
-	 * Class#isAnonymous()
-	 */
-	public static boolean classNamedIsAnonymous(String className) {
-		if (classNamedIsArray(className)) {
-			return false;
-		}
-		int dollar = className.indexOf(NESTED_CLASS_NAME_SEPARATOR);
-		if (dollar == -1) {
-			return false;
-		}
-		int start = dollar + 1;
-		for (int i = className.length(); i-- > start; ) {
-			if ( ! Character.isDigit(className.charAt(i))) {
-				return false;
-			}
-		}
-		// all the characters past the $ are digits
-		return true;
-	}
-
-	/**
-	 * Return the "array depth" of the specified class.
-	 * The depth is the number of dimensions for an array type.
-	 * Non-array types have a depth of zero.
-	 * Class#getArrayDepth()
-	 */
-	public static int arrayDepthFor(Class<?> javaClass) {
-		int depth = 0;
-		while (javaClass.isArray()) {
-			depth++;
-			javaClass = javaClass.getComponentType();
-		}
-		return depth;
-	}
-	
-	/**
-	 * Return the "array depth" of the specified object.
-	 * The depth is the number of dimensions for an array.
-	 * Non-arrays have a depth of zero.
-	 */
-	public static int arrayDepthForObject(Object object) {
-		return arrayDepthFor(object.getClass());
-	}
-	
-	/**
-	 * Return the "array depth" of the specified class.
-	 * The depth is the number of dimensions for an array type.
-	 * Non-array types have a depth of zero.
-	 * @see java.lang.Class#getName()
-	 * Class#getArrayDepth()
-	 */
-	public static int arrayDepthForClassNamed(String className) {
-		int depth = 0;
-		while (className.charAt(depth) == ARRAY_INDICATOR) {
-			depth++;
-		}
-		return depth;
-	}
-
-	/**
-	 * Return whether the specified class is an array type.
-	 * @see java.lang.Class#getName()
-	 */
-	public static boolean classNamedIsArray(String className) {
-		return className.charAt(0) == ARRAY_INDICATOR;
-	}
-
-	/**
-	 * Return the "element type" of the specified class.
-	 * The element type is the base type held by an array type.
-	 * A non-array type simply returns itself.
-	 * Class#getElementType()
-	 */
-	public static Class<?> elementTypeFor(Class<?> javaClass) {
-		while (javaClass.isArray()) {
-			javaClass = javaClass.getComponentType();
-		}
-		return javaClass;
-	}
-
-	/**
-	 * Return the "element type" of the specified object.
-	 * The element type is the base type held by an array.
-	 * A non-array simply returns its class.
-	 */
-	public static Class<?> elementTypeForObject(Object object) {
-		return elementTypeFor(object.getClass());
-	}
-
-	/**
-	 * Return the "element type" of the specified class.
-	 * The element type is the base type held by an array type.
-	 * Non-array types simply return themselves.
-	 * Class#getElementType()
-	 */
-	public static String elementTypeNameFor(Class<?> javaClass) {
-		return elementTypeFor(javaClass).getName();
-	}
-
-	/**
-	 * Return the "element type" of the specified class.
-	 * The element type is the base type held by an array type.
-	 * Non-array types simply return themselves.
-	 * @see java.lang.Class#getName()
-	 * Class#getElementType()
-	 */
-	public static String elementTypeNameForClassNamed(String className) {
-		int depth = arrayDepthForClassNamed(className);
-		if (depth == 0) {
-			// the name is in the form: "java.lang.Object" or "int"
-			return className;
-		}
-		int last = className.length() - 1;
-		if (className.charAt(depth) == REFERENCE_CLASS_CODE) {
-			// the name is in the form: "[[[Ljava.lang.Object;"
-			return className.substring(depth + 1, last);	// drop the trailing ';'
-		}
-		// the name is in the form: "[[[I"
-		return classNameForCode(className.charAt(last));
-	}
-	
-	/**
-	 * Return whether the specified class is a "reference"
-	 * class (i.e. neither 'void' nor one of the primitive variable classes,
-	 * ['boolean', 'int', 'float', etc.]).
-	 * NB: void.class.isPrimitive() == true
-	 */
-	public static boolean classNamedIsReference(String className) {
-		return ! classNamedIsPrimitive(className);
-	}
-
-	/**
-	 * Return whether the specified class is a primitive
-	 * class (i.e. 'void' or one of the primitive variable classes,
-	 * ['boolean', 'int', 'float', etc.]).
-	 * NB: void.class.isPrimitive() == true
-	 */
-	public static boolean classNamedIsPrimitive(String className) {
-		if (classNamedIsArray(className) || (className.length() > maxPrimitiveClassNameLength())) {
-			return false;  // performance tweak
-		}
-		Primitive[] codes = primitives();
-		for (int i = codes.length; i-- > 0; ) {
-			if (codes[i].javaClass.getName().equals(className)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Return whether the specified class is a "variable" primitive
-	 * class (i.e. 'boolean', 'int', 'float', etc., but not 'void').
-	 * NB: void.class.isPrimitive() == true
-	 */
-	public static boolean classNamedIsVariablePrimitive(String className) {
-		return classNamedIsPrimitive(className)
-			&& ( ! className.equals(VOID_CLASS_NAME));
-	}
-
-	/**
-	 * Return whether the specified class is a primitive wrapper
-	 * class (i.e. 'java.lang.Void' or one of the primitive variable wrapper classes,
-	 * ['java.lang.Boolean', 'java.lang.Integer', 'java.lang.Float', etc.]).
-	 * NB: void.class.isPrimitive() == true
-	 */
-	public static boolean classNamedIsPrimitiveWrapperClass(String className) {
-		if (classNamedIsArray(className) || (className.length() > maxPrimitiveWrapperClassNameLength())) {
-			return false;  // performance tweak
-		}
-		Primitive[] codes = primitives();
-		for (int i = codes.length; i-- > 0; ) {
-			if (codes[i].wrapperClass.getName().equals(className)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Return whether the specified class is a "variable" primitive
-	 * class (i.e. 'boolean', 'int', 'float', etc., but not 'void').
-	 * NB: void.class.isPrimitive() == true
-	 */
-	public static boolean classNamedIsVariablePrimitiveWrapperClass(String className) {
-		return classNamedIsPrimitiveWrapperClass(className)
-			&& ( ! className.equals(VOID_WRAPPER_CLASS_NAME));
-	}
-
-	/**
-	 * Return whether the specified class is a primitive wrapper
-	 * class (i.e. 'java.lang.Void' or one of the primitive variable wrapper classes,
-	 * ['java.lang.Boolean', 'java.lang.Integer', 'java.lang.Float', etc.]).
-	 * NB: void.class.isPrimitive() == true
-	 */
-	public static boolean classIsPrimitiveWrapperClass(Class<?> javaClass) {
-		if (javaClass.isArray() || (javaClass.getName().length() > maxPrimitiveWrapperClassNameLength())) {
-			return false;  // performance tweak
-		}
-		Primitive[] codes = primitives();
-		for (int i = codes.length; i-- > 0; ) {
-			if (codes[i].wrapperClass == javaClass) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Return whether the specified class is a "variable" primitive
-	 * class (i.e. 'boolean', 'int', 'float', etc., but not 'void').
-	 * NB: void.class.isPrimitive() == true
-	 */
-	public static boolean classIsVariablePrimitiveWrapperClass(Class<?> javaClass) {
-		return classIsPrimitiveWrapperClass(javaClass)
-			&& (javaClass != java.lang.Void.class);
-	}
-
-	/**
-	 * Return the class name for the specified class code.
-	 * @see java.lang.Class#getName()
-	 */
-	public static String classNameForCode(char classCode) {
-		return classForCode(classCode).getName();
-	}
-	
-	/**
-	 * Return the class name for the specified class code.
-	 * @see java.lang.Class#getName()
-	 */
-	public static String classNameForCode(int classCode) {
-		return classNameForCode((char) classCode);
-	}
-	
-	/**
-	 * Return the class for the specified class code.
-	 * @see java.lang.Class#getName()
-	 */
-	public static Class<?> classForCode(char classCode) {
-		Primitive[] codes = primitives();
-		for (int i = codes.length; i-- > 0; ) {
-			if (codes[i].code == classCode) {
-				return codes[i].javaClass;
-			}
-		}
-		throw new IllegalArgumentException(String.valueOf(classCode));
-	}
-
-	/**
-	 * Return the class for the specified class code.
-	 * @see java.lang.Class#getName()
-	 */
-	public static Class<?> classForCode(int classCode) {
-		return classForCode((char) classCode);
-	}
-	
-	/**
-	 * Return the class code for the specified class.
-	 * @see java.lang.Class#getName()
-	 */
-	public static char codeForClass(Class<?> javaClass) {
-		if (( ! javaClass.isArray()) && (javaClass.getName().length() <= maxPrimitiveClassNameLength())) {
-			Primitive[] codes = primitives();
-			for (int i = codes.length; i-- > 0; ) {
-				if (codes[i].javaClass == javaClass) {
-					return codes[i].code;
-				}
-			}
-		}
-		throw new IllegalArgumentException(javaClass.getName());		
-	}
-	
-	/**
-	 * Return the class code for the specified class.
-	 * @see java.lang.Class#getName()
-	 */
-	public static char codeForClassNamed(String className) {
-		if (( ! classNamedIsArray(className)) && (className.length() <= maxPrimitiveClassNameLength())) {
-			Primitive[] codes = primitives();
-			for (int i = codes.length; i-- > 0; ) {
-				if (codes[i].javaClass.getName().equals(className)) {
-					return codes[i].code;
-				}
-			}
-		}
-		throw new IllegalArgumentException(className);		
-	}
-
-	/**
-	 * Return the class for the specified "type declaration".
-	 */
-	public static Class<?> classForTypeDeclaration(String typeDeclaration) throws ClassNotFoundException {
-		return classForTypeDeclaration(typeDeclaration, null);
-	}
-	
-	/**
-	 * Return the class for the specified "type declaration",
-	 * using the specified class loader.
-	 */
-	public static Class<?> classForTypeDeclaration(String typeDeclaration, ClassLoader classLoader) throws ClassNotFoundException {
-		TypeDeclaration td = typeDeclaration(typeDeclaration);
-		return classForTypeDeclaration(td.elementTypeName, td.arrayDepth, classLoader);
-	}
-
-	private static TypeDeclaration typeDeclaration(String typeDeclaration) {
-		typeDeclaration = StringTools.removeAllWhitespace(typeDeclaration);
-		int arrayDepth = arrayDepthForTypeDeclaration_(typeDeclaration);
-		String elementTypeName = elementTypeNameForTypeDeclaration_(typeDeclaration, arrayDepth);
-		return new TypeDeclaration(elementTypeName, arrayDepth);
-	}
-
-	/**
-	 * Return the class for the specified "type declaration".
-	 */
-	public static Class<?> classForTypeDeclaration(String elementTypeName, int arrayDepth) throws ClassNotFoundException {
-		return classForTypeDeclaration(elementTypeName, arrayDepth, null);
-	}
-	
-	/**
-	 * Return the class for the specified "type declaration",
-	 * using the specified class loader.
-	 */
-	// see the "Evaluation" of jdk bug 6446627 for a discussion of loading classes
-	public static Class<?> classForTypeDeclaration(String elementTypeName, int arrayDepth, ClassLoader classLoader) throws ClassNotFoundException {
-		// primitives cannot be loaded via Class#forName(),
-		// so check for a primitive class name first
-		Primitive pcc = null;
-		if (elementTypeName.length() <= maxPrimitiveClassNameLength()) {  // performance tweak
-			Primitive[] codes = primitives();
-			for (int i = codes.length; i-- > 0; ) {
-				if (codes[i].javaClass.getName().equals(elementTypeName)) {
-					pcc = codes[i];
-					break;
-				}
-			}
-		}
-
-		// non-array
-		if (arrayDepth == 0) {
-			return (pcc == null) ? Class.forName(elementTypeName, false, classLoader) : pcc.javaClass;
-		}
-
-		// array
-		StringBuilder sb = new StringBuilder(100);
-		for (int i = arrayDepth; i-- > 0; ) {
-			sb.append(ARRAY_INDICATOR);
-		}
-		if (pcc == null) {
-			sb.append(REFERENCE_CLASS_CODE);
-			sb.append(elementTypeName);
-			sb.append(REFERENCE_CLASS_NAME_DELIMITER);
-		} else {
-			sb.append(pcc.code);
-		}
-		return Class.forName(sb.toString(), false, classLoader);
-	}
-	
-	/**
-	 * Return the class name for the specified "type declaration"; e.g.
-	 *     "int[]" -> "[I"
-	 * @see java.lang.Class#getName()
-	 */
-	public static String classNameForTypeDeclaration(String typeDeclaration) {
-		TypeDeclaration td = typeDeclaration(typeDeclaration);
-		return classNameForTypeDeclaration(td.elementTypeName, td.arrayDepth);
-	}
-
-	/**
-	 * Return the array depth for the specified "type declaration"; e.g.
-	 *     "int[]" -> 1
-	 *     "java.lang.String[][][]" -> 3
-	 */
-	public static int arrayDepthForTypeDeclaration(String typeDeclaration) {
-		return arrayDepthForTypeDeclaration_(StringTools.removeAllWhitespace(typeDeclaration));
-	}
-
-	/*
-	 * Assume no whitespace in the type declaration.
-	 */
-	private static int arrayDepthForTypeDeclaration_(String typeDeclaration) {
-		int last = typeDeclaration.length() - 1;
-		int depth = 0;
-		int close = last;
-		while (typeDeclaration.charAt(close) == TYPE_DECLARATION_ARRAY_CLOSE) {
-			if (typeDeclaration.charAt(close - 1) == TYPE_DECLARATION_ARRAY_OPEN) {
-				depth++;
-			} else {
-				throw new IllegalArgumentException("invalid type declaration: " + typeDeclaration); //$NON-NLS-1$
-			}
-			close = last - (depth * 2);
-		}
-		return depth;
-	}
-	
-	/**
-	 * Return the element type name for the specified "type declaration"; e.g.
-	 *     "int[]" -> "int"
-	 *     "java.lang.String[][][]" -> "java.lang.String"
-	 */
-	public static String elementTypeNameForTypeDeclaration(String typeDeclaration) {
-		typeDeclaration = StringTools.removeAllWhitespace(typeDeclaration);
-		return elementTypeNameForTypeDeclaration_(typeDeclaration, arrayDepthForTypeDeclaration_(typeDeclaration));
-	}
-
-	/**
-	 * Return the element type name for the specified "type declaration"; e.g.
-	 *     "int[]" -> "int"
-	 *     "java.lang.String[][][]" -> "java.lang.String"
-	 */
-	public static String elementTypeNameForTypeDeclaration(String typeDeclaration, int arrayDepth) {
-		return elementTypeNameForTypeDeclaration_(StringTools.removeAllWhitespace(typeDeclaration), arrayDepth);
-	}
-
-	/*
-	 * Assume no whitespace in the type declaration.
-	 */
-	public static String elementTypeNameForTypeDeclaration_(String typeDeclaration, int arrayDepth) {
-		return typeDeclaration.substring(0, typeDeclaration.length() - (arrayDepth * 2));
-	}
-
-	/**
-	 * Return the class name for the specified "type declaration".
-	 * @see java.lang.Class#getName()
-	 */
-	public static String classNameForTypeDeclaration(String elementTypeName, int arrayDepth) {
-		// non-array
-		if (arrayDepth == 0) {
-			return elementTypeName;
-		}
-
-		if (elementTypeName.equals(VOID_CLASS_NAME)) {
-			throw new IllegalArgumentException('\'' + VOID_CLASS_NAME + "' must have an array depth of zero: " + arrayDepth + '.'); //$NON-NLS-1$
-		}
-		// array
-		StringBuilder sb = new StringBuilder(100);
-		for (int i = arrayDepth; i-- > 0; ) {
-			sb.append(ARRAY_INDICATOR);
-		}
-
-		// look for a primitive first
-		Primitive pcc = null;
-		if (elementTypeName.length() <= maxPrimitiveClassNameLength()) {  // performance tweak
-			Primitive[] codes = primitives();
-			for (int i = codes.length; i-- > 0; ) {
-				if (codes[i].javaClass.getName().equals(elementTypeName)) {
-					pcc = codes[i];
-					break;
-				}
-			}
-		}
-
-		if (pcc == null) {
-			sb.append(REFERENCE_CLASS_CODE);
-			sb.append(elementTypeName);
-			sb.append(REFERENCE_CLASS_NAME_DELIMITER);
-		} else {
-			sb.append(pcc.code);
-		}
-
-		return sb.toString();
-	}
-
-
-	// ********** primitive constants **********
-
-	private synchronized static int maxPrimitiveClassNameLength() {
-		if (MAX_PRIMITIVE_CLASS_NAME_LENGTH == -1) {
-			MAX_PRIMITIVE_CLASS_NAME_LENGTH = calculateMaxPrimitiveClassNameLength();
-		}
-		return MAX_PRIMITIVE_CLASS_NAME_LENGTH;
-	}
-
-	private static int calculateMaxPrimitiveClassNameLength() {
-		int max = -1;
-		Primitive[] codes = primitives();
-		for (int i = codes.length; i-- > 0; ) {
-			int len = codes[i].javaClass.getName().length();
-			if (len > max) {
-				max = len;
-			}
-		}
-		return max;
-	}
-
-	private synchronized static int maxPrimitiveWrapperClassNameLength() {
-		if (MAX_PRIMITIVE_WRAPPER_CLASS_NAME_LENGTH == -1) {
-			MAX_PRIMITIVE_WRAPPER_CLASS_NAME_LENGTH = calculateMaxPrimitiveWrapperClassNameLength();
-		}
-		return MAX_PRIMITIVE_WRAPPER_CLASS_NAME_LENGTH;
-	}
-
-	private static int calculateMaxPrimitiveWrapperClassNameLength() {
-		int max = -1;
-		Primitive[] codes = primitives();
-		for (int i = codes.length; i-- > 0; ) {
-			int len = codes[i].wrapperClass.getName().length();
-			if (len > max) {
-				max = len;
-			}
-		}
-		return max;
-	}
-
-	private synchronized static Primitive[] primitives() {
-		if (PRIMITIVES == null) {
-			PRIMITIVES = buildPrimitives();
-		}
-		return PRIMITIVES;
-	}
-	
-	/**
-	 * NB: void.class.isPrimitive() == true
-	 */
-	private static Primitive[] buildPrimitives() {
-		Primitive[] result = new Primitive[9];
-		result[0] = new Primitive(BYTE_CODE, java.lang.Byte.class);
-		result[1] = new Primitive(CHAR_CODE, java.lang.Character.class);
-		result[2] = new Primitive(DOUBLE_CODE, java.lang.Double.class);
-		result[3] = new Primitive(FLOAT_CODE, java.lang.Float.class);
-		result[4] = new Primitive(INT_CODE, java.lang.Integer.class);
-		result[5] = new Primitive(LONG_CODE, java.lang.Long.class);
-		result[6] = new Primitive(SHORT_CODE, java.lang.Short.class);
-		result[7] = new Primitive(BOOLEAN_CODE, java.lang.Boolean.class);
-		result[8] = new Primitive(VOID_CODE, java.lang.Void.class);
-		return result;
-	}
-
-
-	// ********** member classes **********
-
-	private static class Primitive {
-		final char code;
-		final Class<?> javaClass;
-		final Class<?> wrapperClass;
-		private static final String WRAPPER_CLASS_TYPE_FIELD_NAME = "TYPE"; //$NON-NLS-1$
-		// e.g. java.lang.Boolean.TYPE => boolean.class
-		Primitive(char code, Class<?> wrapperClass) {
-			this.code = code;
-			this.wrapperClass = wrapperClass;
-			this.javaClass = (Class<?>) staticFieldValue(wrapperClass, WRAPPER_CLASS_TYPE_FIELD_NAME);
-		}
-	}
-
-	private static class TypeDeclaration {
-		final String elementTypeName;
-		final int arrayDepth;
-		TypeDeclaration(String elementTypeName, int arrayDepth) {
-			this.elementTypeName = elementTypeName;
-			this.arrayDepth = arrayDepth;
-		}
-	}
-
-
-	// ********** suppressed constructor **********
-
-	/**
-	 * Suppress default constructor, ensuring non-instantiability.
-	 */
-	private ClassTools() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Classpath.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Classpath.java
deleted file mode 100644
index 3f7db2dd3e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Classpath.java
+++ /dev/null
@@ -1,911 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.utility.internal;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.io.Serializable;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.internal.iterators.CompositeIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-
-/**
- * TODO
- */
-public class Classpath
-	implements Serializable
-{
-	/** The entries in the classpath */
-	private final Entry[] entries;
-
-	private static final long serialVersionUID = 1L;
-
-
-	// ********** static methods **********
-
-	// ***** factory methods for "standard" classpaths *****
-
-	/**
-	 * Return the Java "boot" classpath. This includes rt.jar.
-	 */
-	public static Classpath bootClasspath() {
-		return new Classpath(System.getProperty("sun.boot.class.path")); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Return a "virtual classpath" that contains all the jars
-	 * that would be used by the Java Extension Mechanism.
-	 */
-	public static Classpath javaExtensionClasspath() {
-		File[] dirs = javaExtensionDirectories();
-		List<String> jarFileNames = new ArrayList<String>();
-		for (File dir : dirs) {
-			if (dir.isDirectory()) {
-				addJarFileNamesTo(dir, jarFileNames);
-			}
-		}
-		return new Classpath(jarFileNames);
-	}
-
-	/**
-	 * Return the Java "system" classpath.
-	 */
-	public static Classpath javaClasspath() {
-		return new Classpath(System.getProperty("java.class.path")); //$NON-NLS-1$
-	}
-
-	/**
-	 * Return the unretouched "complete" classpath.
-	 * This includes the boot classpath, the Java Extension
-	 * Mechanism classpath, and the normal "system" classpath.
-	 */
-	public static Classpath completeClasspath() {
-		return new Classpath(new Classpath[] {
-				bootClasspath(),
-				javaExtensionClasspath(),
-				javaClasspath()
-		});
-	}
-
-	/**
-	 * Return a classpath that contains the location of the specified class.
-	 */
-	public static Classpath classpathFor(Class<?> javaClass) {
-		return new Classpath(locationFor(javaClass));
-	}
-
-
-	// ***** file => class *****
-
-	/**
-	 * Convert a relative file name to a class name; this will work for
-	 * any file that has a single extension beyond the base
-	 * class name.
-	 * e.g. "java/lang/String.class" is converted to "java.lang.String"
-	 * e.g. "java/lang/String.java" is converted to "java.lang.String"
-	 */
-	public static String convertToClassName(String classFileName) {
-		String className = FileTools.stripExtension(classFileName);
-		// do this for archive entry names
-		className = className.replace('/', '.');
-		// do this for O/S-specific file names
-		if (File.separatorChar != '/') {
-			className = className.replace(File.separatorChar, '.');
-		}
-		return className;
-	}
-
-	/**
-	 * Convert a file to a class name;
-	 * e.g. File(java/lang/String.class) is converted to "java.lang.String"
-	 */
-	public static String convertToClassName(File classFile) {
-		return convertToClassName(classFile.getPath());
-	}
-
-	/**
-	 * Convert a relative file name to a class;
-	 * e.g. "java/lang/String.class" is converted to java.lang.String.class
-	 */
-	public static Class<?> convertToClass(String classFileName) throws ClassNotFoundException {
-		return Class.forName(convertToClassName(classFileName));
-	}
-
-	/**
-	 * Convert a relative file to a class;
-	 * e.g. File(java/lang/String.class) is converted to java.lang.String.class
-	 */
-	public static Class<?> convertToClass(File classFile) throws ClassNotFoundException {
-		return convertToClass(classFile.getPath());
-	}
-
-
-	// ***** class => JAR entry *****
-
-	/**
-	 * Convert a class name to an archive entry name base;
-	 * e.g. "java.lang.String" is converted to "java/lang/String"
-	 */
-	public static String convertToArchiveEntryNameBase(String className) {
-		return className.replace('.', '/');
-	}
-	
-	/**
-	 * Convert a class to an archive entry name base;
-	 * e.g. java.lang.String.class is converted to "java/lang/String"
-	 */
-	public static String convertToArchiveEntryNameBase(Class<?> javaClass) {
-		return convertToArchiveEntryNameBase(javaClass.getName());
-	}
-	
-	/**
-	 * Convert a class name to an archive class file entry name;
-	 * e.g. "java.lang.String" is converted to "java/lang/String.class"
-	 */
-	public static String convertToArchiveClassFileEntryName(String className) {
-		return convertToArchiveEntryNameBase(className) + ".class"; //$NON-NLS-1$
-	}
-	
-	/**
-	 * Convert a class to an archive class file entry name;
-	 * e.g. java.lang.String.class is converted to "java/lang/String.class"
-	 */
-	public static String convertToArchiveClassFileEntryName(Class<?> javaClass) {
-		return convertToArchiveClassFileEntryName(javaClass.getName());
-	}
-	
-
-	// ***** class => file (.class or .java) *****
-
-	/**
-	 * Convert a class name to a file name base for the current O/S;
-	 * e.g. "java.lang.String" is converted to "java/lang/String" on Unix
-	 * and "java\\lang\\String" on Windows
-	 */
-	public static String convertToFileNameBase(String className) {
-		return className.replace('.', File.separatorChar);
-	}
-	
-	/**
-	 * Convert a class to a file name base for the current O/S;
-	 * e.g. java.lang.String.class is converted to "java/lang/String" on Unix
-	 * and "java\\lang\\String" on Windows
-	 */
-	public static String convertToFileNameBase(Class<?> javaClass) {
-		return convertToFileNameBase(javaClass.getName());
-	}
-	
-	/**
-	 * Convert a class name to a class file name for the current O/S;
-	 * e.g. "java.lang.String" is converted to "java/lang/String.class" on Unix
-	 * and "java\\lang\\String.class" on Windows
-	 */
-	public static String convertToClassFileName(String className) {
-		return convertToFileNameBase(className) + ".class"; //$NON-NLS-1$
-	}
-	
-	/**
-	 * Convert a class to a class file name for the current O/S;
-	 * e.g. java.lang.String.class is converted to "java/lang/String.class" on Unix
-	 * and "java\\lang\\String.class" on Windows
-	 */
-	public static String convertToClassFileName(Class<?> javaClass) {
-		return convertToClassFileName(javaClass.getName());
-	}
-	
-	/**
-	 * Convert a class name to a class file for the current O/S;
-	 * e.g. "java.lang.String" is converted to File(java/lang/String.class)
-	 */
-	public static File convertToClassFile(String className) {
-		return new File(convertToClassFileName(className));
-	}
-	
-	/**
-	 * Convert a class to a class file for the current O/S;
-	 * e.g. java.lang.String.class is converted to File(java/lang/String.class)
-	 */
-	public static File convertToClassFile(Class<?> javaClass) {
-		return convertToClassFile(javaClass.getName());
-	}
-	
-	/**
-	 * Convert a class name to a java file name for the current O/S;
-	 * e.g. "java.lang.String" is converted to "java/lang/String.java" on Unix
-	 * and "java\\lang\\String.java" on Windows
-	 */
-	public static String convertToJavaFileName(String className) {
-		return convertToFileNameBase(className) + ".java"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Convert a class to a java file name for the current O/S;
-	 * e.g. java.lang.String.class is converted to "java/lang/String.java" on Unix
-	 * and "java\\lang\\String.java" on Windows
-	 */
-	public static String convertToJavaFileName(Class<?> javaClass) {
-		return convertToJavaFileName(javaClass.getName());
-	}
-
-	/**
-	 * Convert a class name to a java file for the current O/S;
-	 * e.g. "java.lang.String" is converted to File(java/lang/String.java)
-	 */
-	public static File convertToJavaFile(String className) {
-		return new File(convertToJavaFileName(className));
-	}
-
-	/**
-	 * Convert a class to a java file for the current O/S;
-	 * e.g. java.lang.String.class is converted to File(java/lang/String.java)
-	 */
-	public static File convertToJavaFile(Class<?> javaClass) {
-		return convertToJavaFile(javaClass.getName());
-	}
-
-
-	// ***** class => resource *****
-
-	/**
-	 * Convert a class to a resource name;
-	 * e.g. java.lang.String.class is converted to "/java/lang/String.class".
-	 */
-	public static String convertToResourceName(Class<?> javaClass) {
-		return '/' + convertToArchiveClassFileEntryName(javaClass);
-	}
-
-	/**
-	 * Convert a class to a resource;
-	 * e.g. java.lang.String.class is converted to
-	 * URL(jar:file:/C:/jdk/1.4.2_04/jre/lib/rt.jar!/java/lang/String.class).
-	 */
-	public static URL convertToResource(Class<?> javaClass) {
-		return javaClass.getResource(convertToResourceName(javaClass));
-	}
-
-
-	// ***** utilities *****
-
-	/**
-	 * Return whether the specified file is an archive file;
-	 * i.e. its name ends with ".zip" or ".jar"
-	 */
-	public static boolean fileNameIsArchive(String fileName) {
-		String ext = FileTools.extension(fileName).toLowerCase();
-		return ext.equals(".jar") || ext.equals(".zip"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * Return whether the specified file is an archive file;
-	 * i.e. its name ends with ".zip" or ".jar"
-	 */
-	public static boolean fileIsArchive(File file) {
-		return fileNameIsArchive(file.getName());
-	}
-	
-	/**
-	 * Return what should be the fully-qualified file name
-	 * for the JRE runtime JAR;
-	 * e.g. "C:\jdk1.4.2_04\jre\lib\rt.jar".
-	 */
-	public static String rtJarName() {
-		return locationFor(java.lang.Object.class);
-	}
-	
-	/**
-	 * Return the location from where the specified class was loaded.
-	 */
-	public static String locationFor(Class<?> javaClass) {
-		URL url = convertToResource(javaClass);
-		String path;
-		try {
-			path = FileTools.buildFile(url).getPath();
-		} catch (URISyntaxException ex) {
-			throw new RuntimeException(ex);
-		}
-		String protocol = url.getProtocol().toLowerCase();
-		if (protocol.equals("jar")) { //$NON-NLS-1$
-			// if the class is in a JAR, the URL will look something like this:
-			//     jar:file:/C:/jdk/1.4.2_04/jre/lib/rt.jar!/java/lang/String.class
-			return path.substring(0, path.indexOf('!'));
-		} else if (protocol.equals("file")) { //$NON-NLS-1$
-			// if the class is in a directory, the URL will look something like this:
-			//     file:/C:/dev/main/mwdev/class/org/eclipse/dali/utility/Classpath.class
-			return path.substring(0, path.length() - convertToClassFileName(javaClass).length() - 1);
-		} else if (protocol.equals("bundleresource")) { //$NON-NLS-1$
-			// if the class is in a bundle resource (Eclipse?), the URL will look something like this:
-			//     bundleresource://43/org/eclipse/dali/utility/Classpath.class
-			return path.substring(0, path.length() - convertToClassFileName(javaClass).length() - 1);
-		}
-
-		throw new IllegalStateException(url.toString());
-	}
-	
-	/**
-	 * Return the directories used by the Java Extension Mechanism.
-	 */
-	public static File[] javaExtensionDirectories() {
-		return convertToFiles(javaExtensionDirectoryNames());
-	}
-
-	/**
-	 * Return the directory names used by the Java Extension Mechanism.
-	 */
-	public static String[] javaExtensionDirectoryNames() {
-		return System.getProperty("java.ext.dirs").split(File.pathSeparator); //$NON-NLS-1$
-	}
-
-
-	// ***** internal *****
-
-	private static File[] convertToFiles(String[] fileNames) {
-		File[] files = new File[fileNames.length];
-		for (int i = fileNames.length; i-- > 0; ) {
-			files[i] = new File(fileNames[i]);
-		}
-		return files;
-	}
-
-	private static void addJarFileNamesTo(File dir, List<String> jarFileNames) {
-		File[] jarFiles = jarFilesIn(dir);
-		for (File jarFile : jarFiles) {
-			jarFileNames.add(FileTools.canonicalFile(jarFile).getPath());
-		}
-	}
-
-	private static File[] jarFilesIn(File directory) {
-		return directory.listFiles(jarFileFilter());
-	}
-
-	private static FileFilter jarFileFilter() {
-		return new FileFilter() {
-			public boolean accept(File file) {
-				return FileTools.extension(file.getName()).toLowerCase().equals(".jar"); //$NON-NLS-1$
-			}
-		};
-	}
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a classpath with the specified entries.
-	 */
-	private Classpath(Entry[] entries) {
-		super();
-		this.entries = entries;
-	}
-
-	/**
-	 * Construct a classpath with the specified entries.
-	 */
-	public Classpath(String[] fileNames) {
-		this(buildEntries(fileNames));
-	}
-
-	/**
-	 * Skip empty file names because they will end up expanding to the current
-	 * working directory, which is not what we want. Empty file names actually
-	 * occur with some frequency; such as when the classpath has been built up
-	 * dynamically with too many separators. For example:
-	 *     "C:\dev\foo.jar;;C:\dev\bar.jar"
-	 * will be parsed into three file names:
-	 *     { "C:\dev\foo.jar", "", "C:\dev\bar.jar" }
-	 */
-	private static Entry[] buildEntries(String[] fileNames) {
-		List<Entry> entries = new ArrayList<Entry>();
-		for (String fileName : fileNames) {
-			if ((fileName != null) && (fileName.length() != 0)) {
-				entries.add(new Entry(fileName));
-			}
-		}
-		return entries.toArray(new Entry[entries.size()]);
-	}
-
-	/**
-	 * Construct a classpath with the specified path.
-	 */
-	public Classpath(String path) {
-		this(path.split(File.pathSeparator));
-	}
-
-	/**
-	 * Construct a classpath with the specified entries.
-	 */
-	public Classpath(List<String> fileNames) {
-		this(fileNames.toArray(new String[fileNames.size()]));
-	}
-
-	/**
-	 * Consolidate the specified classpaths into a single classpath.
-	 */
-	public Classpath(Classpath[] classpaths) {
-		this(consolidateEntries(classpaths));
-	}
-
-	private static Entry[] consolidateEntries(Classpath[] classpaths) {
-		List<Entry> entries = new ArrayList<Entry>();
-		for (Classpath classpath : classpaths) {
-			CollectionTools.addAll(entries, classpath.entries());
-		}
-		return entries.toArray(new Entry[entries.size()]);
-	}
-
-
-	// ********** public API **********
-
-	/**
-	 * Return the classpath's entries.
-	 */
-	public Entry[] entries() {
-		return this.entries;
-	}
-
-	/**
-	 * Return the classpath's path.
-	 */
-	public String path() {
-		Entry[] localEntries = this.entries;
-		int max = localEntries.length - 1;
-		if (max == -1) {
-			return ""; //$NON-NLS-1$
-		}
-		StringBuilder sb = new StringBuilder(2000);
-		// stop one short of the end of the array
-		for (int i = 0; i < max; i++) {
-			sb.append(localEntries[i].fileName());
-			sb.append(File.pathSeparatorChar);
-		}
-		sb.append(localEntries[max].fileName());
-		return sb.toString();
-	}
-
-	/**
-	 * Search the classpath for the specified (unqualified) file
-	 * and return its entry. Return null if an entry is not found.
-	 * For example, you could use this method to find the entry
-	 * for "rt.jar" or "toplink.jar".
-	 */
-	public Entry entryForFileNamed(String shortFileName) {
-		Entry[] localEntries = this.entries;
-		for (Entry entry : localEntries) {
-			if (entry.file().getName().equals(shortFileName)) {
-				return entry;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Return the first entry file in the classpath
-	 * that contains the specified class.
-	 * Return null if an entry is not found.
-	 */
-	public Entry entryForClassNamed(String className) {
-		String relativeClassFileName = convertToClassFileName(className);
-		String archiveEntryName = convertToArchiveClassFileEntryName(className);
-		Entry[] localEntries = this.entries;
-		for (Entry entry : localEntries) {
-			if (entry.contains(relativeClassFileName, archiveEntryName)) {
-				return entry;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Return the names of all the classes discovered on the classpath,
-	 * with duplicates removed.
-	 */
-	public String[] classNames() {
-		return this.classNames(Filter.Null.<String>instance());
-	}
-
-	/**
-	 * Return the names of all the classes discovered on the classpath
-	 * and accepted by the specified filter, with duplicates removed.
-	 */
-	public String[] classNames(Filter<String> filter) {
-		Collection<String> classNames = new HashSet<String>(10000);
-		this.addClassNamesTo(classNames, filter);
-		return classNames.toArray(new String[classNames.size()]);
-	}
-
-	/**
-	 * Add the names of all the classes discovered on the classpath
-	 * to the specified collection.
-	 */
-	public void addClassNamesTo(Collection<String> classNames) {
-		this.addClassNamesTo(classNames, Filter.Null.<String>instance());
-	}
-
-	/**
-	 * Add the names of all the classes discovered on the classpath
-	 * and accepted by the specified filter to the specified collection.
-	 */
-	public void addClassNamesTo(Collection<String> classNames, Filter<String> filter) {
-		Entry[] localEntries = this.entries;
-		for (Entry entry : localEntries) {
-			entry.addClassNamesTo(classNames, filter);
-		}
-	}
-
-	/**
-	 * Return the names of all the classes discovered on the classpath.
-	 * Just a bit more performant than #classNames().
-	 */
-	public Iterator<String> classNamesStream() {
-		return this.classNamesStream(Filter.Null.<String>instance());
-	}
-
-	/**
-	 * Return the names of all the classes discovered on the classpath
-	 * that are accepted by the specified filter.
-	 * Just a bit more performant than #classNames(Filter).
-	 */
-	public Iterator<String> classNamesStream(Filter<String> filter) {
-		return new CompositeIterator<String>(this.entryClassNamesStreams(filter));
-	}
-
-	private Iterator<Iterator<String>> entryClassNamesStreams(final Filter<String> filter) {
-		return new TransformationIterator<Entry, Iterator<String>>(new ArrayIterator<Entry>(this.entries)) {
-			@Override
-			protected Iterator<String> transform(Entry entry) {
-				return entry.classNamesStream(filter);
-			}
-		};
-	}
-
-	/**
-	 * Return a "compressed" version of the classpath with its
-	 * duplicate entries eliminated.
-	 */
-	public Classpath compressed() {
-		return new Classpath(CollectionTools.removeDuplicateElements(this.entries));
-	}
-
-	/**
-	 * Convert the classpath to an array of URLs
-	 * (that can be used to instantiate a URLClassLoader).
-	 */
-	public URL[] urls() {
-		Entry[] localEntries = this.entries;
-		int len = localEntries.length;
-		URL[] urls = new URL[len];
-		for (int i = 0; i < len; i++) {
-			urls[i] = localEntries[i].url();
-		}
-		return urls;
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.path());
-	}
-
-
-	// ********** inner class **********
-
-	/**
-	 * TODO
-	 */
-	public static class Entry implements Serializable {
-		private final String fileName;
-		private final File file;
-		private final File canonicalFile;
-
-		private static final long serialVersionUID = 1L;
-
-		Entry(String fileName) {
-			super();
-			if ((fileName == null) || (fileName.length() == 0)) {
-				throw new IllegalArgumentException("'fileName' must be non-empty"); //$NON-NLS-1$
-			}
-			this.fileName = fileName;
-			this.file = new File(fileName);
-			this.canonicalFile = FileTools.canonicalFile(this.file);
-		}
-
-		public String fileName() {
-			return this.fileName;
-		}
-
-		public File file() {
-			return this.file;
-		}
-
-		public File canonicalFile() {
-			return this.canonicalFile;
-		}
-
-		public String canonicalFileName() {
-			return this.canonicalFile.getAbsolutePath();
-		}
-
-		@Override
-		public boolean equals(Object o) {
-			if ( ! (o instanceof Entry)) {
-				return false;
-			}
-			return ((Entry) o).canonicalFile.equals(this.canonicalFile);
-		}
-
-		@Override
-		public int hashCode() {
-			return this.canonicalFile.hashCode();
-		}
-
-		/**
-		 * Return the entry's "canonical" URL.
-		 */
-		public URL url() {
-			try {
-				return this.canonicalFile.toURI().toURL();
-			} catch (IOException ex) {
-				throw new RuntimeException(ex);
-			}
-		}
-
-		/**
-		 * Return whether the entry contains the specified class.
-		 */
-		public boolean contains(Class<?> javaClass) {
-			return this.contains(javaClass.getName());
-		}
-
-		/**
-		 * Return whether the entry contains the specified class.
-		 */
-		public boolean contains(String className) {
-			return this.contains(convertToClassFileName(className), convertToArchiveClassFileEntryName(className));
-		}
-
-		/**
-		 * Return whether the entry contains either the specified relative
-		 * class file or the specified archive entry.
-		 * Not the prettiest signature, but it's internal....
-		 */
-		boolean contains(String relativeClassFileName, String archiveEntryName) {
-			if ( ! this.canonicalFile.exists()) {
-				return false;
-			}
-			if (this.canonicalFile.isDirectory() && (new File(this.canonicalFile, relativeClassFileName)).exists()) {
-				return true;
-			}
-			return (fileIsArchive(this.canonicalFile) && this.archiveContainsEntry(archiveEntryName));
-		}
-
-		/**
-		 * Return whether the entry's archive contains the specified entry.
-		 */
-		private boolean archiveContainsEntry(String zipEntryName) {
-			ZipFile zipFile = null;
-			ZipEntry zipEntry = null;
-			try {
-				zipFile = new ZipFile(this.canonicalFile);
-				zipEntry = zipFile.getEntry(zipEntryName);
-			} catch (IOException ex) {
-				// something is wrong, leave the entry null
-			} finally {
-				try {
-					if (zipFile != null) {
-						zipFile.close();
-					}
-				} catch (IOException ex) {
-					zipEntry = null;	// something is wrong, clear out the entry
-				}
-			}
-			return zipEntry != null;
-		}
-
-		/**
-		 * Return the names of all the classes discovered in the entry.
-		 */
-		public String[] classNames() {
-			return this.classNames(Filter.Null.<String>instance());
-		}
-
-		/**
-		 * Return the names of all the classes discovered in the entry
-		 * and accepted by the specified filter.
-		 */
-		public String[] classNames(Filter<String> filter) {
-			Collection<String> classNames = new ArrayList<String>(2000);
-			this.addClassNamesTo(classNames, filter);
-			return classNames.toArray(new String[classNames.size()]);
-		}
-
-		/**
-		 * Add the names of all the classes discovered in the entry
-		 * to the specified collection.
-		 */
-		public void addClassNamesTo(Collection<String> classNames) {
-			this.addClassNamesTo(classNames, Filter.Null.<String>instance());
-		}
-
-		/**
-		 * Add the names of all the classes discovered in the entry
-		 * and accepted by the specified filter to the specified collection.
-		 */
-		public void addClassNamesTo(Collection<String> classNames, Filter<String> filter) {
-			if (this.canonicalFile.exists()) {
-				if (this.canonicalFile.isDirectory()) {
-					this.addClassNamesForDirectoryTo(classNames, filter);
-				} else if (fileIsArchive(this.canonicalFile)) {
-					this.addClassNamesForArchiveTo(classNames, filter);
-				}
-			}
-		}
-
-		/**
-		 * Add the names of all the classes discovered
-		 * under the entry's directory and accepted by
-		 * the specified filter to the specified collection.
-		 */
-		private void addClassNamesForDirectoryTo(Collection<String> classNames, Filter<String> filter) {
-			int start = this.canonicalFile.getAbsolutePath().length() + 1;
-			for (Iterator<File> stream = this.classFilesForDirectory(); stream.hasNext(); ) {
-				String className = convertToClassName(stream.next().getAbsolutePath().substring(start));
-				if (filter.accept(className)) {
-					classNames.add(className);
-				}
-			}
-		}
-
-		/**
-		 * Return an iterator on all the class files discovered
-		 * under the entry's directory.
-		 */
-		private Iterator<File> classFilesForDirectory() {
-			return new FilteringIterator<File, File>(FileTools.filesInTree(this.canonicalFile)) {
-				@Override
-				protected boolean accept(File next) {
-					return Entry.this.fileNameMightBeForClassFile(next.getName());
-				}
-			};
-		}
-
-		/**
-		 * Add the names of all the classes discovered
-		 * in the entry's archive file and accepted by the
-		 * specified filter to the specified collection.
-		 */
-		private void addClassNamesForArchiveTo(Collection<String> classNames, Filter<String> filter) {
-			ZipFile zipFile = null;
-			try {
-				zipFile = new ZipFile(this.canonicalFile);
-			} catch (IOException ex) {
-				return;
-			}
-			for (Enumeration<? extends ZipEntry> stream = zipFile.entries(); stream.hasMoreElements(); ) {
-				ZipEntry zipEntry = stream.nextElement();
-				String zipEntryName = zipEntry.getName();
-				if (this.fileNameMightBeForClassFile(zipEntryName)) {
-					String className = convertToClassName(zipEntryName);
-					if (filter.accept(className)) {
-						classNames.add(className);
-					}
-				}
-			}
-			try {
-				zipFile.close();
-			} catch (IOException ex) {
-				return;
-			}
-		}
-
-		/**
-		 * Return whether the specified file might be a Java class file.
-		 * The file name must at least end with ".class" and contain no spaces.
-		 * (Neither class names nor package names may contain spaces.)
-		 * Whether it actually is a class file will need to be determined by
-		 * a class loader.
-		 */
-		boolean fileNameMightBeForClassFile(String name) {
-			return FileTools.extension(name).toLowerCase().equals(".class") //$NON-NLS-1$
-					&& (name.indexOf(' ') == -1);
-		}
-
-		/**
-		 * Return the names of all the classes discovered on the classpath.
-		 * Just a bit more performant than #classNames().
-		 */
-		public Iterator<String> classNamesStream() {
-			return this.classNamesStream(Filter.Null.<String>instance());
-		}
-
-		/**
-		 * Return the names of all the classes discovered on the classpath
-		 * that are accepted by the specified filter.
-		 * Just a bit more performant than #classNames(Filter).
-		 */
-		public Iterator<String> classNamesStream(Filter<String> filter) {
-			if (this.canonicalFile.exists()) {
-				if (this.canonicalFile.isDirectory()) {
-					return this.classNamesForDirectory(filter);
-				}
-				if (fileIsArchive(this.canonicalFile)) {
-					return this.classNamesForArchive(filter);
-				}
-			}
-			return EmptyIterator.instance();
-		}
-
-		/**
-		 * Return the names of all the classes discovered
-		 * under the entry's directory and accepted by
-		 * the specified filter.
-		 */
-		private Iterator<String> classNamesForDirectory(Filter<String> filter) {
-			return new FilteringIterator<String, String>(this.classNamesForDirectory(), filter);
-		}
-
-		/**
-		 * Transform the class files to class names.
-		 */
-		private Iterator<String> classNamesForDirectory() {
-			final int start = this.canonicalFile.getAbsolutePath().length() + 1;
-			return new TransformationIterator<File, String>(this.classFilesForDirectory()) {
-				@Override
-				protected String transform(File f) {
-					return convertToClassName(f.getAbsolutePath().substring(start));
-				}
-			};
-		}
-
-		/**
-		 * Return the names of all the classes discovered
-		 * in the entry's archive file and accepted by the
-		 * specified filter.
-		 */
-		private Iterator<String> classNamesForArchive(Filter<String> filter) {
-			// we can't simply wrap iterators here because we need to close the archive file...
-			ZipFile zipFile = null;
-			try {
-				zipFile = new ZipFile(this.canonicalFile);
-			} catch (IOException ex) {
-				return EmptyIterator.instance();
-			}
-			Collection<String> classNames = new HashSet<String>(zipFile.size());
-			for (Enumeration<? extends ZipEntry> stream = zipFile.entries(); stream.hasMoreElements(); ) {
-				ZipEntry zipEntry = stream.nextElement();
-				String zipEntryName = zipEntry.getName();
-				if (this.fileNameMightBeForClassFile(zipEntryName)) {
-					String className = convertToClassName(zipEntryName);
-					if (filter.accept(className)) {
-						classNames.add(className);
-					}
-				}
-			}
-			try {
-				zipFile.close();
-			} catch (IOException ex) {
-				return EmptyIterator.instance();
-			}
-			return classNames.iterator();
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/CollectionTools.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/CollectionTools.java
deleted file mode 100644
index 347802466d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/CollectionTools.java
+++ /dev/null
@@ -1,4008 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.utility.internal;
-
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Random;
-import java.util.RandomAccess;
-import java.util.TreeSet;
-import java.util.Vector;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.internal.iterators.GenericIteratorWrapper;
-import org.eclipse.jpt.utility.internal.iterators.SingleElementIterator;
-import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator;
-
-public final class CollectionTools {
-
-	@SuppressWarnings("unchecked")
-	private static <E> E[] newArray(E[] array, int length) {
-		return (E[]) Array.newInstance(array.getClass().getComponentType(), length);
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array followed by the specified object to be added.
-	 * java.util.Arrays#add(Object[] array, Object o)
-	 */
-	public static <E> E[] add(E[] array, E value) {
-		int len = array.length;
-		E[] result = newArray(array, len + 1);
-		if (len > 0) {
-			System.arraycopy(array, 0, result, 0, len);
-		}
-		result[len] = value;
-		return result;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array with the specified object added at the specified index.
-	 * java.util.Arrays#add(Object[] array, int index, Object o)
-	 */
-	public static <E> E[] add(E[] array, int index, E value) {
-		int len = array.length;
-		E[] result = newArray(array, len + 1);
-		if (index > 0) {
-			System.arraycopy(array, 0, result, 0, index);
-		}
-		result[index] = value;
-		if (len > index) {
-			System.arraycopy(array, index, result, index + 1, len - index);
-		}
-		return result;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array followed by the specified value to be added.
-	 * java.util.Arrays#add(char[] array, char value)
-	 */
-	public static char[] add(char[] array, char value) {
-		int len = array.length;
-		char[] result = new char[len + 1];
-		if (len > 0) {
-			System.arraycopy(array, 0, result, 0, len);
-		}
-		result[len] = value;
-		return result;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array with the specified value added at the specified index.
-	 * java.util.Arrays#add(char[] array, int index, char value)
-	 */
-	public static char[] add(char[] array, int index, char value) {
-		int len = array.length;
-		char[] result = new char[len + 1];
-		if (index > 0) {
-			System.arraycopy(array, 0, result, 0, index);
-		}
-		result[index] = value;
-		if (len > index) {
-			System.arraycopy(array, index, result, index + 1, len - index);
-		}
-		return result;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array followed by the specified value to be added.
-	 * java.util.Arrays#add(int[] array, int value)
-	 */
-	public static int[] add(int[] array, int value) {
-		int len = array.length;
-		int[] result = new int[len + 1];
-		if (len > 0) {
-			System.arraycopy(array, 0, result, 0, len);
-		}
-		result[len] = value;
-		return result;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array with the specified value added at the specified index.
-	 * java.util.Arrays#add(int[] array, int index, int value)
-	 */
-	public static int[] add(int[] array, int index, int value) {
-		int len = array.length;
-		int[] result = new int[len + 1];
-		if (index > 0) {
-			System.arraycopy(array, 0, result, 0, index);
-		}
-		result[index] = value;
-		if (len > index) {
-			System.arraycopy(array, index, result, index + 1, len - index);
-		}
-		return result;
-	}
-
-	/**
-	 * Add all the elements returned by the specified iterable
-	 * to the specified collection.
-	 * Return whether the collection changed as a result.
-	 * java.util.Collection#addAll(java.lang.Iterable iterable)
-	 */
-	public static <E> boolean addAll(Collection<? super E> collection, Iterable<? extends E> iterable) {
-		return addAll(collection, iterable.iterator());
-	}
-
-	/**
-	 * Add all the elements returned by the specified iterable
-	 * to the specified collection.
-	 * Return whether the collection changed as a result.
-	 * java.util.Collection#addAll(java.lang.Iterable iterable)
-	 */
-	public static <E> boolean addAll(Collection<? super E> collection, Iterable<? extends E> iterable, int size) {
-		return addAll(collection, iterable.iterator(), size);
-	}
-
-	/**
-	 * Add all the elements returned by the specified iterator
-	 * to the specified collection.
-	 * Return whether the collection changed as a result.
-	 * java.util.Collection#addAll(java.util.Iterator iterator)
-	 */
-	public static <E> boolean addAll(Collection<? super E> collection, Iterator<? extends E> iterator) {
-		return (iterator.hasNext()) ? collection.addAll(list(iterator)) : false;
-	}
-
-	/**
-	 * Add all the elements returned by the specified iterator
-	 * to the specified collection.
-	 * Return whether the collection changed as a result.
-	 * java.util.Collection#addAll(java.util.Iterator iterator)
-	 */
-	public static <E> boolean addAll(Collection<? super E> collection, Iterator<? extends E> iterator, int size) {
-		return (iterator.hasNext()) ? collection.addAll(list(iterator, size)) : false;
-	}
-
-	/**
-	 * Add all the elements in the specified array
-	 * to the specified collection.
-	 * Return whether the collection changed as a result.
-	 * java.util.Collection#addAll(Object[] array)
-	 */
-	public static <E> boolean addAll(Collection<? super E> collection, E[] array) {
-		return (array.length == 0) ? false : collection.addAll(Arrays.asList(array));
-	}
-
-	/**
-	 * Add all the elements returned by the specified iterable
-	 * to the specified list at the specified index.
-	 * Return whether the list changed as a result.
-	 * java.util.List#addAll(java.lang.Iterable iterable)
-	 */
-	public static <E> boolean addAll(List<? super E> list, int index, Iterable<E> iterable) {
-		return addAll(list, index, iterable.iterator());
-	}
-
-	/**
-	 * Add all the elements returned by the specified iterable
-	 * to the specified list at the specified index.
-	 * Return whether the list changed as a result.
-	 * java.util.List#addAll(java.lang.Iterable iterable)
-	 */
-	public static <E> boolean addAll(List<? super E> list, int index, Iterable<E> iterable, int size) {
-		return addAll(list, index, iterable.iterator(), size);
-	}
-
-	/**
-	 * Add all the elements returned by the specified iterator
-	 * to the specified list at the specified index.
-	 * Return whether the list changed as a result.
-	 * java.util.List#addAll(java.util.Iterator iterator)
-	 */
-	public static <E> boolean addAll(List<? super E> list, int index, Iterator<? extends E> iterator) {
-		return (iterator.hasNext()) ? list.addAll(index, list(iterator)) : false;
-	}
-
-	/**
-	 * Add all the elements returned by the specified iterator
-	 * to the specified list at the specified index.
-	 * Return whether the list changed as a result.
-	 * java.util.List#addAll(java.util.Iterator iterator)
-	 */
-	public static <E> boolean addAll(List<? super E> list, int index, Iterator<? extends E> iterator, int size) {
-		return (iterator.hasNext()) ? list.addAll(index, list(iterator, size)) : false;
-	}
-
-	/**
-	 * Add all the elements in the specified array
-	 * to the specified list at the specified index.
-	 * Return whether the list changed as a result.
-	 * java.util.List#addAll(Object[] array)
-	 */
-	public static <E> boolean addAll(List<? super E> list, int index, E[] array) {
-		return (array.length == 0) ? false : list.addAll(index, Arrays.asList(array));
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array followed by the elements
-	 * in the specified collection.
-	 * java.util.Arrays#addAll(Object[] array, java.util.Collection c)
-	 */
-	public static <E> E[] addAll(E[] array, Collection<? extends E> collection) {
-		int size = collection.size();
-		return (size == 0) ? array : addAll(array, collection, size);
-	}
-
-	/**
-	 * assume collection is non-empty
-	 */
-	private static <E> E[] addAll_(E[] array, Collection<? extends E> collection) {
-		return addAll(array, collection, collection.size());
-	}
-
-	/**
-	 * assume collection is non-empty
-	 */
-	private static <E> E[] addAll(E[] array, Collection<? extends E> collection, int collectionSize) {
-		int len = array.length;
-		E[] result = newArray(array, len + collectionSize);
-		if (len > 0) {
-			System.arraycopy(array, 0, result, 0, len);
-		}
-		int i = len;
-		for (E item : collection) {
-			result[i++] = item;
-		}
-		return result;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array followed by the elements
-	 * in the specified iterable.
-	 * java.util.Arrays#addAll(Object[] array, java.lang.Iterable iterable)
-	 */
-	public static <E> E[] addAll(E[] array, Iterable<? extends E> iterable) {
-		return addAll(array, iterable.iterator());
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array followed by the elements
-	 * in the specified iterable.
-	 * java.util.Arrays#addAll(Object[] array, java.lang.Iterable iterable)
-	 */
-	public static <E> E[] addAll(E[] array, Iterable<? extends E> iterable, int size) {
-		return addAll(array, iterable.iterator(), size);
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array followed by the elements
-	 * in the specified iterator.
-	 * java.util.Arrays#addAll(Object[] array, java.util.Iterator iterator)
-	 */
-	public static <E> E[] addAll(E[] array, Iterator<? extends E> iterator) {
-		return (iterator.hasNext()) ? addAll_(array, list(iterator)) : array;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array followed by the elements
-	 * in the specified iterator.
-	 * java.util.Arrays#addAll(Object[] array, java.util.Iterator iterator)
-	 */
-	public static <E> E[] addAll(E[] array, Iterator<? extends E> iterator, int size) {
-		return (iterator.hasNext()) ? addAll_(array, list(iterator, size)) : array;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array 1 followed by the elements
-	 * in the specified array 2.
-	 * java.util.Arrays#addAll(Object[] array1, Object[] array2)
-	 */
-	public static <E> E[] addAll(E[] array1, E[] array2) {
-		int array2Length = array2.length;
-		return (array2Length == 0) ? array1 : addAll(array1, array2, array2Length);
-	}
-
-	/**
-	 * assume array2Length > 0
-	 */
-	private static <E> E[] addAll(E[] array1, E[] array2, int array2Length) {
-		int array1Length = array1.length;
-		return (array1Length == 0) ? array2 : addAll(array1, array2, array1Length, array2Length);
-	}
-
-	/**
-	 * assume array1Length > 0 and array2Length > 0
-	 */
-	private static <E> E[] addAll(E[] array1, E[] array2, int array1Length, int array2Length) {
-		E[] result = newArray(array1, array1Length + array2Length);
-		System.arraycopy(array1, 0, result, 0, array1Length);
-		System.arraycopy(array2, 0, result, array1Length, array2Length);
-		return result;
-	}
-
-	/**
-	 * Return a new array that contains all the elements in  all the
-	 * specified arrays, concatenated in the specified order.
-	 * This is useful for building constant arrays out other constant arrays.
-	 * java.util.Arrays#concatenate(Object[]... arrays)
-	 */
-	public static <E> E[] concatenate(E[]... arrays) {
-		int len = 0;
-		for (E[] array : arrays) {
-			len += array.length;
-		}
-		E[] result = newArray(arrays[0], len);
-		if (len == 0) {
-			return result;
-		}
-		int current = 0;
-		for (E[] array : arrays) {
-			int arrayLength = array.length;
-			if (arrayLength != 0) {
-				System.arraycopy(array, 0, result, current, arrayLength);
-				current += arrayLength;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * first specified array with the objects in the second
-	 * specified array added at the specified index.
-	 * java.util.Arrays#add(Object[] array1, int index, Object[] array2)
-	 */
-	public static <E> E[] addAll(E[] array1, int index, E[] array2) {
-		int array2Length = array2.length;
-		return (array2Length == 0) ? array1 : addAll(array1, index, array2, array2Length);
-	}
-
-	/**
-	 * assume array2Length > 0
-	 */
-	private static <E> E[] addAll(E[] array1, int index, E[] array2, int array2Length) {
-		int array1Length = array1.length;
-		return (index == array1Length) ?  // array2 added to end of array1
-				(array1Length == 0) ? array2 : addAll(array1, array2, array1Length, array2Length)
-			:
-				addAll(array1, index, array2, array1Length, array2Length);
-	}
-
-	/**
-	 * assume array1Length > 0 and array2Length > 0
-	 */
-	private static <E> E[] addAll(E[] array1, int index, E[] array2, int array1Length, int array2Length) {
-		E[] result = newArray(array1, array1Length + array2Length);
-		System.arraycopy(array1, 0, result, 0, index);
-		System.arraycopy(array2, 0, result, index, array2Length);
-		System.arraycopy(array1, index, result, index + array2Length, array1Length - index);
-		return result;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array with the elements
-	 * in the specified collection inserted at the specified index.
-	 * java.util.Arrays#addAll(Object[] array, int index, java.util.Collection c)
-	 */
-	public static <E> E[] addAll(E[] array, int index, Collection<? extends E> collection) {
-		int size = collection.size();
-		return (size == 0) ? array : addAll(array, index, collection, size);
-	}
-
-	/**
-	 * assume collection is non-empty
-	 */
-	private static <E> E[] addAll_(E[] array, int index, Collection<? extends E> collection) {
-		return addAll(array, index, collection, collection.size());
-	}
-
-	/**
-	 * assume collection is non-empty
-	 */
-	private static <E> E[] addAll(E[] array, int index, Collection<? extends E> collection, int collectionSize) {
-		int arrayLength = array.length;
-		E[] result = newArray(array, arrayLength + collectionSize);
-		if ((arrayLength == 0) && (index == 0)) {
-			return collection.toArray(result);
-		}
-		System.arraycopy(array, 0, result, 0, index);
-		int i = index;
-		for (E item : collection) {
-			result[i++] = item;
-		}
-		System.arraycopy(array, index, result, index + collectionSize, arrayLength - index);
-		return result;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array with the elements
-	 * in the specified iterable inserted at the specified index.
-	 * java.util.Arrays#addAll(Object[] array, int index, java.lang.Iterable iterable)
-	 */
-	public static <E> E[] addAll(E[] array, int index, Iterable<? extends E> iterable) {
-		return addAll(array, index, iterable.iterator());
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array with the elements
-	 * in the specified iterable inserted at the specified index.
-	 * java.util.Arrays#addAll(Object[] array, int index, java.lang.Iterable iterable)
-	 */
-	public static <E> E[] addAll(E[] array, int index, Iterable<? extends E> iterable, int size) {
-		return addAll(array, index, iterable.iterator(), size);
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array with the elements
-	 * in the specified iterator inserted at the specified index.
-	 * java.util.Arrays#addAll(Object[] array, int index, java.util.Iterator iterator)
-	 */
-	public static <E> E[] addAll(E[] array, int index, Iterator<? extends E> iterator) {
-		return (iterator.hasNext()) ? addAll_(array, index, list(iterator)) : array;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array with the elements
-	 * in the specified iterator inserted at the specified index.
-	 * java.util.Arrays#addAll(Object[] array, int index, java.util.Iterator iterator)
-	 */
-	public static <E> E[] addAll(E[] array, int index, Iterator<? extends E> iterator, int size) {
-		return (iterator.hasNext()) ? addAll_(array, index, list(iterator, size)) : array;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array 1 followed by the elements
-	 * in the specified array 2.
-	 * java.util.Arrays#addAll(char[] array1, char[] array2)
-	 */
-	public static char[] addAll(char[] array1, char[] array2) {
-		int array2Length = array2.length;
-		return (array2Length == 0) ? array1 : addAll(array1, array2, array2Length);
-	}
-
-	/**
-	 * assume array2Length > 0
-	 */
-	private static char[] addAll(char[] array1, char[] array2, int array2Length) {
-		int array1Length = array1.length;
-		return (array1Length == 0) ? array2 : addAll(array1, array2, array1Length, array2Length);
-	}
-
-	/**
-	 * assume array1Length > 0 and array2Length > 0
-	 */
-	private static char[] addAll(char[] array1, char[] array2, int array1Length, int array2Length) {
-		char[] result = new char[array1Length + array2Length];
-		System.arraycopy(array1, 0, result, 0, array1Length);
-		System.arraycopy(array2, 0, result, array1Length, array2Length);
-		return result;
-	}
-
-	/**
-	 * Return a new array that contains all the elements in  all the
-	 * specified arrays, concatenated in the specified order.
-	 * This is useful for building constant arrays out other constant arrays.
-	 * java.util.Arrays#concatenate(char[]... arrays)
-	 */
-	public static char[] concatenate(char[]... arrays) {
-		int len = 0;
-		for (char[] array : arrays) {
-			len += array.length;
-		}
-		if (len == 0) {
-			return EMPTY_CHAR_ARRAY;
-		}
-		char[] result = new char[len];
-		int current = 0;
-		for (char[] array : arrays) {
-			int arrayLength = array.length;
-			if (arrayLength != 0) {
-				System.arraycopy(array, 0, result, current, arrayLength);
-				current += arrayLength;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * first specified array with the objects in the second
-	 * specified array added at the specified index.
-	 * java.util.Arrays#add(char[] array1, int index, char[] array2)
-	 */
-	public static char[] addAll(char[] array1, int index, char[] array2) {
-		int array2Length = array2.length;
-		return (array2Length == 0) ? array1 : addAll(array1, index, array2, array2Length);
-	}
-
-	/**
-	 * assume array2Length > 0
-	 */
-	private static char[] addAll(char[] array1, int index, char[] array2, int array2Length) {
-		int array1Length = array1.length;
-		return (index == array1Length) ?  // array2 added to end of array1
-				(array1Length == 0) ? array2 : addAll(array1, array2, array1Length, array2Length)
-			:
-				addAll(array1, index, array2, array1Length, array2Length);
-	}
-
-	/**
-	 * assume array1Length > 0 and array2Length > 0
-	 */
-	private static char[] addAll(char[] array1, int index, char[] array2, int array1Length, int array2Length) {
-		char[] result = new char[array1Length + array2Length];
-		System.arraycopy(array1, 0, result, 0, index);
-		System.arraycopy(array2, 0, result, index, array2Length);
-		System.arraycopy(array1, index, result, index + array2Length, array1Length - index);
-		return result;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array 1 followed by the elements
-	 * in the specified array 2.
-	 * java.util.Arrays#addAll(int[] array1, int[] array2)
-	 */
-	public static int[] addAll(int[] array1, int[] array2) {
-		int array2Length = array2.length;
-		return (array2Length == 0) ? array1 : addAll(array1, array2, array2Length);
-	}
-
-	/**
-	 * assume array2Length > 0
-	 */
-	private static int[] addAll(int[] array1, int[] array2, int array2Length) {
-		int array1Length = array1.length;
-		return (array1Length == 0) ? array2 : addAll(array1, array2, array1Length, array2Length);
-	}
-
-	/**
-	 * assume array1Length > 0 and array2Length > 0
-	 */
-	private static int[] addAll(int[] array1, int[] array2, int array1Length, int array2Length) {
-		int[] result = new int[array1Length + array2Length];
-		System.arraycopy(array1, 0, result, 0, array1Length);
-		System.arraycopy(array2, 0, result, array1Length, array2Length);
-		return result;
-	}
-
-	/**
-	 * Return a new array that contains all the elements in  all the
-	 * specified arrays, concatenated in the specified order.
-	 * This is useful for building constant arrays out other constant arrays.
-	 * java.util.Arrays#concatenate(int[]... arrays)
-	 */
-	public static int[] concatenate(int[]... arrays) {
-		int len = 0;
-		for (int[] array : arrays) {
-			len += array.length;
-		}
-		if (len == 0) {
-			return EMPTY_INT_ARRAY;
-		}
-		int[] result = new int[len];
-		int current = 0;
-		for (int[] array : arrays) {
-			int arrayLength = array.length;
-			if (arrayLength != 0) {
-				System.arraycopy(array, 0, result, current, arrayLength);
-				current += arrayLength;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * first specified array with the objects in the second
-	 * specified array added at the specified index.
-	 * java.util.Arrays#add(int[] array1, int index, int[] array2)
-	 */
-	public static int[] addAll(int[] array1, int index, int[] array2) {
-		int array2Length = array2.length;
-		return (array2Length == 0) ? array1 : addAll(array1, index, array2, array2Length);
-	}
-
-	/**
-	 * assume array2Length > 0
-	 */
-	private static int[] addAll(int[] array1, int index, int[] array2, int array2Length) {
-		int array1Length = array1.length;
-		return (index == array1Length) ?  // array2 added to end of array1
-				(array1Length == 0) ? array2 : addAll(array1, array2, array1Length, array2Length)
-			:
-				addAll(array1, index, array2, array1Length, array2Length);
-	}
-
-	/**
-	 * assume array1Length > 0 and array2Length > 0
-	 */
-	private static int[] addAll(int[] array1, int index, int[] array2, int array1Length, int array2Length) {
-		int[] result = new int[array1Length + array2Length];
-		System.arraycopy(array1, 0, result, 0, index);
-		System.arraycopy(array2, 0, result, index, array2Length);
-		System.arraycopy(array1, index, result, index + array2Length, array1Length - index);
-		return result;
-	}
-
-	/**
-	 * Return an array corresponding to the specified iterable.
-	 * @see java.util.Collection#toArray()
-	 * java.lang.Iterable#toArray()
-	 */
-	public static Object[] array(Iterable<?> iterable) {
-		return array(iterable.iterator());
-	}
-
-	/**
-	 * Return an array corresponding to the specified iterable.
-	 * @see java.util.Collection#toArray()
-	 * java.lang.Iterable#toArray()
-	 */
-	public static Object[] array(Iterable<?> iterable, int size) {
-		return array(iterable.iterator(), size);
-	}
-
-	/**
-	 * Return an array corresponding to the specified iterable;
-	 * the runtime type of the returned array is that of the specified array.
-	 * If the collection fits in the specified array, it is returned therein.
-	 * Otherwise, a new array is allocated with the runtime type of the
-	 * specified array and the size of this collection.
-	 * @see java.util.Collection#toArray(java.lang.Object[])
-	 * java.lang.Iterable#toArray(Object[])
-	 */
-	public static <E> E[] array(Iterable<? extends E> iterable, E[] array) {
-		return array(iterable.iterator(), array);
-	}
-
-	/**
-	 * Return an array corresponding to the specified iterable;
-	 * the runtime type of the returned array is that of the specified array.
-	 * If the collection fits in the specified array, it is returned therein.
-	 * Otherwise, a new array is allocated with the runtime type of the
-	 * specified array and the size of this collection.
-	 * @see java.util.Collection#toArray(java.lang.Object[])
-	 * java.lang.Iterable#toArray(Object[])
-	 */
-	public static <E> E[] array(Iterable<? extends E> iterable, int size, E[] array) {
-		return array(iterable.iterator(), size, array);
-	}
-
-	/**
-	 * Return an array corresponding to the specified iterator.
-	 * @see java.util.Collection#toArray()
-	 * java.util.Iterator#toArray()
-	 */
-	public static Object[] array(Iterator<?> iterator) {
-		return (iterator.hasNext()) ? list(iterator).toArray() : EMPTY_OBJECT_ARRAY;
-	}
-	private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
-
-	/**
-	 * Return an array corresponding to the specified iterator.
-	 * @see java.util.Collection#toArray()
-	 * java.util.Iterator#toArray()
-	 */
-	public static Object[] array(Iterator<?> iterator, int size) {
-		return (iterator.hasNext()) ? list(iterator, size).toArray() : EMPTY_OBJECT_ARRAY;
-	}
-
-	/**
-	 * Return an array corresponding to the specified iterator;
-	 * the runtime type of the returned array is that of the specified array.
-	 * If the collection fits in the specified array, it is returned therein.
-	 * Otherwise, a new array is allocated with the runtime type of the
-	 * specified array and the size of this collection.
-	 * @see java.util.Collection#toArray(java.lang.Object[])
-	 * java.util.Iterator#toArray(Object[])
-	 */
-	public static <E> E[] array(Iterator<? extends E> iterator, E[] array) {
-		return (iterator.hasNext()) ? list(iterator).toArray(array) : newArray(array, 0);
-	}
-
-	/**
-	 * Return an array corresponding to the specified iterator;
-	 * the runtime type of the returned array is that of the specified array.
-	 * If the collection fits in the specified array, it is returned therein.
-	 * Otherwise, a new array is allocated with the runtime type of the
-	 * specified array and the size of this collection.
-	 * @see java.util.Collection#toArray(java.lang.Object[])
-	 * java.util.Iterator#toArray(Object[])
-	 */
-	public static <E> E[] array(Iterator<? extends E> iterator, int size, E[] array) {
-		return (iterator.hasNext()) ? list(iterator, size).toArray(array) : newArray(array, 0);
-	}
-
-	/**
-	 * Return a bag corresponding to the specified enumeration.
-	 * HashBag(java.util.Enumeration enumeration)
-	 */
-	public static <E> HashBag<E> bag(Enumeration<? extends E> enumeration) {
-		return bag(enumeration, new HashBag<E>());
-	}
-
-	/**
-	 * Return a bag corresponding to the specified enumeration.
-	 * HashBag(java.util.Enumeration enumeration)
-	 */
-	public static <E> HashBag<E> bag(Enumeration<? extends E> enumeration, int size) {
-		return bag(enumeration, new HashBag<E>(size));
-	}
-
-	private static <E> HashBag<E> bag(Enumeration<? extends E> enumeration, HashBag<E> bag) {
-		while (enumeration.hasMoreElements()) {
-			bag.add(enumeration.nextElement());
-		}
-		return bag;
-	}
-
-	/**
-	 * Return a bag corresponding to the specified iterable.
-	 * HashBag(java.lang.Iterable iterable)
-	 */
-	public static <E> HashBag<E> bag(Iterable<? extends E> iterable) {
-		return bag(iterable.iterator());
-	}
-
-	/**
-	 * Return a bag corresponding to the specified iterable.
-	 * HashBag(java.lang.Iterable iterable)
-	 */
-	public static <E> HashBag<E> bag(Iterable<? extends E> iterable, int size) {
-		return bag(iterable.iterator(), size);
-	}
-
-	/**
-	 * Return a bag corresponding to the specified iterator.
-	 * HashBag(java.util.Iterator iterator)
-	 */
-	public static <E> HashBag<E> bag(Iterator<? extends E> iterator) {
-		return bag(iterator, new HashBag<E>());
-	}
-
-	/**
-	 * Return a bag corresponding to the specified iterator.
-	 * HashBag(java.util.Iterator iterator)
-	 */
-	public static <E> HashBag<E> bag(Iterator<? extends E> iterator, int size) {
-		return bag(iterator, new HashBag<E>(size));
-	}
-
-	private static <E> HashBag<E> bag(Iterator<? extends E> iterator, HashBag<E> bag) {
-		while (iterator.hasNext()) {
-			bag.add(iterator.next());
-		}
-		return bag;
-	}
-
-	/**
-	 * Return a bag corresponding to the specified array.
-	 * HashBag(Object[] array)
-	 */
-	public static <E> HashBag<E> bag(E... array) {
-		int len = array.length;
-		HashBag<E> bag = new HashBag<E>(len);
-		for (E item : array) {
-			bag.add(item);
-		}
-		return bag;
-	}
-
-	/**
-	 * Clear the specified array.
-	 * java.util.Arrays#clear(Object[] array)
-	 */
-	public static <E> E[] clear(E[] array) {
-		if (array.length == 0) {
-			return array;
-		}
-		return newArray(array, 0);
-	}
-
-	/**
-	 * Return a collection corresponding to the specified enumeration.
-	 */
-	public static <E> HashBag<E> collection(Enumeration<? extends E> enumeration) {
-		return bag(enumeration);
-	}
-
-	/**
-	 * Return a collection corresponding to the specified enumeration.
-	 */
-	public static <E> HashBag<E> collection(Enumeration<? extends E> enumeration, int size) {
-		return bag(enumeration, size);
-	}
-
-	/**
-	 * Return a collection corresponding to the specified iterable.
-	 */
-	public static <E> HashBag<E> collection(Iterable<? extends E> iterable) {
-		return collection(iterable.iterator());
-	}
-
-	/**
-	 * Return a collection corresponding to the specified iterable.
-	 */
-	public static <E> HashBag<E> collection(Iterable<? extends E> iterable, int size) {
-		return collection(iterable.iterator(), size);
-	}
-
-	/**
-	 * Return a collection corresponding to the specified iterator.
-	 */
-	public static <E> HashBag<E> collection(Iterator<? extends E> iterator) {
-		return bag(iterator);
-	}
-
-	/**
-	 * Return a collection corresponding to the specified iterator.
-	 */
-	public static <E> HashBag<E> collection(Iterator<? extends E> iterator, int size) {
-		return bag(iterator, size);
-	}
-
-	/**
-	 * Return a collection corresponding to the specified array.
-	 */
-	public static <E> HashBag<E> collection(E... array) {
-		return bag(array);
-	}
-
-	/**
-	 * Return whether the specified enumeration contains the
-	 * specified element.
-	 * java.util.Enumeration#contains(Object o)
-	 */
-	public static boolean contains(Enumeration<?> enumeration, Object value) {
-		if (value == null) {
-			while (enumeration.hasMoreElements()) {
-				if (enumeration.nextElement() == null) {
-					return true;
-				}
-			}
-		} else {
-			while (enumeration.hasMoreElements()) {
-				if (value.equals(enumeration.nextElement())) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Return whether the specified iterable contains the
-	 * specified element.
-	 * java.lang.Iterable#contains(Object o)
-	 */
-	public static boolean contains(Iterable<?> iterable, Object value) {
-		return contains(iterable.iterator(), value);
-	}
-
-	/**
-	 * Return whether the specified iterator contains the
-	 * specified element.
-	 * java.util.Iterator#contains(Object o)
-	 */
-	public static boolean contains(Iterator<?> iterator, Object value) {
-		if (value == null) {
-			while (iterator.hasNext()) {
-				if (iterator.next() == null) {
-					return true;
-				}
-			}
-		} else {
-			while (iterator.hasNext()) {
-				if (value.equals(iterator.next())) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Return whether the specified array contains the
-	 * specified element.
-	 * java.util.Arrays#contains(Object[] array, Object o)
-	 */
-	public static boolean contains(Object[] array, Object value) {
-		if (value == null) {
-			for (int i = array.length; i-- > 0; ) {
-				if (array[i] == null) {
-					return true;
-				}
-			}
-		} else {
-			for (int i = array.length; i-- > 0; ) {
-				if (value.equals(array[i])) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Return whether the specified array contains the
-	 * specified element.
-	 * java.util.Arrays#contains(char[] array, char value)
-	 */
-	public static boolean contains(char[] array, char value) {
-		return contains(array, value, array.length);
-	}
-
-	private static boolean contains(char[] array, char value, int arrayLength) {
-		for (int i = arrayLength; i-- > 0; ) {
-			if (array[i] == value) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Return whether the specified array contains the
-	 * specified element.
-	 * java.util.Arrays#contains(int[] array, int value)
-	 */
-	public static boolean contains(int[] array, int value) {
-		return contains(array, value, array.length);
-	}
-
-	private static boolean contains(int[] array, int value, int arrayLength) {
-		for (int i = arrayLength; i-- > 0; ) {
-			if (array[i] == value) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Return whether the specified collection contains all of the
-	 * elements in the specified iterable.
-	 * java.util.Collection#containsAll(java.lang.Iterable iterable)
-	 */
-	public static boolean containsAll(Collection<?> collection, Iterable<?> iterable) {
-		return containsAll(collection, iterable.iterator());
-	}
-
-	/**
-	 * Return whether the specified collection contains all of the
-	 * elements in the specified iterator.
-	 * java.util.Collection#containsAll(java.util.Iterator iterator)
-	 */
-	public static boolean containsAll(Collection<?> collection, Iterator<?> iterator) {
-		while (iterator.hasNext()) {
-			if ( ! collection.contains(iterator.next())) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Return whether the specified collection contains all of the
-	 * elements in the specified array.
-	 * java.util.Collection#containsAll(Object[] array)
-	 */
-	public static boolean containsAll(Collection<?> collection, Object[] array) {
-		for (int i = array.length; i-- > 0; ) {
-			if ( ! collection.contains(array[i])) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Return whether the specified iterable contains all of the
-	 * elements in the specified collection.
-	 * java.lang.Iterable#containsAll(java.util.Collection collection)
-	 */
-	public static boolean containsAll(Iterable<?> iterable, Collection<?> collection) {
-		return containsAll(iterable.iterator(), collection);
-	}
-
-	/**
-	 * Return whether the specified iterable contains all of the
-	 * elements in the specified collection.
-	 * java.lang.Iterable#containsAll(java.util.Collection collection)
-	 */
-	public static boolean containsAll(Iterable<?> iterable, int size, Collection<?> collection) {
-		return containsAll(iterable.iterator(), size, collection);
-	}
-
-	/**
-	 * Return whether the specified iterable 1 contains all of the
-	 * elements in the specified iterable 2.
-	 * java.lang.Iterable#containsAll(java.lang.Iterable iterable)
-	 */
-	public static boolean containsAll(Iterable<?> iterable1, Iterable<?> iterable2) {
-		return containsAll(iterable1.iterator(), iterable2.iterator());
-	}
-
-	/**
-	 * Return whether the specified iterable 1 contains all of the
-	 * elements in the specified iterable 2.
-	 * java.lang.Iterable#containsAll(java.lang.Iterable iterable)
-	 */
-	public static boolean containsAll(Iterable<?> iterable1, int size, Iterable<?> iterable2) {
-		return containsAll(iterable1.iterator(), size, iterable2.iterator());
-	}
-
-	/**
-	 * Return whether the specified iterable contains all of the
-	 * elements in the specified iterator.
-	 * java.lang.Iterable#containsAll(java.util.Iterator iterator)
-	 */
-	public static boolean containsAll(Iterable<?> iterable, Iterator<?> iterator) {
-		return containsAll(iterable.iterator(), iterator);
-	}
-
-	/**
-	 * Return whether the specified iterable contains all of the
-	 * elements in the specified iterator.
-	 * java.lang.Iterable#containsAll(java.util.Iterator iterator)
-	 */
-	public static boolean containsAll(Iterable<?> iterable, int size, Iterator<?> iterator) {
-		return containsAll(iterable.iterator(), size, iterator);
-	}
-
-	/**
-	 * Return whether the specified iterable contains all of the
-	 * elements in the specified array.
-	 * java.lang.Iterable#containsAll(Object[] array)
-	 */
-	public static boolean containsAll(Iterable<?> iterable, Object[] array) {
-		return containsAll(iterable.iterator(), array);
-	}
-
-	/**
-	 * Return whether the specified iterable contains all of the
-	 * elements in the specified array.
-	 * java.lang.Iterable#containsAll(Object[] array)
-	 */
-	public static boolean containsAll(Iterable<?> iterable, int size, Object[] array) {
-		return containsAll(iterable.iterator(), size, array);
-	}
-
-	/**
-	 * Return whether the specified iterator contains all of the
-	 * elements in the specified collection.
-	 * java.util.Iterator#containsAll(java.util.Collection collection)
-	 */
-	public static boolean containsAll(Iterator<?> iterator, Collection<?> collection) {
-		return collection(iterator).containsAll(collection);
-	}
-
-	/**
-	 * Return whether the specified iterator contains all of the
-	 * elements in the specified collection.
-	 * java.util.Iterator#containsAll(java.util.Collection collection)
-	 */
-	public static boolean containsAll(Iterator<?> iterator, int size, Collection<?> collection) {
-		return collection(iterator, size).containsAll(collection);
-	}
-
-	/**
-	 * Return whether the specified iterator contains all of the
-	 * elements in the specified iterable.
-	 * java.util.Iterator#containsAll(java.lang.Iterable iterable)
-	 */
-	public static boolean containsAll(Iterator<?> iterator, Iterable<?> iterable) {
-		return containsAll(collection(iterator), iterable);
-	}
-
-	/**
-	 * Return whether the specified iterator contains all of the
-	 * elements in the specified iterable.
-	 * java.util.Iterator#containsAll(java.lang.Iterable iterable)
-	 */
-	public static boolean containsAll(Iterator<?> iterator, int size, Iterable<?> iterable) {
-		return containsAll(collection(iterator, size), iterable);
-	}
-
-	/**
-	 * Return whether the specified iterator 1 contains all of the
-	 * elements in the specified iterator 2.
-	 * java.util.Iterator#containsAll(java.util.Iterator iterator)
-	 */
-	public static boolean containsAll(Iterator<?> iterator1, Iterator<?> iterator2) {
-		return containsAll(collection(iterator1), iterator2);
-	}
-
-	/**
-	 * Return whether the specified iterator 1 contains all of the
-	 * elements in the specified iterator 2.
-	 * java.util.Iterator#containsAll(java.util.Iterator iterator)
-	 */
-	public static boolean containsAll(Iterator<?> iterator1, int size, Iterator<?> iterator2) {
-		return containsAll(collection(iterator1, size), iterator2);
-	}
-
-	/**
-	 * Return whether the specified iterator contains all of the
-	 * elements in the specified array.
-	 * java.util.Iterator#containsAll(Object[] array)
-	 */
-	public static boolean containsAll(Iterator<?> iterator, Object[] array) {
-		return containsAll(collection(iterator), array);
-	}
-
-	/**
-	 * Return whether the specified iterator contains all of the
-	 * elements in the specified array.
-	 * java.util.Iterator#containsAll(Object[] array)
-	 */
-	public static boolean containsAll(Iterator<?> iterator, int size, Object[] array) {
-		return containsAll(collection(iterator, size), array);
-	}
-
-	/**
-	 * Return whether the specified array contains all of the
-	 * elements in the specified collection.
-	 * java.util.Arrays#containsAll(Object[] array, java.util.Collection collection)
-	 */
-	public static boolean containsAll(Object[] array, Collection<?> collection) {
-		return containsAll(array, collection.iterator());
-	}
-
-	/**
-	 * Return whether the specified array contains all of the
-	 * elements in the specified iterable.
-	 * java.util.Arrays#containsAll(Object[] array, java.lang.Iterable iterable)
-	 */
-	public static boolean containsAll(Object[] array, Iterable<?> iterable) {
-		return containsAll(array, iterable.iterator());
-	}
-
-	/**
-	 * Return whether the specified array contains all of the
-	 * elements in the specified iterator.
-	 * java.util.Arrays#containsAll(Object[] array, java.util.Iterator iterator)
-	 */
-	public static boolean containsAll(Object[] array, Iterator<?> iterator) {
-		while (iterator.hasNext()) {
-			if ( ! contains(array, iterator.next())) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Return whether the specified array 1 contains all of the
-	 * elements in the specified array 2.
-	 * java.util.Arrays#containsAll(Object[] array1, Object[] array2)
-	 */
-	public static boolean containsAll(Object[] array1, Object[] array2) {
-		for (int i = array2.length; i-- > 0; ) {
-			if ( ! contains(array1, array2[i])) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Return whether the specified array 1 contains all of the
-	 * elements in the specified array 2.
-	 * java.util.Arrays#containsAll(char[] array1, char[] array2)
-	 */
-	public static boolean containsAll(char[] array1, char[] array2) {
-		for (int i = array2.length; i-- > 0; ) {
-			if ( ! contains(array1, array2[i])) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Return whether the specified array 1 contains all of the
-	 * elements in the specified array 2.
-	 * java.util.Arrays#containsAll(int[] array1, int[] array2)
-	 */
-	public static boolean containsAll(int[] array1, int[] array2) {
-		for (int i = array2.length; i-- > 0; ) {
-			if ( ! contains(array1, array2[i])) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Return the index of the first elements in the specified
-	 * arrays that are different, beginning at the end.
-	 * If the arrays are identical, return -1.
-	 * If the arrays are different sizes, return the index of the
-	 * last element in the longer array.
-	 * Use the elements' #equals() method to compare the
-	 * elements.
-	 */
-	public static int diffEnd(Object[] array1, Object[] array2) {
-		return diffEnd(Arrays.asList(array1), Arrays.asList(array2));
-	}
-
-	/**
-	 * Return the index of the first elements in the specified
-	 * lists that are different, beginning at the end.
-	 * If the lists are identical, return -1.
-	 * If the lists are different sizes, return the index of the
-	 * last element in the longer list.
-	 * Use the elements' #equals() method to compare the
-	 * elements.
-	 */
-	public static int diffEnd(List<?> list1, List<?> list2) {
-		int size1 = list1.size();
-		int size2 = list2.size();
-		if (size1 != size2) {
-			return Math.max(size1, size2) - 1;
-		}
-		int end = size1 - 1;
-		while (end > -1) {
-			Object o = list1.get(end);
-			if (o == null) {
-				if (list2.get(end) == null) {
-					end--;
-				} else {
-					return end;
-				}
-			} else {
-				if (o.equals(list2.get(end))) {
-					end--;
-				} else {
-					return end;
-				}
-			}
-		}
-		return end;
-	}
-
-	/**
-	 * Return the range of elements in the specified
-	 * arrays that are different.
-	 * If the arrays are identical, return [size, -1].
-	 * Use the elements' #equals() method to compare the
-	 * elements.
-	 * @see #diffStart(Object[], Object[])
-	 * @see #diffEnd(Object[], Object[])
-	 */
-	public static Range diffRange(Object[] array1, Object[] array2) {
-		return diffRange(Arrays.asList(array1), Arrays.asList(array2));
-	}
-
-	/**
-	 * Return the range of elements in the specified
-	 * arrays that are different.
-	 * If the arrays are identical, return [size, -1].
-	 * Use the elements' #equals() method to compare the
-	 * elements.
-	 * @see #diffStart(java.util.List, java.util.List)
-	 * @see #diffEnd(java.util.List, java.util.List)
-	 */
-	public static Range diffRange(List<?> list1, List<?> list2) {
-		int end = diffEnd(list1, list2);
-		if (end == -1) {
-			// the lists are identical, the start is the size of the two lists
-			return new Range(list1.size(), end);
-		}
-		// the lists are different, calculate the start of the range
-		return new Range(diffStart(list1, list2), end);
-	}
-
-	/**
-	 * Return the index of the first elements in the specified
-	 * arrays that are different. If the arrays are identical, return
-	 * the size of the two arrays (i.e. one past the last index).
-	 * If the arrays are different sizes and all the elements in
-	 * the shorter array match their corresponding elements in
-	 * the longer array, return the size of the shorter array
-	 * (i.e. one past the last index of the shorter array).
-	 * Use the elements' #equals() method to compare the
-	 * elements.
-	 */
-	public static int diffStart(Object[] array1, Object[] array2) {
-		return diffStart(Arrays.asList(array1), Arrays.asList(array2));
-	}
-
-	/**
-	 * Return the index of the first elements in the specified
-	 * lists that are different. If the lists are identical, return
-	 * the size of the two lists (i.e. one past the last index).
-	 * If the lists are different sizes and all the elements in
-	 * the shorter list match their corresponding elements in
-	 * the longer list, return the size of the shorter list
-	 * (i.e. one past the last index of the shorter list).
-	 * Use the elements' #equals() method to compare the
-	 * elements.
-	 */
-	public static int diffStart(List<?> list1, List<?> list2) {
-		int end = Math.min(list1.size(), list2.size());
-		int start = 0;
-		while (start < end) {
-			Object o = list1.get(start);
-			if (o == null) {
-				if (list2.get(start) == null) {
-					start++;
-				} else {
-					return start;
-				}
-			} else {
-				if (o.equals(list2.get(start))) {
-					start++;
-				} else {
-					return start;
-				}
-			}
-		}
-		return start;
-	}
-
-	/**
-	 * Return whether the specified iterators return equal elements.
-	 * java.util.Iterator#equals(java.util.Iterator iterator)
-	 */
-	public static boolean equals(Iterator<?> iterator1, Iterator<?> iterator2) {
-		while (iterator1.hasNext() && iterator2.hasNext()) {
-			Object o1 = iterator1.next();
-			Object o2 = iterator2.next();
-			if ( ! (o1 == null ? o2 == null : o1.equals(o2))) {
-				return false;
-			}
-		}
-		return ! (iterator1.hasNext() || iterator2.hasNext());
-	}
-
-	/**
-	 * Return the element corresponding to the specified index
-	 * in the specified iterator.
-	 * java.util.ListIterator#get(int index)
-	 */
-	public static <E> E get(ListIterator<? extends E> iterator, int index) {
-		while (iterator.hasNext()) {
-			E next = iterator.next();
-			if (iterator.previousIndex() == index) {
-				return next;
-			}
-		}
-		throw new IndexOutOfBoundsException(String.valueOf(index) + ':' + String.valueOf(iterator.previousIndex()));
-	}
-
-	/**
-	 * Return whether the specified arrays contain the same elements.
-	 * java.util.Arrays#identical(Object[] array1, Object[] array2)
-	 */
-	public static boolean identical(Object[] array1, Object[] array2) {
-		if (array1 == array2) {
-			return true;
-		}
-		if (array1 == null || array2 == null) {
-			return false;
-		}
-		int length = array1.length;
-		if (array2.length != length) {
-			return false;
-		}
-		for (int i = length; i-- > 0; ) {
-			if (array1[i] != array2[i]) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Return whether the specified iterators return the same elements.
-	 * java.util.Iterator#identical(java.util.Iterator iterator)
-	 */
-	public static boolean identical(Iterator<?> iterator1, Iterator<?> iterator2) {
-		while (iterator1.hasNext() && iterator2.hasNext()) {
-			if (iterator1.next() != iterator2.next()) {
-				return false;
-			}
-		}
-		return ! (iterator1.hasNext() || iterator2.hasNext());
-	}
-
-	/**
-	 * Return the index of the first elements in the specified
-	 * arrays that are different, beginning at the end.
-	 * If the arrays are identical, return -1.
-	 * If the arrays are different sizes, return the index of the
-	 * last element in the longer array.
-	 * Use object identity to compare the elements.
-	 */
-	public static int identityDiffEnd(Object[] array1, Object[] array2) {
-		return identityDiffEnd(Arrays.asList(array1), Arrays.asList(array2));
-	}
-
-	/**
-	 * Return the index of the first elements in the specified
-	 * lists that are different, beginning at the end.
-	 * If the lists are identical, return -1.
-	 * If the lists are different sizes, return the index of the
-	 * last element in the longer list.
-	 * Use object identity to compare the elements.
-	 */
-	public static int identityDiffEnd(List<?> list1, List<?> list2) {
-		int size1 = list1.size();
-		int size2 = list2.size();
-		if (size1 != size2) {
-			return Math.max(size1, size2) - 1;
-		}
-		int end = size1 - 1;
-		while (end > -1) {
-			if (list1.get(end) == list2.get(end)) {
-				end--;
-			} else {
-				return end;
-			}
-		}
-		return end;
-	}
-
-	/**
-	 * Return the range of elements in the specified
-	 * arrays that are different.
-	 * If the arrays are identical, return [size, -1].
-	 * Use object identity to compare the elements.
-	 * @see #identityDiffStart(Object[], Object[])
-	 * @see #identityDiffEnd(Object[], Object[])
-	 */
-	public static Range identityDiffRange(Object[] array1, Object[] array2) {
-		return identityDiffRange(Arrays.asList(array1), Arrays.asList(array2));
-	}
-
-	/**
-	 * Return the range of elements in the specified
-	 * arrays that are different.
-	 * If the arrays are identical, return [size, -1].
-	 * Use object identity to compare the elements.
-	 * @see #identityDiffStart(java.util.List, java.util.List)
-	 * @see #identityDiffEnd(java.util.List, java.util.List)
-	 */
-	public static Range identityDiffRange(List<?> list1, List<?> list2) {
-		int end = identityDiffEnd(list1, list2);
-		if (end == -1) {
-			// the lists are identical, the start is the size of the two lists
-			return new Range(list1.size(), end);
-		}
-		// the lists are different, calculate the start of the range
-		return new Range(identityDiffStart(list1, list2), end);
-	}
-
-	/**
-	 * Return the index of the first elements in the specified
-	 * arrays that are different. If the arrays are identical, return
-	 * the size of the two arrays (i.e. one past the last index).
-	 * If the arrays are different sizes and all the elements in
-	 * the shorter array match their corresponding elements in
-	 * the longer array, return the size of the shorter array
-	 * (i.e. one past the last index of the shorter array).
-	 * Use object identity to compare the elements.
-	 */
-	public static int identityDiffStart(Object[] array1, Object[] array2) {
-		return identityDiffStart(Arrays.asList(array1), Arrays.asList(array2));
-	}
-
-	/**
-	 * Return the index of the first elements in the specified
-	 * lists that are different. If the lists are identical, return
-	 * the size of the two lists (i.e. one past the last index).
-	 * If the lists are different sizes and all the elements in
-	 * the shorter list match their corresponding elements in
-	 * the longer list, return the size of the shorter list
-	 * (i.e. one past the last index of the shorter list).
-	 * Use object identity to compare the elements.
-	 */
-	public static int identityDiffStart(List<?> list1, List<?> list2) {
-		int end = Math.min(list1.size(), list2.size());
-		int start = 0;
-		while (start < end) {
-			if (list1.get(start) == list2.get(start)) {
-				start++;
-			} else {
-				return start;
-			}
-		}
-		return start;
-	}
-
-	/**
-	 * Return the index of the first occurrence of the
-	 * specified element in the specified iterator,
-	 * or return -1 if there is no such index.
-	 * java.util.Iterator#indexOf(Object o)
-	 */
-	public static int indexOf(Iterator<?> iterator, Object value) {
-		if (value == null) {
-			for (int i = 0; iterator.hasNext(); i++) {
-				if (iterator.next() == null) {
-					return i;
-				}
-			}
-		} else {
-			for (int i = 0; iterator.hasNext(); i++) {
-				if (value.equals(iterator.next())) {
-					return i;
-				}
-			}
-		}
-		return -1;
-	}
-
-	/**
-	 * Return the index of the first occurrence of the
-	 * specified element in the specified array,
-	 * or return -1 if there is no such index.
-	 * java.util.Arrays#indexOf(Object[] array, Object o)
-	 */
-	public static int indexOf(Object[] array, Object value) {
-		int len = array.length;
-		if (value == null) {
-			for (int i = 0; i < len; i++) {
-				if (array[i] == null) {
-					return i;
-				}
-			}
-		} else {
-			for (int i = 0; i < len; i++) {
-				if (value.equals(array[i])) {
-					return i;
-				}
-			}
-		}
-		return -1;
-	}
-
-	/**
-	 * Return the index of the first occurrence of the
-	 * specified element in the specified array,
-	 * or return -1 if there is no such index.
-	 * java.util.Arrays#indexOf(char[] array, char value)
-	 */
-	public static int indexOf(char[] array, char value) {
-		int len = array.length;
-		for (int i = 0; i < len; i++) {
-			if (array[i] == value) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-	/**
-	 * Return the index of the first occurrence of the
-	 * specified element in the specified array,
-	 * or return -1 if there is no such index.
-	 * java.util.Arrays#indexOf(int[] array, int value)
-	 */
-	public static int indexOf(int[] array, int value) {
-		int len = array.length;
-		for (int i = 0; i < len; i++) {
-			if (array[i] == value) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-	/**
-	 * Return the maximum index of where the specified comparable object
-	 * should be inserted into the specified sorted list and still keep
-	 * the list sorted.
-	 */
-	public static <E extends Comparable<? super E>> int insertionIndexOf(List<E> sortedList, Comparable<E> value) {
-		int len = sortedList.size();
-		for (int i = 0; i < len; i++) {
-			if (value.compareTo(sortedList.get(i)) < 0) {
-				return i;
-			}
-		}
-		return len;
-	}
-
-	/**
-	 * Return the maximum index of where the specified object
-	 * should be inserted into the specified sorted list and still keep
-	 * the list sorted.
-	 */
-	public static <E> int insertionIndexOf(List<E> sortedList, E value, Comparator<? super E> comparator) {
-		int len = sortedList.size();
-		for (int i = 0; i < len; i++) {
-			if (comparator.compare(value, sortedList.get(i)) < 0) {
-				return i;
-			}
-		}
-		return len;
-	}
-
-	/**
-	 * Return the maximum index of where the specified comparable object
-	 * should be inserted into the specified sorted array and still keep
-	 * the array sorted.
-	 */
-	public static <E extends Comparable<? super E>> int insertionIndexOf(E[] sortedArray, Comparable<E> value) {
-		int len = sortedArray.length;
-		for (int i = 0; i < len; i++) {
-			if (value.compareTo(sortedArray[i]) < 0) {
-				return i;
-			}
-		}
-		return len;
-	}
-
-	/**
-	 * Return the maximum index of where the specified comparable object
-	 * should be inserted into the specified sorted array and still keep
-	 * the array sorted.
-	 */
-	public static <E> int insertionIndexOf(E[] sortedArray, E value, Comparator<? super E> comparator) {
-		int len = sortedArray.length;
-		for (int i = 0; i < len; i++) {
-			if (comparator.compare(value, sortedArray[i]) < 0) {
-				return i;
-			}
-		}
-		return len;
-	}
-
-	/**
-	 * Return a one-use Iterable for the Iterator given.
-	 * Throws an IllegalStateException if iterable() is called more than once.
-	 * As such, this utility should only be used in one-use situations, such as
-	 * a "for" loop.
-	 */
-	public static <E> Iterable<E> iterable(Iterator<? extends E> iterator) {
-		return new SingleUseIterable<E>(iterator);
-	}
-
-	/**
-	 * Return an iterable on the elements in the specified array.
-	 * java.util.Arrays#iterable(Object[] array)
-	 */
-	public static <E> Iterable<E> iterable(E... array) {
-		return Arrays.asList(array);
-	}
-
-	/**
-	 * Return an iterator on the elements in the specified array.
-	 * java.util.Arrays#iterator(Object[] array)
-	 */
-	public static <E> Iterator<E> iterator(E... array) {
-		return new ArrayIterator<E>(array);
-	}
-
-	/**
-	 * Return the index of the last occurrence of the
-	 * specified element in the specified iterator,
-	 * or return -1 if there is no such index.
-	 * java.util.Iterator#lastIndexOf(Object o)
-	 */
-	public static int lastIndexOf(Iterator<?> iterator, Object value) {
-		return (iterator.hasNext()) ? list(iterator).lastIndexOf(value) : -1;
-	}
-
-	/**
-	 * Return the index of the last occurrence of the
-	 * specified element in the specified iterator,
-	 * or return -1 if there is no such index.
-	 * java.util.Iterator#lastIndexOf(Object o)
-	 */
-	public static int lastIndexOf(Iterator<?> iterator, int size, Object value) {
-		return (iterator.hasNext()) ? list(iterator, size).lastIndexOf(value) : -1;
-	}
-
-	/**
-	 * Return the index of the last occurrence of the
-	 * specified element in the specified array,
-	 * or return -1 if there is no such index.
-	 * java.util.Arrays#lastIndexOf(Object[] array, Object o)
-	 */
-	public static int lastIndexOf(Object[] array, Object value) {
-		int len = array.length;
-		if (value == null) {
-			for (int i = len; i-- > 0; ) {
-				if (array[i] == null) {
-					return i;
-				}
-			}
-		} else {
-			for (int i = len; i-- > 0; ) {
-				if (value.equals(array[i])) {
-					return i;
-				}
-			}
-		}
-		return -1;
-	}
-
-	/**
-	 * Return the index of the last occurrence of the
-	 * specified element in the specified array,
-	 * or return -1 if there is no such index.
-	 * java.util.Arrays#lastIndexOf(char[] array, char value)
-	 */
-	public static int lastIndexOf(char[] array, char value) {
-		for (int i = array.length; i-- > 0; ) {
-			if (array[i] == value) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-	/**
-	 * Return the index of the last occurrence of the
-	 * specified element in the specified array,
-	 * or return -1 if there is no such index.
-	 * java.util.Arrays#lastIndexOf(int[] array, int value)
-	 */
-	public static int lastIndexOf(int[] array, int value) {
-		for (int i = array.length; i-- > 0; ) {
-			if (array[i] == value) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-	/**
-	 * Return a list corresponding to the specified iterable.
-	 * java.lang.Iterable#toList()
-	 */
-	public static <E> ArrayList<E> list(Iterable<? extends E> iterable) {
-		return list(iterable.iterator());
-	}
-
-	/**
-	 * Return a list corresponding to the specified iterable.
-	 * java.lang.Iterable#toList()
-	 */
-	public static <E> ArrayList<E> list(Iterable<? extends E> iterable, int size) {
-		return list(iterable.iterator(), size);
-	}
-
-	/**
-	 * Return a list corresponding to the specified iterator.
-	 * java.util.Iterator#toList()
-	 */
-	public static <E> ArrayList<E> list(Iterator<? extends E> iterator) {
-		return list(iterator, new ArrayList<E>());
-	}
-
-	/**
-	 * Return a list corresponding to the specified iterator.
-	 * java.util.Iterator#toList()
-	 */
-	public static <E> ArrayList<E> list(Iterator<? extends E> iterator, int size) {
-		return list(iterator, new ArrayList<E>(size));
-	}
-
-	private static <E> ArrayList<E> list(Iterator<? extends E> iterator, ArrayList<E> list) {
-		while (iterator.hasNext()) {
-			list.add(iterator.next());
-		}
-		return list;
-	}
-
-	/**
-	 * Return a list corresponding to the specified array.
-	 * Unlike java.util.Arrays.asList(Object[]), the list
-	 * is modifiable and is not backed by the array.
-	 */
-	public static <E> ArrayList<E> list(E... array) {
-		ArrayList<E> list = new ArrayList<E>(array.length);
-		for (E item : array) {
-			list.add(item);
-		}
-		return list;
-	}
-
-	/**
-	 * Return a list iterator for the specified array.
-	 * java.util.Arrays#listIterator(Object[] array)
-	 */
-	public static <E> ListIterator<E> listIterator(E... array) {
-		return listIterator(array, 0);
-	}
-
-	/**
-	 * Return a list iterator for the specified array
-	 * starting at the specified position in the array.
-	 * java.util.Arrays#listIterator(Object[] array, int index)
-	 */
-	public static <E> ListIterator<E> listIterator(E[] array, int index) {
-		return Arrays.asList(array).listIterator(index);
-	}
-
-	/**
-	 * Return the character from the specified array with the maximum value.
-	 * java.util.Arrays#max(char[] array)
-	 */
-	public static char max(char... array) {
-		int len = array.length;
-		if (len == 0) {
-			throw new IndexOutOfBoundsException();
-		}
-		char max = array[0];
-		// start at 1
-		for (int i = 1; i < len; i++) {
-			char next = array[i];
-			if (next > max) {
-				max = next;
-			}
-		}
-		return max;
-	}
-
-	/**
-	 * Return the integer from the specified array with the maximum value.
-	 * java.util.Arrays#max(int[] array)
-	 */
-	public static int max(int... array) {
-		int len = array.length;
-		if (len == 0) {
-			throw new IndexOutOfBoundsException();
-		}
-		int max = array[0];
-		// start at 1
-		for (int i = 1; i < len; i++) {
-			int next = array[i];
-			if (next > max) {
-				max = next;
-			}
-		}
-		return max;
-	}
-
-	/**
-	 * Return the character from the specified array with the minimum value.
-	 * java.util.Arrays#min(char[] array)
-	 */
-	public static char min(char... array) {
-		int len = array.length;
-		if (len == 0) {
-			throw new IndexOutOfBoundsException();
-		}
-		char min = array[0];
-		// start at 1
-		for (int i = 1; i < len; i++) {
-			char next = array[i];
-			if (next < min) {
-				min = next;
-			}
-		}
-		return min;
-	}
-
-	/**
-	 * Return the integer from the specified array with the minimum value.
-	 * java.util.Arrays#min(int[] array)
-	 */
-	public static int min(int... array) {
-		int len = array.length;
-		if (len == 0) {
-			throw new IndexOutOfBoundsException();
-		}
-		int min = array[0];
-		// start at 1
-		for (int i = 1; i < len; i++) {
-			int next = array[i];
-			if (next < min) {
-				min = next;
-			}
-		}
-		return min;
-	}
-
-	/**
-	 * Move an element from the specified source index to the specified target
-	 * index. Return the altered array.
-	 * java.util.Arrays#move(Object[] array, int targetIndex, int sourceIndex)
-	 */
-	public static <E> E[] move(E[] array, int targetIndex, int sourceIndex) {
-		return (targetIndex == sourceIndex) ? array : move_(array, targetIndex, sourceIndex);
-	}
-
-	/**
-	 * assume targetIndex != sourceIndex
-	 */
-	private static <E> E[] move_(E[] array, int targetIndex, int sourceIndex) {
-		E temp = array[sourceIndex];
-		if (targetIndex < sourceIndex) {
-			System.arraycopy(array, targetIndex, array, targetIndex + 1, sourceIndex - targetIndex);
-		} else {
-			System.arraycopy(array, sourceIndex + 1, array, sourceIndex, targetIndex - sourceIndex);
-		}
-		array[targetIndex] = temp;
-		return array;
-	}
-
-	/**
-	 * Move elements from the specified source index to the specified target
-	 * index. Return the altered array.
-	 * java.util.Arrays#move(Object[] array, int targetIndex, int sourceIndex, int length)
-	 */
-	public static <E> E[] move(E[] array, int targetIndex, int sourceIndex, int length) {
-		if ((targetIndex == sourceIndex) || (length == 0)) {
-			return array;
-		}
-		if (length == 1) {
-			return move_(array, targetIndex, sourceIndex);
-		}
-		E[] temp = newArray(array, length);
-		System.arraycopy(array, sourceIndex, temp, 0, length);
-		if (targetIndex < sourceIndex) {
-			System.arraycopy(array, targetIndex, array, targetIndex + length, sourceIndex - targetIndex);
-		} else {
-			System.arraycopy(array, sourceIndex + length, array, sourceIndex, targetIndex - sourceIndex);
-		}
-		System.arraycopy(temp, 0, array, targetIndex, length);
-		return array;
-	}
-
-	/**
-	 * Move an element from the specified source index to the specified target
-	 * index. Return the altered array.
-	 * java.util.Arrays#move(int[] array, int targetIndex, int sourceIndex)
-	 */
-	public static int[] move(int[] array, int targetIndex, int sourceIndex) {
-		return (targetIndex == sourceIndex) ? array : move_(array, targetIndex, sourceIndex);
-	}
-
-	/**
-	 * assume targetIndex != sourceIndex
-	 */
-	private static int[] move_(int[] array, int targetIndex, int sourceIndex) {
-		int temp = array[sourceIndex];
-		if (targetIndex < sourceIndex) {
-			System.arraycopy(array, targetIndex, array, targetIndex + 1, sourceIndex - targetIndex);
-		} else {
-			System.arraycopy(array, sourceIndex + 1, array, sourceIndex, targetIndex - sourceIndex);
-		}
-		array[targetIndex] = temp;
-		return array;
-	}
-
-	/**
-	 * Move elements from the specified source index to the specified target
-	 * index. Return the altered array.
-	 * java.util.Arrays#move(int[] array, int targetIndex, int sourceIndex, int length)
-	 */
-	public static int[] move(int[] array, int targetIndex, int sourceIndex, int length) {
-		if ((targetIndex == sourceIndex) || (length == 0)) {
-			return array;
-		}
-		if (length == 1) {
-			return move_(array, targetIndex, sourceIndex);
-		}
-		int[] temp = new int[length];
-		System.arraycopy(array, sourceIndex, temp, 0, length);
-		if (targetIndex < sourceIndex) {
-			System.arraycopy(array, targetIndex, array, targetIndex + length, sourceIndex - targetIndex);
-		} else {
-			System.arraycopy(array, sourceIndex + length, array, sourceIndex, targetIndex - sourceIndex);
-		}
-		System.arraycopy(temp, 0, array, targetIndex, length);
-		return array;
-	}
-
-	/**
-	 * Move an element from the specified source index to the specified target
-	 * index. Return the altered array.
-	 * java.util.Arrays#move(char[] array, int targetIndex, int sourceIndex)
-	 */
-	public static char[] move(char[] array, int targetIndex, int sourceIndex) {
-		return (targetIndex == sourceIndex) ? array : move_(array, targetIndex, sourceIndex);
-	}
-
-	/**
-	 * assume targetIndex != sourceIndex
-	 */
-	private static char[] move_(char[] array, int targetIndex, int sourceIndex) {
-		char temp = array[sourceIndex];
-		if (targetIndex < sourceIndex) {
-			System.arraycopy(array, targetIndex, array, targetIndex + 1, sourceIndex - targetIndex);
-		} else {
-			System.arraycopy(array, sourceIndex + 1, array, sourceIndex, targetIndex - sourceIndex);
-		}
-		array[targetIndex] = temp;
-		return array;
-	}
-
-	/**
-	 * Move elements from the specified source index to the specified target
-	 * index. Return the altered array.
-	 * java.util.Arrays#move(char[] array, int targetIndex, int sourceIndex, int length)
-	 */
-	public static char[] move(char[] array, int targetIndex, int sourceIndex, int length) {
-		if ((targetIndex == sourceIndex) || (length == 0)) {
-			return array;
-		}
-		if (length == 1) {
-			return move_(array, targetIndex, sourceIndex);
-		}
-		char[] temp = new char[length];
-		System.arraycopy(array, sourceIndex, temp, 0, length);
-		if (targetIndex < sourceIndex) {
-			System.arraycopy(array, targetIndex, array, targetIndex + length, sourceIndex - targetIndex);
-		} else {
-			System.arraycopy(array, sourceIndex + length, array, sourceIndex, targetIndex - sourceIndex);
-		}
-		System.arraycopy(temp, 0, array, targetIndex, length);
-		return array;
-	}
-
-	/**
-	 * Move an element from the specified source index to the specified target
-	 * index. Return the altered list.
-	 * java.util.List#move(int targetIndex, int sourceIndex)
-	 */
-	public static <E> List<E> move(List<E> list, int targetIndex, int sourceIndex) {
-		return (targetIndex == sourceIndex) ? list : move_(list, targetIndex, sourceIndex);
-	}
-
-	/**
-	 * assume targetIndex != sourceIndex
-	 */
-	private static <E> List<E> move_(List<E> list, int targetIndex, int sourceIndex) {
-		if (list instanceof RandomAccess) {
-			// move elements, leaving the list in place
-			E temp = list.get(sourceIndex);
-			if (targetIndex < sourceIndex) {
-				for (int i = sourceIndex; i-- > targetIndex; ) {
-					list.set(i + 1, list.get(i));
-				}
-			} else {
-				for (int i = sourceIndex; i < targetIndex; i++) {
-					list.set(i, list.get(i + 1));
-				}
-			}
-			list.set(targetIndex, temp);
-		} else {
-			// remove the element and re-add it at the target index
-			list.add(targetIndex, list.remove(sourceIndex));
-		}
-		return list;
-	}
-
-	/**
-	 * Move elements from the specified source index to the specified target
-	 * index. Return the altered list.
-	 * java.util.List#move(int targetIndex, int sourceIndex, int length)
-	 */
-	public static <E> List<E> move(List<E> list, int targetIndex, int sourceIndex, int length) {
-		if ((targetIndex == sourceIndex) || (length == 0)) {
-			return list;
-		}
-		if (length == 1) {
-			return move_(list, targetIndex, sourceIndex);
-		}
-		if (list instanceof RandomAccess) {
-			// move elements, leaving the list in place
-			ArrayList<E> temp = new ArrayList<E>(list.subList(sourceIndex, sourceIndex + length));
-			if (targetIndex < sourceIndex) {
-				for (int i = sourceIndex; i-- > targetIndex; ) {
-					list.set(i + length, list.get(i));
-				}
-			} else {
-				for (int i = sourceIndex; i < targetIndex; i++) {
-					list.set(i, list.get(i + length));
-				}
-			}
-			for (int i = 0; i < length; i++) {
-				list.set(targetIndex + i, temp.get(i));
-			}
-		} else {
-			// remove the elements and re-add them at the target index
-			list.addAll(targetIndex, removeElementsAtIndex(list, sourceIndex, length));
-		}
-		return list;
-	}
-
-	/**
-	 * Replace all occurrences of the specified old value with
-	 * the specified new value.
-	 * java.util.Arrays#replaceAll(Object[] array, Object oldValue, Object newValue)
-	 */
-	public static <E> E[] replaceAll(E[] array, Object oldValue, E newValue) {
-		if (oldValue == null) {
-			for (int i = array.length; i-- > 0; ) {
-				if (array[i] == null) {
-					array[i] = newValue;
-				}
-			}
-		} else {
-			for (int i = array.length; i-- > 0; ) {
-				if (oldValue.equals(array[i])) {
-					array[i] = newValue;
-				}
-			}
-		}
-		return array;
-	}
-
-	/**
-	 * Replace all occurrences of the specified old value with
-	 * the specified new value.
-	 * java.util.Arrays#replaceAll(int[] array, int oldValue, int newValue)
-	 */
-	public static int[] replaceAll(int[] array, int oldValue, int newValue) {
-		for (int i = array.length; i-- > 0; ) {
-			if (array[i] == oldValue) {
-				array[i] = newValue;
-			}
-		}
-		return array;
-	}
-
-	/**
-	 * Replace all occurrences of the specified old value with
-	 * the specified new value.
-	 * java.util.Arrays#replaceAll(char[] array, char oldValue, char newValue)
-	 */
-	public static char[] replaceAll(char[] array, char oldValue, char newValue) {
-		for (int i = array.length; i-- > 0; ) {
-			if (array[i] == oldValue) {
-				array[i] = newValue;
-			}
-		}
-		return array;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array with the specified element removed.
-	 * java.util.Arrays#remove(Object[] array, Object value)
-	 */
-	public static <E> E[] remove(E[] array, Object value) {
-		return removeElementAtIndex(array, indexOf(array, value));
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array with the specified element removed.
-	 * java.util.Arrays#remove(char[] array, char value)
-	 */
-	public static char[] remove(char[] array, char value) {
-		return removeElementAtIndex(array, indexOf(array, value));
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array with the specified element removed.
-	 * java.util.Arrays#remove(int[] array, int value)
-	 */
-	public static int[] remove(int[] array, int value) {
-		return removeElementAtIndex(array, indexOf(array, value));
-	}
-
-	/**
-	 * Remove all the elements returned by the specified iterable
-	 * from the specified collection.
-	 * Return whether the collection changed as a result.
-	 * java.util.Collection#removeAll(java.lang.Iterable iterable)
-	 */
-	public static boolean removeAll(Collection<?> collection, Iterable<?> iterable) {
-		return removeAll(collection, iterable.iterator());
-	}
-
-	/**
-	 * Remove all the elements returned by the specified iterable
-	 * from the specified collection.
-	 * Return whether the collection changed as a result.
-	 * java.util.Collection#removeAll(java.lang.Iterable iterable)
-	 */
-	public static boolean removeAll(Collection<?> collection, Iterable<?> iterable, int size) {
-		return removeAll(collection, iterable.iterator(), size);
-	}
-
-	/**
-	 * Remove all the elements returned by the specified iterator
-	 * from the specified collection.
-	 * Return whether the collection changed as a result.
-	 * java.util.Collection#removeAll(java.util.Iterator iterator)
-	 */
-	public static boolean removeAll(Collection<?> collection, Iterator<?> iterator) {
-		return (iterator.hasNext()) ? collection.removeAll(set(iterator)) : false;
-	}
-
-	/**
-	 * Remove all the elements returned by the specified iterator
-	 * from the specified collection.
-	 * Return whether the collection changed as a result.
-	 * java.util.Collection#removeAll(java.util.Iterator iterator)
-	 */
-	public static boolean removeAll(Collection<?> collection, Iterator<?> iterator, int size) {
-		return (iterator.hasNext()) ? collection.removeAll(set(iterator, size)) : false;
-	}
-
-	/**
-	 * Remove all the elements in the specified array
-	 * from the specified collection.
-	 * Return whether the collection changed as a result.
-	 * java.util.Collection#removeAll(Object[] array)
-	 */
-	public static boolean removeAll(Collection<?> collection, Object[] array) {
-		return collection.removeAll(set(array));
-	}
-
-	/**
-	 * Remove from the specified array all the elements in
-	 * the specified iterable and return the result.
-	 * java.util.Arrays#removeAll(Object[] array, Iterable iterable)
-	 */
-	public static <E> E[] removeAll(E[] array, Iterable<?> iterable) {
-		return removeAll(array, iterable.iterator());
-	}
-
-	/**
-	 * Remove from the specified array all the elements in
-	 * the specified iterable and return the result.
-	 * java.util.Arrays#removeAll(Object[] array, Iterable iterable)
-	 */
-	public static <E> E[] removeAll(E[] array, Iterable<?> iterable, int size) {
-		return removeAll(array, iterable.iterator(), size);
-	}
-
-	/**
-	 * Remove from the specified array all the elements in
-	 * the specified iterator and return the result.
-	 * java.util.Arrays#removeAll(Object[] array, Iterator iterator)
-	 */
-	public static <E> E[] removeAll(E[] array, Iterator<?> iterator) {
-		return (iterator.hasNext()) ? removeAll_(array, set(iterator)) : array;
-	}
-
-	/**
-	 * Remove from the specified array all the elements in
-	 * the specified iterator and return the result.
-	 * java.util.Arrays#removeAll(Object[] array, Iterator iterator)
-	 */
-	public static <E> E[] removeAll(E[] array, Iterator<?> iterator, int size) {
-		return (iterator.hasNext()) ? removeAll_(array, set(iterator, size)) : array;
-	}
-
-	/**
-	 * Remove from the specified array all the elements in
-	 * the specified collection and return the result.
-	 * java.util.Arrays#removeAll(Object[] array, Collection collection)
-	 */
-	public static <E> E[] removeAll(E[] array, Collection<?> collection) {
-		return (collection.isEmpty()) ? array : removeAll_(array, collection);
-	}
-
-	/**
-	 * assume the collection is non-empty
-	 */
-	private static <E> E[] removeAll_(E[] array, Collection<?> collection) {
-		int arrayLength = array.length;
-		return (arrayLength == 0) ? array : removeAll(array, collection, arrayLength);
-	}
-
-	/**
-	 * assume the collection is non-empty and arrayLength > 0
-	 */
-	private static <E> E[] removeAll(E[] array, Collection<?> collection, int arrayLength) {
-		int[] indices = new int[arrayLength];
-		int j = 0;
-		for (int i = 0; i < arrayLength; i++) {
-			if ( ! collection.contains(array[i])) {
-				indices[j++] = i;
-			}
-		}
-		if (j == arrayLength) {
-			return array;  // nothing was removed
-		}
-		E[] result = newArray(array, j);
-		int resultLength = result.length;
-		for (int i = 0; i < resultLength; i++) {
-			result[i] = array[indices[i]];
-		}
-		return result;
-	}
-
-	/**
-	 * Remove from the first specified array all the elements in
-	 * the second specified array and return the result.
-	 * java.util.Arrays#removeAll(Object[] array1, Object[] array2)
-	 */
-	public static <E> E[] removeAll(E[] array1, Object[] array2) {
-		// convert to a bag to take advantage of hashed look-up
-		return (array2.length == 0) ? array1 : removeAll_(array1, set(array2));
-	}
-
-	/**
-	 * Remove from the first specified array all the elements in
-	 * the second specified array and return the result.
-	 * java.util.Arrays#removeAll(char[] array1, char[] array2)
-	 */
-	public static char[] removeAll(char[] array1, char[] array2) {
-		if (array2.length == 0) {
-			return array1;
-		}
-		int array1Length = array1.length;
-		if (array1Length == 0) {
-			return array1;
-		}
-		int[] indices = new int[array1Length];
-		int j = 0;
-		for (int i = 0; i < array1Length; i++) {
-			if ( ! contains(array2, array1[i])) {
-				indices[j++] = i;
-			}
-		}
-		if (j == array1Length) {
-			return array1;  // nothing was removed
-		}
-		char[] result = new char[j];
-		int resultLength = result.length;
-		for (int i = 0; i < resultLength; i++) {
-			result[i] = array1[indices[i]];
-		}
-		return result;
-	}
-
-	/**
-	 * Remove from the first specified array all the elements in
-	 * the second specified array and return the result.
-	 * java.util.Arrays#removeAll(int[] array1, int[] array2)
-	 */
-	public static int[] removeAll(int[] array1, int[] array2) {
-		if (array2.length == 0) {
-			return array1;
-		}
-		int array1Length = array1.length;
-		if (array1Length == 0) {
-			return array1;
-		}
-		int[] indices = new int[array1Length];
-		int j = 0;
-		for (int i = 0; i < array1Length; i++) {
-			if ( ! contains(array2, array1[i])) {
-				indices[j++] = i;
-			}
-		}
-		if (j == array1Length) {
-			return array1;  // nothing was removed
-		}
-		int[] result = new int[j];
-		int resultLength = result.length;
-		for (int i = 0; i < resultLength; i++) {
-			result[i] = array1[indices[i]];
-		}
-		return result;
-	}
-
-	/**
-	 * Remove all occurrences of the specified element
-	 * from the specified collection.
-	 * Return whether the collection changed as a result.
-	 * java.util.Collection#removeAllOccurrences(Object value)
-	 */
-	public static boolean removeAllOccurrences(Collection<?> collection, Object value) {
-		boolean modified = false;
-		Iterator<?> stream = collection.iterator();
-		if (value == null) {
-			while (stream.hasNext()) {
-				if (stream.next() == null) {
-					stream.remove();
-					modified = true;
-				}
-			}
-		} else {
-			while (stream.hasNext()) {
-				if (value.equals(stream.next())) {
-					stream.remove();
-					modified = true;
-				}
-			}
-		}
-		return modified;
-	}
-
-	/**
-	 * Remove from the specified array all occurrences of
-	 * the specified element and return the result.
-	 * java.util.Arrays#removeAllOccurrences(Object[] array, Object value)
-	 */
-	public static <E> E[] removeAllOccurrences(E[] array, Object value) {
-		int arrayLength = array.length;
-		if (arrayLength == 0) {
-			return array;
-		}
-		int[] indices = new int[arrayLength];
-		int j = 0;
-		if (value == null) {
-			for (int i = arrayLength; i-- > 0; ) {
-				if (array[i] != null) {
-					indices[j++] = i;
-				}
-			}
-		} else {
-			for (int i = array.length; i-- > 0; ) {
-				if ( ! value.equals(array[i])) {
-					indices[j++] = i;
-				}
-			}
-		}
-		if (j == arrayLength) {
-			return array;  // nothing was removed
-		}
-		E[] result = newArray(array, j);
-		int resultLength = result.length;
-		for (int i = 0; i < resultLength; i++) {
-			result[i] = array[indices[i]];
-		}
-		return result;
-	}
-
-	/**
-	 * Remove from the specified array all occurrences of
-	 * the specified element and return the result.
-	 * java.util.Arrays#removeAllOccurrences(char[] array, char value)
-	 */
-	public static char[] removeAllOccurrences(char[] array, char value) {
-		int arrayLength = array.length;
-		if (arrayLength == 0) {
-			return array;
-		}
-		int[] indices = new int[arrayLength];
-		int j = 0;
-		for (int i = arrayLength; i-- > 0; ) {
-			if (array[i] != value) {
-				indices[j++] = i;
-			}
-		}
-		if (j == arrayLength) {
-			return array;  // nothing was removed
-		}
-		char[] result = new char[j];
-		int resultLength = result.length;
-		for (int i = 0; i < resultLength; i++) {
-			result[i] = array[indices[i]];
-		}
-		return result;
-	}
-
-	/**
-	 * Remove from the specified array all occurrences of
-	 * the specified element and return the result.
-	 * java.util.Arrays#removeAllOccurrences(int[] array, int value)
-	 */
-	public static int[] removeAllOccurrences(int[] array, int value) {
-		int arrayLength = array.length;
-		if (arrayLength == 0) {
-			return array;
-		}
-		int[] indices = new int[arrayLength];
-		int j = 0;
-		for (int i = arrayLength; i-- > 0; ) {
-			if (array[i] != value) {
-				indices[j++] = i;
-			}
-		}
-		if (j == arrayLength) {
-			return array;  // nothing was removed
-		}
-		int[] result = new int[j];
-		int resultLength = result.length;
-		for (int i = 0; i < resultLength; i++) {
-			result[i] = array[indices[i]];
-		}
-		return result;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array with the specified element removed.
-	 * java.util.Arrays#removeElementAtIndex(Object[] array, int index)
-	 */
-	public static <E> E[] removeElementAtIndex(E[] array, int index) {
-		return removeElementsAtIndex(array, index, 1);
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array with the specified element removed.
-	 * java.util.Arrays#removeElementAtIndex(char[] array, int index)
-	 */
-	public static char[] removeElementAtIndex(char[] array, int index) {
-		return removeElementsAtIndex(array, index, 1);
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array with the specified element removed.
-	 * java.util.Arrays#removeElementAtIndex(int[] array, int index)
-	 */
-	public static int[] removeElementAtIndex(int[] array, int index) {
-		return removeElementsAtIndex(array, index, 1);
-	}
-
-	/**
-	 * Remove the elements at the specified index.
-	 * Return the removed elements.
-	 * java.util.List#remove(int index, int length)
-	 */
-	public static <E> ArrayList<E> removeElementsAtIndex(List<E> list, int index, int length) {
-		List<E> subList = list.subList(index, index + length);
-		ArrayList<E> result = new ArrayList<E>(subList);
-		subList.clear();
-		return result;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array with the specified elements removed.
-	 * java.util.Arrays#removeElementsAtIndex(Object[] array, int index, int length)
-	 */
-	public static <E> E[] removeElementsAtIndex(E[] array, int index, int length) {
-		int arrayLength = array.length;
-		int newLength = arrayLength - length;
-		E[] result = newArray(array, newLength);
-		if ((newLength == 0) && (index == 0)) {
-			return result;  // performance tweak
-		}
-		System.arraycopy(array, 0, result, 0, index);
-		System.arraycopy(array, index + length, result, index, newLength - index);
-		return result;
-	}
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array with the specified elements removed.
-	 * java.util.Arrays#removeElementAtIndex(char[] array, int index, int length)
-	 */
-	public static char[] removeElementsAtIndex(char[] array, int index, int length) {
-		int arrayLength = array.length;
-		int newLength = arrayLength - length;
-		if ((newLength == 0) && (index == 0)) {
-			return EMPTY_CHAR_ARRAY;  // performance tweak
-		}
-		char[] result = new char[newLength];
-		System.arraycopy(array, 0, result, 0, index);
-		System.arraycopy(array, index + length, result, index, newLength - index);
-		return result;
-	}
-	private static final char[] EMPTY_CHAR_ARRAY = new char[0];
-
-	/**
-	 * Return a new array that contains the elements in the
-	 * specified array with the specified elements removed.
-	 * java.util.Arrays#removeElementAtIndex(int[] array, int index, int length)
-	 */
-	public static int[] removeElementsAtIndex(int[] array, int index, int length) {
-		int arrayLength = array.length;
-		int newLength = arrayLength - length;
-		if ((newLength == 0) && (index == 0)) {
-			return EMPTY_INT_ARRAY;  // performance tweak
-		}
-		int[] result = new int[newLength];
-		System.arraycopy(array, 0, result, 0, index);
-		System.arraycopy(array, index + length, result, index, newLength - index);
-		return result;
-	}
-	private static final int[] EMPTY_INT_ARRAY = new int[0];
-
-	/**
-	 * Remove any duplicate elements from the specified array,
-	 * while maintaining the order.
-	 */
-	public static <E> E[] removeDuplicateElements(E... array) {
-		int len = array.length;
-		if ((len == 0) || (len == 1)) {
-			return array;
-		}
-		ArrayList<E> temp = list(array);
-		return removeDuplicateElements(temp, len) ?
-					temp.toArray(newArray(array, temp.size()))
-				:
-					array;
-	}
-
-	/**
-	 * Remove any duplicate elements from the specified list,
-	 * while maintaining the order.
-	 * Return whether the list changed as a result.
-	 */
-	public static <E> boolean removeDuplicateElements(List<E> list) {
-		int size = list.size();
-		if ((size == 0) || (size == 1)) {
-			return false;
-		}
-		return removeDuplicateElements(list, size);
-	}
-
-	/**
-	 * assume list is non-empty
-	 */
-	private static <E> boolean removeDuplicateElements(List<E> list, int size) {
-		LinkedHashSet<E> temp = new LinkedHashSet<E>(size);		// take advantage of hashed look-up
-		boolean changed = false;
-		for (E item : list) {
-			if ( ! temp.add(item)) {
-				changed = true;  // duplicate item
-			}
-		}
-		if (changed) {
-			int i = 0;
-			for (Iterator<E> stream = temp.iterator(); stream.hasNext(); ) {
-				list.set(i, stream.next());
-				i++;
-			}
-			int tempSize = temp.size();
-			for (i = list.size(); i-- > tempSize; ) {
-				list.remove(i);  // pull off the end
-			}
-		}
-		return changed;
-	}
-
-	/**
-	 * Retain only the elements in the specified iterable
-	 * in the specified collection.
-	 * Return whether the collection changed as a result.
-	 * java.util.Collection#retainAll(java.lang.Iterable iterable)
-	 */
-	public static boolean retainAll(Collection<?> collection, Iterable<?> iterable) {
-		return retainAll(collection, iterable.iterator());
-	}
-
-	/**
-	 * Retain only the elements in the specified iterable
-	 * in the specified collection.
-	 * Return whether the collection changed as a result.
-	 * java.util.Collection#retainAll(java.lang.Iterable iterable)
-	 */
-	public static boolean retainAll(Collection<?> collection, Iterable<?> iterable, int size) {
-		return retainAll(collection, iterable.iterator(), size);
-	}
-
-	/**
-	 * Retain only the elements in the specified iterator
-	 * in the specified collection.
-	 * Return whether the collection changed as a result.
-	 * java.util.Collection#retainAll(java.util.Iterator iterator)
-	 */
-	public static boolean retainAll(Collection<?> collection, Iterator<?> iterator) {
-		if (iterator.hasNext()) {
-			return collection.retainAll(set(iterator));
-		}
-		if (collection.isEmpty()) {
-			return false;
-		}
-		collection.clear();
-		return true;
-	}
-
-	/**
-	 * Retain only the elements in the specified iterator
-	 * in the specified collection.
-	 * Return whether the collection changed as a result.
-	 * java.util.Collection#retainAll(java.util.Iterator iterator)
-	 */
-	public static boolean retainAll(Collection<?> collection, Iterator<?> iterator, int size) {
-		if (iterator.hasNext()) {
-			return collection.retainAll(set(iterator, size));
-		}
-		if (collection.isEmpty()) {
-			return false;
-		}
-		collection.clear();
-		return true;
-	}
-
-	/**
-	 * Retain only the elements in the specified array
-	 * in the specified collection.
-	 * Return whether the collection changed as a result.
-	 * java.util.Collection#retainAll(Object[] array)
-	 */
-	public static boolean retainAll(Collection<?> collection, Object[] array) {
-		if (array.length > 0) {
-			return collection.retainAll(set(array));
-		}
-		if (collection.isEmpty()) {
-			return false;
-		}
-		collection.clear();
-		return true;
-	}
-
-	/**
-	 * Retain in the specified array all the elements in
-	 * the specified iterable and return the result.
-	 * java.util.Arrays#retainAll(Object[] array, Iterable iterable)
-	 */
-	public static <E> E[] retainAll(E[] array, Iterable<?> iterable) {
-		int arrayLength = array.length;
-		return (arrayLength == 0) ? array : retainAll(array, arrayLength, iterable.iterator());
-	}
-
-	/**
-	 * Retain in the specified array all the elements in
-	 * the specified iterable and return the result.
-	 * java.util.Arrays#retainAll(Object[] array, Iterable iterable)
-	 */
-	public static <E> E[] retainAll(E[] array, Iterable<?> iterable, int size) {
-		int arrayLength = array.length;
-		return (arrayLength == 0) ? array : retainAll(array, arrayLength, iterable.iterator(), size);
-	}
-
-	/**
-	 * Retain in the specified array all the elements in
-	 * the specified iterator and return the result.
-	 * java.util.Arrays#retainAll(Object[] array, Iterator iterator)
-	 */
-	public static <E> E[] retainAll(E[] array, Iterator<?> iterator) {
-		int arrayLength = array.length;
-		return (arrayLength == 0) ? array : retainAll(array, arrayLength, iterator);
-	}
-
-	/**
-	 * Retain in the specified array all the elements in
-	 * the specified iterator and return the result.
-	 * java.util.Arrays#retainAll(Object[] array, Iterator iterator)
-	 */
-	public static <E> E[] retainAll(E[] array, Iterator<?> iterator, int size) {
-		int arrayLength = array.length;
-		return (arrayLength == 0) ? array : retainAll(array, arrayLength, iterator, size);
-	}
-
-	/**
-	 * assume arrayLength > 0
-	 */
-	private static <E> E[] retainAll(E[] array, int arrayLength, Iterator<?> iterator) {
-		return (iterator.hasNext()) ?
-				retainAll_(array, set(iterator), arrayLength)
-			:
-				newArray(array, 0);
-	}
-
-	/**
-	 * assume arrayLength > 0
-	 */
-	private static <E> E[] retainAll(E[] array, int arrayLength, Iterator<?> iterator, int iteratorSize) {
-		return (iterator.hasNext()) ?
-				retainAll_(array, set(iterator, iteratorSize), arrayLength)
-			:
-				newArray(array, 0);
-	}
-
-	/**
-	 * Retain in the specified array all the elements in
-	 * the specified collection and return the result.
-	 * java.util.Arrays#retainAll(Object[] array, Collection collection)
-	 */
-	public static <E> E[] retainAll(E[] array, Collection<?> collection) {
-		int arrayLength = array.length;
-		return (arrayLength == 0) ? array : retainAll(array, collection, arrayLength);
-	}
-
-	/**
-	 * assume arrayLength > 0
-	 */
-	private static <E> E[] retainAll(E[] array, Collection<?> collection, int arrayLength) {
-		return (collection.isEmpty()) ?
-				newArray(array, 0)
-			:
-				retainAll_(array, collection, arrayLength);
-	}
-
-	/**
-	 * assume collection is non-empty and arrayLength > 0
-	 */
-	private static <E> E[] retainAll_(E[] array, Collection<?> collection, int arrayLength) {
-		int[] indices = new int[arrayLength];
-		int j = 0;
-		for (int i = 0; i < arrayLength; i++) {
-			if (collection.contains(array[i])) {
-				indices[j++] = i;
-			}
-		}
-		if (j == arrayLength) {
-			return array;  // everything was retained
-		}
-		E[] result = newArray(array, j);
-		int resultLength = result.length;
-		for (int i = 0; i < resultLength; i++) {
-			result[i] = array[indices[i]];
-		}
-		return result;
-	}
-
-	/**
-	 * Remove from the first specified array all the elements in
-	 * the second specified array and return the result.
-	 * java.util.Arrays#retainAll(Object[] array1, Object[] array2)
-	 */
-	public static <E> E[] retainAll(E[] array1, Object[] array2) {
-		int array1Length = array1.length;
-		return (array2.length == 0) ?
-				(array1Length == 0) ? array1 : newArray(array1, 0)
-			:
-				retainAll(array1, set(array2), array1Length);
-	}
-
-	/**
-	 * Remove from the first specified array all the elements in
-	 * the second specified array and return the result.
-	 * java.util.Arrays#retainAll(char[] array1, char[] array2)
-	 */
-	public static char[] retainAll(char[] array1, char[] array2) {
-		int array1Length = array1.length;
-		return (array1Length == 0) ? array1 : retainAll(array1, array2, array1Length);
-	}
-
-	/**
-	 * assume array1Length > 0
-	 */
-	private static char[] retainAll(char[] array1, char[] array2, int array1Length) {
-		int array2Length = array2.length;
-		return (array2Length == 0) ? EMPTY_CHAR_ARRAY : retainAll(array1, array2, array1Length, array2Length);
-	}
-
-	/**
-	 * assume array1Length > 0 and array2Length > 0
-	 */
-	private static char[] retainAll(char[] array1, char[] array2, int array1Length, int array2Length) {
-		int[] indices = new int[array1Length];
-		int j = 0;
-		for (int i = 0; i < array1Length; i++) {
-			if (contains(array2, array1[i], array2Length)) {
-				indices[j++] = i;
-			}
-		}
-		if (j == array1Length) {
-			return array1;  // everything was retained
-		}
-		char[] result = new char[j];
-		int resultLength = result.length;
-		for (int i = 0; i < resultLength; i++) {
-			result[i] = array1[indices[i]];
-		}
-		return result;
-	}
-
-	/**
-	 * Remove from the first specified array all the elements in
-	 * the second specified array and return the result.
-	 * java.util.Arrays#retainAll(int[] array1, int[] array2)
-	 */
-	public static int[] retainAll(int[] array1, int[] array2) {
-		int array1Length = array1.length;
-		return (array1Length == 0) ? array1 : retainAll(array1, array2, array1Length);
-	}
-
-	/**
-	 * assume array1Length > 0
-	 */
-	private static int[] retainAll(int[] array1, int[] array2, int array1Length) {
-		int array2Length = array2.length;
-		return (array2Length == 0) ? EMPTY_INT_ARRAY : retainAll(array1, array2, array1Length, array2Length);
-	}
-
-	/**
-	 * assume array1Length > 0 and array2Length > 0
-	 */
-	private static int[] retainAll(int[] array1, int[] array2, int array1Length, int array2Length) {
-		int[] indices = new int[array1Length];
-		int j = 0;
-		for (int i = 0; i < array1Length; i++) {
-			if (contains(array2, array1[i], array2Length)) {
-				indices[j++] = i;
-			}
-		}
-		if (j == array1Length) {
-			return array1;  // everything was retained
-		}
-		int[] result = new int[j];
-		int resultLength = result.length;
-		for (int i = 0; i < resultLength; i++) {
-			result[i] = array1[indices[i]];
-		}
-		return result;
-	}
-
-	/**
-	 * Return the array reversed.
-	 * java.util.Arrays.reverse(Object[] array)
-	 */
-	public static <E> E[] reverse(E... array) {
-		int len = array.length;
-		for (int i = 0, mid = len >> 1, j = len - 1; i < mid; i++, j--) {
-			swap(array, i, j);
-		}
-		return array;
-	}
-
-	/**
-	 * Return the array reversed.
-	 * java.util.Arrays.reverse(char[] array)
-	 */
-	public static char[] reverse(char... array) {
-		int len = array.length;
-		for (int i = 0, mid = len >> 1, j = len - 1; i < mid; i++, j--) {
-			swap(array, i, j);
-		}
-		return array;
-	}
-
-	/**
-	 * Return the array reversed.
-	 * java.util.Arrays.reverse(int[] array)
-	 */
-	public static int[] reverse(int... array) {
-		int len = array.length;
-		for (int i = 0, mid = len >> 1, j = len - 1; i < mid; i++, j--) {
-			swap(array, i, j);
-		}
-		return array;
-	}
-
-	/**
-	 * Return a list with entries in reverse order from those
-	 * returned by the specified iterable.
-	 */
-	public static <E> List<E> reverseList(Iterable<? extends E> iterable) {
-		return reverse(list(iterable));
-	}
-
-	/**
-	 * Return a list with entries in reverse order from those
-	 * returned by the specified iterable.
-	 */
-	public static <E> List<E> reverseList(Iterable<? extends E> iterable, int size) {
-		return reverse(list(iterable, size));
-	}
-
-	/**
-	 * Return a list with entries in reverse order from those
-	 * returned by the specified iterator.
-	 */
-	public static <E> List<E> reverseList(Iterator<? extends E> iterator) {
-		return reverse(list(iterator));
-	}
-
-	/**
-	 * Return a list with entries in reverse order from those
-	 * returned by the specified iterator.
-	 */
-	public static <E> List<E> reverseList(Iterator<? extends E> iterator, int size) {
-		return reverse(list(iterator, size));
-	}
-
-	/**
-	 * Return the rotated array after rotating it one position.
-	 * java.util.Arrays.rotate(Object[] array)
-	 */
-	public static <E> E[] rotate(E... array) {
-		return rotate(array, 1);
-	}
-
-	/**
-	 * Return the rotated array after rotating it the specified distance.
-	 * java.util.Arrays.rotate(Object[] array, int distance)
-	 */
-	public static <E> E[] rotate(E[] array, int distance) {
-		int len = array.length;
-		if ((len == 0) || (len == 1)) {
-			return array;
-		}
-		distance = distance % len;
-		if (distance < 0) {
-			distance += len;
-		}
-		if (distance == 0) {
-			return array;
-		}
-		for (int cycleStart = 0, nMoved = 0; nMoved != len; cycleStart++) {
-			E displaced = array[cycleStart];
-			int i = cycleStart;
-			do {
-				i += distance;
-				if (i >= len) {
-					i -= len;
-				}
-				E temp = array[i];
-				array[i] = displaced;
-				displaced = temp;
-				nMoved ++;
-			} while (i != cycleStart);
-		}
-		return array;
-	}
-
-	/**
-	 * Return the rotated array after rotating it one position.
-	 * java.util.Arrays.rotate(char[] array)
-	 */
-	public static char[] rotate(char... array) {
-		return rotate(array, 1);
-	}
-
-	/**
-	 * Return the rotated array after rotating it the specified distance.
-	 * java.util.Arrays.rotate(char[] array, int distance)
-	 */
-	public static char[] rotate(char[] array, int distance) {
-		int len = array.length;
-		if ((len == 0) || (len == 1)) {
-			return array;
-		}
-		distance = distance % len;
-		if (distance < 0) {
-			distance += len;
-		}
-		if (distance == 0) {
-			return array;
-		}
-		for (int cycleStart = 0, nMoved = 0; nMoved != len; cycleStart++) {
-			char displaced = array[cycleStart];
-			int i = cycleStart;
-			do {
-				i += distance;
-				if (i >= len) {
-					i -= len;
-				}
-				char temp = array[i];
-				array[i] = displaced;
-				displaced = temp;
-				nMoved ++;
-			} while (i != cycleStart);
-		}
-		return array;
-	}
-
-	/**
-	 * Return the rotated array after rotating it one position.
-	 * java.util.Arrays.rotate(int[] array)
-	 */
-	public static int[] rotate(int... array) {
-		return rotate(array, 1);
-	}
-
-	/**
-	 * Return the rotated array after rotating it the specified distance.
-	 * java.util.Arrays.rotate(int[] array, int distance)
-	 */
-	public static int[] rotate(int[] array, int distance) {
-		int len = array.length;
-		if ((len == 0) || (len == 1)) {
-			return array;
-		}
-		distance = distance % len;
-		if (distance < 0) {
-			distance += len;
-		}
-		if (distance == 0) {
-			return array;
-		}
-		for (int cycleStart = 0, nMoved = 0; nMoved != len; cycleStart++) {
-			int displaced = array[cycleStart];
-			int i = cycleStart;
-			do {
-				i += distance;
-				if (i >= len) {
-					i -= len;
-				}
-				int temp = array[i];
-				array[i] = displaced;
-				displaced = temp;
-				nMoved ++;
-			} while (i != cycleStart);
-		}
-		return array;
-	}
-
-	/**
-	 * Return a set corresponding to the specified iterable.
-	 * java.util.HashSet(java.lang.Iterable iterable)
-	 */
-	public static <E> HashSet<E> set(Iterable<? extends E> iterable) {
-		return set(iterable.iterator());
-	}
-
-	/**
-	 * Return a set corresponding to the specified iterable.
-	 * java.util.HashSet(java.lang.Iterable iterable)
-	 */
-	public static <E> HashSet<E> set(Iterable<? extends E> iterable, int size) {
-		return set(iterable.iterator(), size);
-	}
-
-	/**
-	 * Return a set corresponding to the specified iterator.
-	 * java.util.HashSet(java.util.Iterator iterator)
-	 */
-	public static <E> HashSet<E> set(Iterator<? extends E> iterator) {
-		return set(iterator, new HashSet<E>());
-	}
-
-	/**
-	 * Return a set corresponding to the specified iterator.
-	 * java.util.HashSet(java.util.Iterator iterator)
-	 */
-	public static <E> HashSet<E> set(Iterator<? extends E> iterator, int size) {
-		return set(iterator, new HashSet<E>(size));
-	}
-
-	private static <E> HashSet<E> set(Iterator<? extends E> iterator, HashSet<E> set) {
-		while (iterator.hasNext()) {
-			set.add(iterator.next());
-		}
-		return set;
-	}
-
-	/**
-	 * Return a set corresponding to the specified array.
-	 * java.util.HashSet(Object[] array)
-	 */
-	public static <E> HashSet<E> set(E... array) {
-		HashSet<E> set = new HashSet<E>(array.length);
-		for (E item : array) {
-			set.add(item);
-		}
-		return set;
-	}
-
-	private static final Random RANDOM = new Random();
-
-	/**
-	 * Return the array after "shuffling" it.
-	 * java.util.Arrays#shuffle(Object[] array)
-	 */
-	public static <E> E[] shuffle(E... array) {
-		return shuffle(array, RANDOM);
-	}
-
-	/**
-	 * Return the array after "shuffling" it.
-	 * java.util.Arrays#shuffle(Object[] array, Random r)
-	 */
-	public static <E> E[] shuffle(E[] array, Random random) {
-		int len = array.length;
-		if ((len == 0) || (len == 1)) {
-			return array;
-		}
-		for (int i = len; i-- > 0; ) {
-			swap(array, i, random.nextInt(len));
-		}
-		return array;
-	}
-
-	/**
-	 * Return the array after "shuffling" it.
-	 * java.util.Arrays#shuffle(char[] array)
-	 */
-	public static char[] shuffle(char... array) {
-		return shuffle(array, RANDOM);
-	}
-
-	/**
-	 * Return the array after "shuffling" it.
-	 * java.util.Arrays#shuffle(char[] array, Random r)
-	 */
-	public static char[] shuffle(char[] array, Random random) {
-		int len = array.length;
-		if ((len == 0) || (len == 1)) {
-			return array;
-		}
-		for (int i = len; i-- > 0; ) {
-			swap(array, i, random.nextInt(len));
-		}
-		return array;
-	}
-
-	/**
-	 * Return the array after "shuffling" it.
-	 * java.util.Arrays#shuffle(int[] array)
-	 */
-	public static int[] shuffle(int... array) {
-		return shuffle(array, RANDOM);
-	}
-
-	/**
-	 * Return the array after "shuffling" it.
-	 * java.util.Arrays#shuffle(int[] array, Random r)
-	 */
-	public static int[] shuffle(int[] array, Random random) {
-		int len = array.length;
-		if ((len == 0) || (len == 1)) {
-			return array;
-		}
-		for (int i = len; i-- > 0; ) {
-			swap(array, i, random.nextInt(len));
-		}
-		return array;
-	}
-
-	/**
-	 * Return an iterator that returns only the single,
-	 * specified object.
-	 * Object#toIterator() ?!
-	 */
-	public static <E> Iterator<E> singletonIterator(E value) {
-		return new SingleElementIterator<E>(value);
-	}
-
-	/**
-	 * Return a list iterator that returns only the single,
-	 * specified object.
-	 * Object#toIterator() ?!
-	 */
-	public static <E> ListIterator<E> singletonListIterator(E value) {
-		return new SingleElementListIterator<E>(value);
-	}
-
-	/**
-	 * Return the number of elements returned by the specified iterable.
-	 * java.lang.Iterable#size()
-	 */
-	public static int size(Iterable<?> iterable) {
-		return size(iterable.iterator());
-	}
-
-	/**
-	 * Return the number of elements returned by the specified iterator.
-	 * java.util.Iterator#size()
-	 */
-	public static int size(Iterator<?> iterator) {
-		int size = 0;
-		while (iterator.hasNext()) {
-			iterator.next();
-			size++;
-		}
-		return size;
-	}
-
-	/**
-	 * Return a sorted set corresponding to the specified iterable.
-	 * java.util.TreeSet(java.lang.Iterable iterable)
-	 */
-	public static <E extends Comparable<? super E>> TreeSet<E> sortedSet(Iterable<? extends E> iterable) {
-		return sortedSet(iterable, null);
-	}
-
-	/**
-	 * Return a sorted set corresponding to the specified iterable.
-	 * java.util.TreeSet(java.lang.Iterable iterable)
-	 */
-	public static <E extends Comparable<? super E>> TreeSet<E> sortedSet(Iterable<? extends E> iterable, int size) {
-		return sortedSet(iterable, size, null);
-	}
-
-	/**
-	 * Return a sorted set corresponding to the specified iterable
-	 * and comparator.
-	 * java.util.TreeSet(java.lang.Iterable iterable, java.util.Comparator c)
-	 */
-	public static <E> TreeSet<E> sortedSet(Iterable<? extends E> iterable, Comparator<? super E> comparator) {
-		return sortedSet(iterable.iterator(), comparator);
-	}
-
-	/**
-	 * Return a sorted set corresponding to the specified iterable
-	 * and comparator.
-	 * java.util.TreeSet(java.lang.Iterable iterable, java.util.Comparator c)
-	 */
-	public static <E> TreeSet<E> sortedSet(Iterable<? extends E> iterable, int size, Comparator<? super E> comparator) {
-		return sortedSet(iterable.iterator(), size, comparator);
-	}
-
-	/**
-	 * Return a sorted set corresponding to the specified iterator.
-	 * java.util.TreeSet(java.util.Iterator iterator)
-	 */
-	public static <E extends Comparable<? super E>> TreeSet<E> sortedSet(Iterator<? extends E> iterator) {
-		return sortedSet(iterator, null);
-	}
-
-	/**
-	 * Return a sorted set corresponding to the specified iterator.
-	 * java.util.TreeSet(java.util.Iterator iterator)
-	 */
-	public static <E extends Comparable<? super E>> TreeSet<E> sortedSet(Iterator<? extends E> iterator, int size) {
-		return sortedSet(iterator, size, null);
-	}
-
-	/**
-	 * Return a sorted set corresponding to the specified iterator
-	 * and comparator.
-	 * java.util.TreeSet(java.util.Iterator iterator, java.util.Comparator c)
-	 */
-	public static <E> TreeSet<E> sortedSet(Iterator<? extends E> iterator, Comparator<? super E> comparator) {
-		return sortedSet(list(iterator), comparator);
-	}
-
-	/**
-	 * Return a sorted set corresponding to the specified iterator
-	 * and comparator.
-	 * java.util.TreeSet(java.util.Iterator iterator, java.util.Comparator c)
-	 */
-	public static <E> TreeSet<E> sortedSet(Iterator<? extends E> iterator, int size, Comparator<? super E> comparator) {
-		return sortedSet(list(iterator, size), comparator);
-	}
-
-	private static <E> TreeSet<E> sortedSet(List<E> list, Comparator<? super E> comparator) {
-		TreeSet<E> sortedSet = new TreeSet<E>(comparator);
-		sortedSet.addAll(list);
-		return sortedSet;
-	}
-
-	/**
-	 * Return a sorted set corresponding to the specified array.
-	 * java.util.TreeSet(Object[] array)
-	 */
-	public static <E extends Comparable<? super E>> TreeSet<E> sortedSet(E... array) {
-		return sortedSet(array, null);
-	}
-
-	/**
-	 * Return a sorted set corresponding to the specified array
-	 * and comparator.
-	 * java.util.TreeSet(Object[] array, java.util.Comparator c)
-	 */
-	public static <E> TreeSet<E> sortedSet(E[] array, Comparator<? super E> comparator) {
-		TreeSet<E> sortedSet = new TreeSet<E>(comparator);
-		sortedSet.addAll(Arrays.asList(array));
-		return sortedSet;
-	}
-
-	/**
-	 * Return a sub-array of the specified array, starting at the specified
-	 * position with the specified length.
-	 * java.util.Arrays#subArray(E[] array, int start, int length)
-	 */
-	public static <E> E[] subArray(E[] array, int start, int length) {
-		E[] result = newArray(array, length);
-		if (length > 0) {
-			System.arraycopy(array, start, result, 0, length);
-		}
-		return result;
-	}
-
-	/**
-	 * Return a sub-array of the specified array, starting at the specified
-	 * position with the specified length.
-	 * java.util.Arrays#subArray(int[] array, int start, int length)
-	 */
-	public static int[] subArray(int[] array, int start, int length) {
-		int[] result = new int[length];
-		if (length > 0) {
-			System.arraycopy(array, start, result, 0, length);
-		}
-		return result;
-	}
-
-	/**
-	 * Return a sub-array of the specified array, starting at the specified
-	 * position with the specified length.
-	 * java.util.Arrays#subArray(char[] array, int start, int length)
-	 */
-	public static char[] subArray(char[] array, int start, int length) {
-		char[] result = new char[length];
-		if (length > 0) {
-			System.arraycopy(array, start, result, 0, length);
-		}
-		return result;
-	}
-
-	/**
-	 * Return the array after the specified elements have been "swapped".
-	 * java.util.Arrays#swap(Object[] array, int i, int j)
-	 */
-	public static <E> E[] swap(E[] array, int i, int j) {
-		E temp = array[i];
-		array[i] = array[j];
-		array[j] = temp;
-		return array;
-	}
-
-	/**
-	 * Return the array after the specified elements have been "swapped".
-	 * java.util.Arrays#swap(char[] array, int i, int j)
-	 */
-	public static char[] swap(char[] array, int i, int j) {
-		char temp = array[i];
-		array[i] = array[j];
-		array[j] = temp;
-		return array;
-	}
-
-	/**
-	 * Return the array after the specified elements have been "swapped".
-	 * java.util.Arrays#swap(int[] array, int i, int j)
-	 */
-	public static int[] swap(int[] array, int i, int j) {
-		int temp = array[i];
-		array[i] = array[j];
-		array[j] = temp;
-		return array;
-	}
-
-	/**
-	 * Return a vector corresponding to the specified iterable.
-	 * This is useful for legacy code that requires a java.util.Vector.
-	 * java.util.Vector(java.lang.Iterable iterable)
-	 */
-	public static <E> Vector<E> vector(Iterable<? extends E> iterable) {
-		return vector(iterable.iterator());
-	}
-
-	/**
-	 * Return a vector corresponding to the specified iterable.
-	 * This is useful for legacy code that requires a java.util.Vector.
-	 * java.util.Vector(java.lang.Iterable iterable)
-	 */
-	public static <E> Vector<E> vector(Iterable<? extends E> iterable, int size) {
-		return vector(iterable.iterator(), size);
-	}
-
-	/**
-	 * Return a vector corresponding to the specified iterator.
-	 * This is useful for legacy code that requires a java.util.Vector.
-	 * java.util.Vector(java.util.Iterator iterator)
-	 */
-	public static <E> Vector<E> vector(Iterator<? extends E> iterator) {
-		return vector(iterator, new Vector<E>());
-	}
-
-	/**
-	 * Return a vector corresponding to the specified iterator.
-	 * This is useful for legacy code that requires a java.util.Vector.
-	 * java.util.Vector(java.util.Iterator iterator)
-	 */
-	public static <E> Vector<E> vector(Iterator<? extends E> iterator, int size) {
-		return vector(iterator, new Vector<E>(size));
-	}
-
-	private static <E> Vector<E> vector(Iterator<? extends E> iterator, Vector<E> v) {
-		while (iterator.hasNext()) {
-			v.addElement(iterator.next());
-		}
-		return v;
-	}
-
-	/**
-	 * Return a vector corresponding to the specified array.
-	 * This is useful for legacy code that requires a java.util.Vector.
-	 * java.util.Vector(Object[] array)
-	 */
-	public static <E> Vector<E> vector(E... array) {
-		Vector<E> v = new Vector<E>(array.length);
-		for (E item : array) {
-			v.addElement(item);
-		}
-		return v;
-	}
-
-
-	// ********** single-use Iterable **********
-
-	/**
-	 * This is a one-time use iterable that can return a single iterator.
-	 * Once the iterator is returned the iterable is no longer valid.
-	 * As such, this utility should only be used in one-time use situations,
-	 * such as a 'for-each' loop.
-	 */
-	public static class SingleUseIterable<E> implements Iterable<E> {
-		private Iterator<E> iterator;
-
-		public SingleUseIterable(Iterator<? extends E> iterator) {
-			super();
-			if (iterator == null) {
-				throw new NullPointerException();
-			}
-			this.iterator = new GenericIteratorWrapper<E>(iterator);
-		}
-
-		public Iterator<E> iterator() {
-			if (this.iterator == null) {
-				throw new IllegalStateException("This method has already been called."); //$NON-NLS-1$
-			}
-			Iterator<E> result = this.iterator;
-			this.iterator = null;
-			return result;
-		}
-
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this, this.iterator);
-		}
-
-	}
-
-
-	// ********** java.util.Collections enhancements **********
-
-	/**
-	 * Return the destination list after the source list has been copied into it.
-	 * @see java.util.Collections#copy(java.util.List, java.util.List)
-	 */
-	public static <E> List<? super E> copy(List<? super E> dest, List<? extends E> src) {
-		Collections.copy(dest, src);
-		return dest;
-	}
-
-	/**
-	 * Return the list after it has been "filled".
-	 * @see java.util.Collections#fill(java.util.List, java.lang.Object)
-	 */
-	public static <E> List<? super E> fill(List<? super E> list, E value) {
-		Collections.fill(list, value);
-		return list;
-	}
-
-	/**
-	 * Return the list after it has been "reversed".
-	 * @see java.util.Collections#reverse(java.util.List)
-	 */
-	public static <E> List<E> reverse(List<E> list) {
-		Collections.reverse(list);
-		return list;
-	}
-
-	/**
-	 * Return the list after it has been "rotated" by one position.
-	 * @see java.util.Collections#rotate(java.util.List, int)
-	 */
-	public static <E> List<E> rotate(List<E> list) {
-		return rotate(list, 1);
-	}
-
-	/**
-	 * Return the list after it has been "rotated".
-	 * @see java.util.Collections#rotate(java.util.List, int)
-	 */
-	public static <E> List<E> rotate(List<E> list, int distance) {
-		Collections.rotate(list, distance);
-		return list;
-	}
-
-	/**
-	 * Return the list after it has been "shuffled".
-	 * @see java.util.Collections#shuffle(java.util.List)
-	 */
-	public static <E> List<E> shuffle(List<E> list) {
-		Collections.shuffle(list);
-		return list;
-	}
-
-	/**
-	 * Return the list after it has been "shuffled".
-	 * @see java.util.Collections#shuffle(java.util.List, java.util.Random)
-	 */
-	public static <E> List<E> shuffle(List<E> list, Random random) {
-		Collections.shuffle(list, random);
-		return list;
-	}
-
-	/**
-	 * Return the list after it has been "sorted".
-	 * NB: The list is sorted in place as a side-effect.
-	 * @see java.util.Collections#sort(java.util.List)
-	 */
-	public static <E extends Comparable<? super E>> List<E> sort(List<E> list) {
-		Collections.sort(list);
-		return list;
-	}
-
-	/**
-	 * Return the list after it has been "sorted".
-	 * NB: The list is sorted in place as a side-effect.
-	 * @see java.util.Collections#sort(java.util.List, java.util.Comparator)
-	 */
-	public static <E> List<E> sort(List<E> list, Comparator<? super E> comparator) {
-		Collections.sort(list, comparator);
-		return list;
-	}
-
-	/**
-	 * Return the iterable after it has been "sorted".
-	 */
-	public static <E extends Comparable<? super E>> Iterable<E> sort(Iterable<E> iterable) {
-		return sort(iterable, null);
-	}
-
-	/**
-	 * Return the iterable after it has been "sorted".
-	 */
-	public static <E> Iterable<E> sort(Iterable<E> iterable, Comparator<? super E> comparator) {
-		return sort(list(iterable), comparator);
-	}
-
-	/**
-	 * Return the iterator after it has been "sorted".
-	 */
-	public static <E extends Comparable<? super E>> ListIterator<E> sort(Iterator<? extends E> iterator) {
-		return sort(iterator, null);
-	}
-
-	/**
-	 * Return the iterator after it has been "sorted".
-	 */
-	public static <E> ListIterator<E> sort(Iterator<? extends E> iterator, Comparator<? super E> comparator) {
-		return sort(list(iterator), comparator).listIterator();
-	}
-
-	/**
-	 * Return the list after the specified elements have been "swapped".
-	 * @see java.util.Collections#swap(java.util.List, int, int)
-	 */
-	public static <E> List<E> swap(List<E> list, int i, int j) {
-		Collections.swap(list, i, j);
-		return list;
-	}
-
-
-	// ********** java.util.Arrays enhancements **********
-
-	/**
-	 * Return the array after it has been "filled".
-	 * @see java.util.Arrays#fill(boolean[], boolean)
-	 */
-	public static boolean[] fill(boolean[] array, boolean value) {
-		Arrays.fill(array, value);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "filled".
-	 * @see java.util.Arrays#fill(boolean[], int, int, boolean)
-	 */
-	public static boolean[] fill(boolean[] array, int fromIndex, int toIndex, boolean value) {
-		Arrays.fill(array, fromIndex, toIndex, value);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "filled".
-	 * @see java.util.Arrays#fill(byte[], byte)
-	 */
-	public static byte[] fill(byte[] array, byte value) {
-		Arrays.fill(array, value);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "filled".
-	 * @see java.util.Arrays#fill(byte[], int, int, byte)
-	 */
-	public static byte[] fill(byte[] array, int fromIndex, int toIndex, byte value) {
-		Arrays.fill(array, fromIndex, toIndex, value);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "filled".
-	 * @see java.util.Arrays#fill(char[], char)
-	 */
-	public static char[] fill(char[] array, char value) {
-		Arrays.fill(array, value);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "filled".
-	 * @see java.util.Arrays#fill(char[], int, int, char)
-	 */
-	public static char[] fill(char[] array, int fromIndex, int toIndex, char value) {
-		Arrays.fill(array, fromIndex, toIndex, value);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "filled".
-	 * @see java.util.Arrays#fill(double[], double)
-	 */
-	public static double[] fill(double[] array, double value) {
-		Arrays.fill(array, value);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "filled".
-	 * @see java.util.Arrays#fill(double[], int, int, double)
-	 */
-	public static double[] fill(double[] array, int fromIndex, int toIndex, double value) {
-		Arrays.fill(array, fromIndex, toIndex, value);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "filled".
-	 * @see java.util.Arrays#fill(float[], float)
-	 */
-	public static float[] fill(float[] array, float value) {
-		Arrays.fill(array, value);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "filled".
-	 * @see java.util.Arrays#fill(float[], int, int, float)
-	 */
-	public static float[] fill(float[] array, int fromIndex, int toIndex, float value) {
-		Arrays.fill(array, fromIndex, toIndex, value);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "filled".
-	 * @see java.util.Arrays#fill(int[], int)
-	 */
-	public static int[] fill(int[] array, int value) {
-		Arrays.fill(array, value);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "filled".
-	 * @see java.util.Arrays#fill(int[], int, int, int)
-	 */
-	public static int[] fill(int[] array, int fromIndex, int toIndex, int value) {
-		Arrays.fill(array, fromIndex, toIndex, value);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "filled".
-	 * @see java.util.Arrays#fill(Object[], Object)
-	 */
-	public static <E> E[] fill(E[] array, E value) {
-		Arrays.fill(array, value);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "filled".
-	 * @see java.util.Arrays#fill(Object[], int, int, Object)
-	 */
-	public static <E> E[] fill(E[] array, int fromIndex, int toIndex, E value) {
-		Arrays.fill(array, fromIndex, toIndex, value);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "filled".
-	 * @see java.util.Arrays#fill(long[], long)
-	 */
-	public static long[] fill(long[] array, long value) {
-		Arrays.fill(array, value);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "filled".
-	 * @see java.util.Arrays#fill(long[], int, int, long)
-	 */
-	public static long[] fill(long[] array, int fromIndex, int toIndex, long value) {
-		Arrays.fill(array, fromIndex, toIndex, value);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "filled".
-	 * @see java.util.Arrays#fill(short[], short)
-	 */
-	public static short[] fill(short[] array, short value) {
-		Arrays.fill(array, value);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "filled".
-	 * @see java.util.Arrays#fill(short[], int, int, short)
-	 */
-	public static short[] fill(short[] array, int fromIndex, int toIndex, short value) {
-		Arrays.fill(array, fromIndex, toIndex, value);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "sorted".
-	 * @see java.util.Arrays#sort(byte[])
-	 */
-	public static byte[] sort(byte... array) {
-		Arrays.sort(array);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "sorted".
-	 * @see java.util.Arrays#sort(byte[], int, int)
-	 */
-	public static byte[] sort(byte[] array, int fromIndex, int toIndex) {
-		Arrays.sort(array, fromIndex, toIndex);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "sorted".
-	 * @see java.util.Arrays#sort(char[])
-	 */
-	public static char[] sort(char... array) {
-		Arrays.sort(array);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "sorted".
-	 * @see java.util.Arrays#sort(char[], int, int)
-	 */
-	public static char[] sort(char[] array, int fromIndex, int toIndex) {
-		Arrays.sort(array, fromIndex, toIndex);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "sorted".
-	 * @see java.util.Arrays#sort(double[])
-	 */
-	public static double[] sort(double... array) {
-		Arrays.sort(array);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "sorted".
-	 * @see java.util.Arrays#sort(double[], int, int)
-	 */
-	public static double[] sort(double[] array, int fromIndex, int toIndex) {
-		Arrays.sort(array, fromIndex, toIndex);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "sorted".
-	 * @see java.util.Arrays#sort(float[])
-	 */
-	public static float[] sort(float... array) {
-		Arrays.sort(array);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "sorted".
-	 * @see java.util.Arrays#sort(float[], int, int)
-	 */
-	public static float[] sort(float[] array, int fromIndex, int toIndex) {
-		Arrays.sort(array, fromIndex, toIndex);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "sorted".
-	 * @see java.util.Arrays#sort(int[])
-	 */
-	public static int[] sort(int... array) {
-		Arrays.sort(array);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "sorted".
-	 * @see java.util.Arrays#sort(int[], int, int)
-	 */
-	public static int[] sort(int[] array, int fromIndex, int toIndex) {
-		Arrays.sort(array, fromIndex, toIndex);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "sorted".
-	 * @see java.util.Arrays#sort(Object[])
-	 */
-	public static <E> E[] sort(E... array) {
-		Arrays.sort(array);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "sorted".
-	 * @see java.util.Arrays#sort(Object[], java.util.Comparator)
-	 */
-	public static <E> E[] sort(E[] array, Comparator<? super E> comparator) {
-		Arrays.sort(array, comparator);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "sorted".
-	 * @see java.util.Arrays#sort(Object[], int, int)
-	 */
-	public static <E> E[] sort(E[] array, int fromIndex, int toIndex) {
-		Arrays.sort(array, fromIndex, toIndex);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "sorted".
-	 * @see java.util.Arrays#sort(Object[], int, int, java.util.Comparator)
-	 */
-	public static <E> E[] sort(E[] array, int fromIndex, int toIndex, Comparator<? super E> comparator) {
-		Arrays.sort(array, fromIndex, toIndex, comparator);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "sorted".
-	 * @see java.util.Arrays#sort(long[])
-	 */
-	public static long[] sort(long... array) {
-		Arrays.sort(array);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "sorted".
-	 * @see java.util.Arrays#sort(long[], int, int)
-	 */
-	public static long[] sort(long[] array, int fromIndex, int toIndex) {
-		Arrays.sort(array, fromIndex, toIndex);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "sorted".
-	 * @see java.util.Arrays#sort(short[])
-	 */
-	public static short[] sort(short... array) {
-		Arrays.sort(array);
-		return array;
-	}
-
-	/**
-	 * Return the array after it has been "sorted".
-	 * @see java.util.Arrays#sort(short[], int, int)
-	 */
-	public static short[] sort(short[] array, int fromIndex, int toIndex) {
-		Arrays.sort(array, fromIndex, toIndex);
-		return array;
-	}
-
-
-	// ********** constructor **********
-
-	/**
-	 * Suppress default constructor, ensuring non-instantiability.
-	 */
-	private CollectionTools() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/CommandRunnable.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/CommandRunnable.java
deleted file mode 100644
index c2bd4e23fe..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/CommandRunnable.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import org.eclipse.jpt.utility.Command;
-
-/**
- * Wrap a Command so it can be used as a Runnable.
- */
-public class CommandRunnable implements Runnable {
-	protected final Command command;
-
-	public CommandRunnable(Command command) {
-		super();
-		if (command == null) {
-			throw new NullPointerException();
-		}
-		this.command = command;
-	}
-
-	public void run() {
-		this.command.execute();
-	}
-
-	@Override
-	public String toString() {
-		return "Runnable[" + this.command.toString() +']'; //$NON-NLS-1$
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Counter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Counter.java
deleted file mode 100644
index fbe3cde738..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Counter.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import java.io.Serializable;
-
-/**
- * This class can be used wherever a mutable integer object is needed.
- * It is a cross between an int and an Integer. It can be stored in a standard
- * container (e.g. Collection) but can be modified.
- */
-public final class Counter
-	implements Cloneable, Serializable
-{
-	private int count = 0;
-
-	private static final long serialVersionUID = 1L;
-
-
-	/**
-	 * Construct a counter with the specified initial value.
-	 */
-	public Counter(int count) {
-		super();
-		this.count = count;
-	}
-
-	/**
-	 * Construct a counter with an initial value of zero.
-	 */
-	public Counter() {
-		this(0);
-	}
-
-	/**
-	 * Return the current count of the counter.
-	 */
-	public synchronized int count() {
-		return this.count;
-	}
-
-	/**
-	 * Increment and return the current count of the counter.
-	 */
-	public synchronized int increment() {
-		return ++this.count;
-	}
-
-	/**
-	 * Increment and return the current count of the counter.
-	 */
-	public synchronized int increment(int increment) {
-		return this.count += increment;
-	}
-
-	/**
-	 * Derement and return the current count of the counter.
-	 */
-	public synchronized int decrement() {
-		return --this.count;
-	}
-
-	/**
-	 * Derement and return the current count of the counter.
-	 */
-	public synchronized int decrement(int decrement) {
-		return this.count -= decrement;
-	}
-
-	@Override
-	public synchronized boolean equals(Object o) {
-		if ( ! (o instanceof Counter)) {
-			return false;
-		}
-		return this.count == ((Counter) o).count;
-	}
-
-	@Override
-	public synchronized int hashCode() {
-		return this.count;
-	}
-
-	@Override
-	public synchronized Object clone() {
-		try {
-			return super.clone();
-		} catch (CloneNotSupportedException ex) {
-			throw new InternalError();
-		}
-	}
-
-	@Override
-	public synchronized String toString() {
-		StringBuffer sb = new StringBuffer();
-		sb.append(ClassTools.shortClassNameForObject(this));
-		sb.append('(');
-		sb.append(this.count);
-		sb.append(')');
-		return sb.toString();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/EmptyIterable.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/EmptyIterable.java
deleted file mode 100644
index 1f90f3d4f0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/EmptyIterable.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import java.util.Iterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-
-/**
- * An <code>EmptyIterable</code> is just that.
- */
-public final class EmptyIterable<E>
-	implements Iterable<E>
-{
-
-	// singleton
-	@SuppressWarnings("unchecked")
-	private static final EmptyIterable INSTANCE = new EmptyIterable();
-
-	/**
-	 * Return the singleton.
-	 */
-	@SuppressWarnings("unchecked")
-	public static <T> Iterable<T> instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EmptyIterable() {
-		super();
-	}
-
-	public Iterator<E> iterator() {
-		return EmptyIterator.instance();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/FileTools.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/FileTools.java
deleted file mode 100644
index 198e745a85..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/FileTools.java
+++ /dev/null
@@ -1,1007 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.utility.internal;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.channels.FileChannel;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.internal.iterators.CompositeIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-
-/**
- * Assorted file tools:
- * - delete entire trees of directories and files
- * - build iterators on entire trees of directories and files
- * - build a temporary directory
- * - "canonize" files
- */
-public final class FileTools {
-
-	public static final String USER_HOME_DIRECTORY_NAME = System.getProperty("user.home"); //$NON-NLS-1$
-	public static final String USER_TEMPORARY_DIRECTORY_NAME = System.getProperty("java.io.tmpdir"); //$NON-NLS-1$
-	public static String DEFAULT_TEMPORARY_DIRECTORY_NAME = "tmpdir"; //$NON-NLS-1$
-	public static final String CURRENT_WORKING_DIRECTORY_NAME = System.getProperty("user.dir"); //$NON-NLS-1$
-
-    /** A list of some invalid file name characters.
-				: is the filename separator in MacOS and the drive indicator in DOS
-				* is a DOS wildcard character
-				| is a DOS redirection character
-				& is our own escape character
-				/ is the filename separator in Unix and the command option tag in DOS
-				\ is the filename separator in DOS/Windows and the escape character in Unix
-				; is ???
-				? is a DOS wildcard character
-				[ is ???
-				] is ???
-				= is ???
-				+ is ???
-				< is a DOS redirection character
-				> is a DOS redirection character
-				" is used by DOS to delimit file names with spaces
-				, is ???
-     */
-	public static final char[] INVALID_FILENAME_CHARACTERS = { ':', '*', '|', '&', '/', '\\', ';', '?', '[', ']', '=', '+', '<', '>', '"', ',' };
-
-	/** This encoder will convert strings into valid file names. */
-	public static final XMLStringEncoder FILE_NAME_ENCODER = new XMLStringEncoder(INVALID_FILENAME_CHARACTERS);
-
-	/** Windows files that are redirected to devices etc. */
-	@SuppressWarnings("nls")
-	private static final String[] WINDOWS_RESERVED_FILE_NAMES = {
-		"con",
-		"aux",
-		"com1", "com2", "com3", "com4", "com5", "com6", "com7", "com8", "com9",
-		"lpt1", "lpt2", "lpt3", "lpt4", "lpt5", "lpt6", "lpt7", "lpt8", "lpt9",
-		"prn",
-		"nul"
-	};
-
-	/** The default length of a shortened file name. */
-	public static final int MAXIMUM_SHORTENED_FILE_NAME_LENGTH = 60;
-
-
-	// ********** deleting directories **********
-
-	/**
-	 * Delete the specified directory and all of its contents.
-	 * <em>USE WITH CARE.</em>
-	 * File#deleteAll()?
-	 */
-	public static void deleteDirectory(String directoryName) {
-		deleteDirectory(new File(directoryName));
-	}
-	
-	/**
-	 * Delete the specified directory and all of its contents.
-	 * <em>USE WITH CARE.</em>
-	 * File#deleteAll()?
-	 */
-	public static void deleteDirectory(File directory) {
-		deleteDirectoryContents(directory);
-		if ( ! directory.delete()) {
-			throw new RuntimeException("unable to delete directory: " + directory.getAbsolutePath()); //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * Delete the contents of the specified directory
-	 * (but not the directory itself).
-	 * <em>USE WITH CARE.</em>
-	 * File#deleteFiles()
-	 */
-	public static void deleteDirectoryContents(String directoryName) {
-		deleteDirectoryContents(new File(directoryName));
-	}
-	
-	/**
-	 * Delete the contents of the specified directory
-	 * (but not the directory itself).
-	 * <em>USE WITH CARE.</em>
-	 * File#deleteFiles()
-	 */
-	public static void deleteDirectoryContents(File directory) {
-		for (File file : directory.listFiles()) {
-			if (file.isDirectory()) {
-				deleteDirectory(file);	// recurse through subdirectories
-			} else {
-				if ( ! file.delete()) {
-					throw new RuntimeException("unable to delete file: " + file.getAbsolutePath()); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-	
-
-	// ********** copying files **********
-
-	/**
-	 * Copies the content of the source file to the destination file.
-	 * File#copy(File destinationFile)
-	 */
-	public static void copyToFile(File sourceFile, File destinationFile)
-		throws IOException
-	{
-		FileChannel sourceChannel = new FileInputStream(sourceFile).getChannel();
-		FileChannel destinationChannel = new FileOutputStream(destinationFile).getChannel();
-		try {
-			destinationChannel.transferFrom(sourceChannel, 0, sourceChannel.size());
-		} finally {
-			sourceChannel.close();
-			destinationChannel.close();
-		}
-	}
-	
-	/**
-	 * Copies the content of the source file to a file by
-	 * the same name in the destination directory.
-	 * File#copyToDirectory(File destinationDirectory)
-	 */
-	public static void copyToDirectory(File sourceFile, File destinationDirectory)
-		throws IOException
-	{
-		File destinationFile = new File(destinationDirectory, sourceFile.getName());
-		destinationFile.createNewFile();
-		copyToFile(sourceFile, destinationFile);
-	}
-	
-
-	// ********** iteratoring over files and directories **********
-
-	/**
-	 * Return an iterator on all the files in the specified directory.
-	 * The iterator will skip over subdirectories.
-	 * File#files()
-	 */
-	public static Iterator<File> filesIn(String directoryName) {
-		return filesIn(new File(directoryName));
-	}
-	
-	/**
-	 * Return an iterator on all the files in the specified directory.
-	 * The iterator will skip over subdirectories.
-	 * File#files()
-	 */
-	public static Iterator<File> filesIn(File directory) {
-		return filesIn(directory.listFiles());
-	}
-	
-	private static Iterator<File> filesIn(File[] files) {
-		return new FilteringIterator<File, File>(new ArrayIterator<File>(files)) {
-			@Override
-			protected boolean accept(File next) {
-				return next.isFile();
-			}
-		};
-	}
-	
-	/**
-	 * Return an iterator on all the subdirectories
-	 * in the specified directory.
-	 * File#subDirectories()
-	 */
-	public static Iterator<File> directoriesIn(String directoryName) {
-		return directoriesIn(new File(directoryName));
-	}
-	
-	/**
-	 * Return an iterator on all the subdirectories
-	 * in the specified directory.
-	 * File#subDirectories()
-	 */
-	public static Iterator<File> directoriesIn(File directory) {
-		return directoriesIn(directory.listFiles());
-	}
-	
-	private static Iterator<File> directoriesIn(File[] files) {
-		return new FilteringIterator<File, File>(new ArrayIterator<File>(files)) {
-			@Override
-			protected boolean accept(File next) {
-				return next.isDirectory();
-			}
-		};
-	}
-	
-	/**
-	 * Return an iterator on all the files under the specified
-	 * directory, recursing into subdirectories.
-	 * The iterator will skip over the subdirectories themselves.
-	 * File#filesRecurse()
-	 */
-	public static Iterator<File> filesInTree(String directoryName) {
-		return filesInTree(new File(directoryName));
-	}
-	
-	/**
-	 * Return an iterator on all the files under the specified
-	 * directory, recursing into subdirectories.
-	 * The iterator will skip over the subdirectories themselves.
-	 * File#filesRecurse()
-	 */
-	public static Iterator<File> filesInTree(File directory) {
-		return filesInTreeAsSet(directory).iterator();
-	}
-
-	private static Set<File> filesInTreeAsSet(File directory) {
-		Set<File> files = new HashSet<File>(10000);
-		addFilesInTreeTo(directory, files);
-		return files;
-	}
-
-	private static void addFilesInTreeTo(File directory, Collection<File> allFiles) {
-		for (File file : directory.listFiles()) {
-			if (file.isFile()) {
-				allFiles.add(file);
-			} else if (file.isDirectory()) {
-				addFilesInTreeTo(file, allFiles);
-			}
-		}
-	}
-
-	/**
-	 * Return an iterator on all the directories under the specified
-	 * directory, recursing into subdirectories.
-	 * File#subDirectoriesRecurse()
-	 */
-	public static Iterator<File> directoriesInTree(String directoryName) {
-		return directoriesInTree(new File(directoryName));
-	}
-	
-	/**
-	 * Return an iterator on all the directories under the specified
-	 * directory, recursing into subdirectories.
-	 * File#subDirectoriesRecurse()
-	 */
-	@SuppressWarnings("unchecked")
-	public static Iterator<File> directoriesInTree(File directory) {
-		File[] files = directory.listFiles();
-		return new CompositeIterator<File>(directoriesIn(files), directoriesInTrees(directoriesIn(files)));
-	}
-	
-	private static Iterator<File> directoriesInTrees(Iterator<File> directories) {
-		return new CompositeIterator<File>(
-			new TransformationIterator<File, Iterator<File>>(directories) {
-				@Override
-				protected Iterator<File> transform(File next) {
-					return FileTools.directoriesInTree(next);
-				}
-			}
-		);
-	}
-	
-
-	// ********** short file name manipulation **********
-
-	/**
-	 * Strip the extension from the specified file name
-	 * and return the result. If the file name has no
-	 * extension, it is returned unchanged
-	 * File#basePath()
-	 */
-	public static String stripExtension(String fileName) {
-		int index = fileName.lastIndexOf('.');
-		if (index == -1) {
-			return fileName;
-		}
-		return fileName.substring(0, index);
-	}
-	
-	/**
-	 * Strip the extension from the specified file's name
-	 * and return the result. If the file's name has no
-	 * extension, it is returned unchanged
-	 * File#basePath()
-	 */
-	public static String stripExtension(File file) {
-		return stripExtension(file.getPath());
-	}
-
-	/**
-	 * Return the extension, including the dot, of the specified file name.
-	 * If the file name has no extension, return an empty string.
-	 * File#extension()
-	 */
-	public static String extension(String fileName) {
-		int index = fileName.lastIndexOf('.');
-		if (index == -1) {
-			return ""; //$NON-NLS-1$
-		}
-		return fileName.substring(index);
-	}
-	
-	/**
-	 * Return the extension, including the dot, of the specified file's name.
-	 * If the file's name has no extension, return an empty string.
-	 * File#extension()
-	 */
-	public static String extension(File file) {
-		return extension(file.getPath());
-	}
-
-
-	// ********** temporary directories **********
-
-	/**
-	 * Build and return an empty temporary directory with the specified
-	 * name. If the directory already exists, it will be cleared out.
-	 * This directory will be a subdirectory of the Java temporary directory,
-	 * as indicated by the System property "java.io.tmpdir".
-	 */
-	public static File emptyTemporaryDirectory(String name) {
-		File dir = new File(userTemporaryDirectory(), name);
-		if (dir.exists()) {
-			deleteDirectoryContents(dir);
-		} else {
-			dir.mkdirs();
-		}
-		return dir;
-	}
-	
-	/**
-	 * Build and return an empty temporary directory with a
-	 * name of "tmpdir". If the directory already exists, it will be cleared out.
-	 * This directory will be a subdirectory of the Java temporary directory,
-	 * as indicated by the System property "java.io.tmpdir".
-	 */
-	public static File emptyTemporaryDirectory() {
-		return emptyTemporaryDirectory(DEFAULT_TEMPORARY_DIRECTORY_NAME);
-	}
-	
-	/**
-	 * Build and return a temporary directory with the specified
-	 * name. If the directory already exists, it will be left unchanged;
-	 * if it does not already exist, it will be created.
-	 * This directory will be a subdirectory of the Java temporary directory,
-	 * as indicated by the System property "java.io.tmpdir".
-	 */
-	public static File temporaryDirectory(String name) {
-		File dir = new File(userTemporaryDirectory(), name);
-		if ( ! dir.exists()) {
-			dir.mkdirs();
-		}
-		return dir;
-	}
-	
-	/**
-	 * Build and return a temporary directory with a name of
-	 * "tmpdir". If the directory already exists, it will be left unchanged;
-	 * if it does not already exist, it will be created.
-	 * This directory will be a subdirectory of the Java temporary directory,
-	 * as indicated by the System property "java.io.tmpdir".
-	 */
-	public static File temporaryDirectory() {
-		return temporaryDirectory(DEFAULT_TEMPORARY_DIRECTORY_NAME);
-	}
-	
-	/**
-	 * Build and return a *new* temporary directory with the specified
-	 * prefix. The prefix will be appended with a number that
-	 * is incremented, starting with 1, until a non-pre-existing directory
-	 * is found and successfully created. This directory will be a
-	 * subdirectory of the Java temporary directory, as indicated by
-	 * the System property "java.io.tmpdir".
-	 */
-	public static File newTemporaryDirectory(String prefix) {
-		if ( ! prefix.endsWith(".")) { //$NON-NLS-1$
-			prefix = prefix + '.';
-		}
-		File dir;
-		int i = 0;
-		do {
-			i++;
-			dir = new File(userTemporaryDirectory(), prefix + i);
-		} while ( ! dir.mkdirs());
-		return dir;
-	}
-	
-	/**
-	 * Build and return a *new* temporary directory with a
-	 * prefix of "tmpdir". This prefix will be appended with a number that
-	 * is incremented, starting with 1, until a non-pre-existing directory
-	 * is found and successfully created. This directory will be a
-	 * subdirectory of the Java temporary directory, as indicated by
-	 * the System property "java.io.tmpdir".
-	 */
-	public static File newTemporaryDirectory() {
-		return newTemporaryDirectory(DEFAULT_TEMPORARY_DIRECTORY_NAME);
-	}
-	
-
-	// ********** resource files **********
-
-	/**
-	 * Build and return a file for the specified resource.
-	 * The resource name must be fully-qualified, i.e. it cannot be relative
-	 * to the package name/directory.
-	 * NB: There is a bug in jdk1.4.x the prevents us from getting
-	 * a resource that has spaces (or other special characters) in
-	 * its name.... (see Sun's Java bug 4466485)
-	 */
-	public static File resourceFile(String resourceName) throws URISyntaxException {
-		if ( ! resourceName.startsWith("/")) { //$NON-NLS-1$
-			throw new IllegalArgumentException(resourceName);
-		}
-		return resourceFile(resourceName, FileTools.class);
-	}
-	
-	/**
-	 * Build and return a file for the specified resource.
-	 * NB: There is a bug in jdk1.4.x the prevents us from getting
-	 * a resource that has spaces (or other special characters) in
-	 * its name.... (see Sun's Java bug 4466485)
-	 */
-	public static File resourceFile(String resourceName, Class<?> javaClass) throws URISyntaxException {
-		URL url = javaClass.getResource(resourceName);
-		return buildFile(url);
-	}
-	
-	/**
-	 * Build and return a file for the specified URL.
-	 * NB: There is a bug in jdk1.4.x the prevents us from getting
-	 * a resource that has spaces (or other special characters) in
-	 * its name.... (see Sun's Java bug 4466485)
-	 */
-	public static File buildFile(URL url) throws URISyntaxException {
-		return buildFile(url.getFile());
-	}
-	
-	/**
-	 * Build and return a file for the specified file name.
-	 * NB: There is a bug in jdk1.4.x the prevents us from getting
-	 * a resource that has spaces (or other special characters) in
-	 * its name.... (see Sun's Java bug 4466485)
-	 */
-	public static File buildFile(String fileName) throws URISyntaxException {
-		URI uri = new URI(fileName);
-		File file = new File(uri.getPath());
-		return file;
-	}
-	
-
-	// ********** "canonical" files **********
-
-	/**
-	 * Convert the specified file into a "canonical" file.
-	 */
-	public static File canonicalFile(File file) {
-		try {
-			return file.getCanonicalFile();
-		} catch (IOException ioexception) {
-			// settle for the absolute file
-			return file.getAbsoluteFile();
-		}
-	}
-	
-	/**
-	 * Build an iterator that will convert the specified files
-	 * into "canonical" files.
-	 */
-	public static Iterator<File> canonicalFiles(Iterator<File> files) {
-		return new TransformationIterator<File, File>(files) {
-			@Override
-			protected File transform(File next) {
-				return canonicalFile(next);
-			}
-		};
-	}
-	
-	/**
-	 * Build an iterator that will convert the specified files
-	 * into "canonical" files.
-	 */
-	public static Iterator<File> canonicalFiles(Collection<File> files) {
-		return canonicalFiles(files.iterator());
-	}
-	
-	/**
-	 * Convert the specified file name into a "canonical" file name.
-	 */
-	public static String canonicalFileName(String fileName) {
-		return canonicalFile(new File(fileName)).getAbsolutePath();
-	}
-	
-	/**
-	 * Build an iterator that will convert the specified file names
-	 * into "canonical" file names.
-	 */
-	public static Iterator<String> canonicalFileNames(Iterator<String> fileNames) {
-		return new TransformationIterator<String, String>(fileNames) {
-			@Override
-			protected String transform(String next) {
-				return canonicalFileName(next);
-			}
-		};
-	}
-	
-	/**
-	 * Build an iterator that will convert the specified file names
-	 * into "canonical" file names.
-	 */
-	public static Iterator<String> canonicalFileNames(Collection<String> fileNames) {
-		return canonicalFileNames(fileNames.iterator());
-	}
-	
-
-	// ********** file name validation **********
-
-	/**
-	 * Return whether the specified file name is invalid.
-	 */
-	public static boolean fileNameIsInvalid(String filename) {
-		return ! fileNameIsValid(filename);
-	}
-
-	/**
-	 * Return whether the specified file name is valid.
-	 */
-	public static boolean fileNameIsValid(String filename) {
-		int len = filename.length();
-		for (int i = 0; i < len; i++) {
-			char filenameChar = filename.charAt(i);
-			if (CollectionTools.contains(INVALID_FILENAME_CHARACTERS, filenameChar)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Convert the illegal characters in the specified file name to
-	 * the specified character and return the result.
-	 */
-	public static String convertToValidFileName(String filename, char replacementChar) {
-		int len = filename.length();
-		StringBuilder sb = new StringBuilder(len);
-		for (int i = 0; i < len; i++) {
-			char filenameChar = filename.charAt(i);
-			if (CollectionTools.contains(INVALID_FILENAME_CHARACTERS, filenameChar)) {
-				sb.append(replacementChar);
-			} else {
-				sb.append(filenameChar);
-			}
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the illegal characters in the specified file name to
-	 * periods ('.') and return the result.
-	 */
-	public static String convertToValidFileName(String filename) {
-		return convertToValidFileName(filename, '.');
-	}
-
-	/**
-	 * Return whether the specified file name is "reserved"
-	 * (i.e. it cannot be used for "user" files). Windows reserves
-	 * a number of file names (e.g. CON, AUX, PRN).
-	 */
-	public static boolean fileNameIsReserved(String fileName) {
-		if (executingOnWindows()) {
-			return CollectionTools.contains(WINDOWS_RESERVED_FILE_NAMES, fileName.toLowerCase());
-		}
-		return false;	// Unix does not have any "reserved" file names (I think...)
-	}
-
-	/**
-	 * Return whether the specified file contains any "reserved"
-	 * components.
-	 * Windows reserves a number of file names (e.g. CON, AUX, PRN);
-	 * and these file names cannot be used for either the names of
-	 * files or directories.
-	 */
-	public static boolean fileHasAnyReservedComponents(File file) {
-		File temp = file;
-		while (temp != null) {
-			if (fileNameIsReserved(temp.getName())) {
-				return true;
-			}
-			temp = temp.getParentFile();
-		}
-		return false;
-	}
-
-
-	// ********** shortened file names **********
-
-	/**
-	 * Return a shorter version of the absolute file name for the specified file.
-	 * The shorter version will not be longer than the maximum length.
-	 * The first directory (usually the drive letter) and the file name or the
-	 * last directory will always be added to the generated string regardless of
-	 * the maximum length allowed.
-	 */
-	public static String shortenFileName(URL url) {
-		return shortenFileName(url, MAXIMUM_SHORTENED_FILE_NAME_LENGTH);
-	}
-
-	/**
-	 * Return a shorter version of the absolute file name for the specified file.
-	 * The shorter version will not be longer than the maximum length.
-	 * The first directory (usually the drive letter) and the file name or the
-	 * last directory will always be added to the generated string regardless of
-	 * the maximum length allowed.
-	 */
-	public static String shortenFileName(URL url, int maxLength) {
-		File file;
-		try {
-			file = buildFile(url);
-		} catch (URISyntaxException e) {
-			file = new File(url.getFile());
-		}
-		return shortenFileName(file, maxLength);
-	}
-
-	/**
-	 * Return a shorter version of the absolute file name for the specified file.
-	 * The shorter version will not be longer than the maximum length.
-	 * The first directory (usually the drive letter) and the file name or the
-	 * last directory will always be added to the generated string regardless of
-	 * the maximum length allowed.
-	 */
-	public static String shortenFileName(File file) {
-		return shortenFileName(file, MAXIMUM_SHORTENED_FILE_NAME_LENGTH);
-	}
-
-	/**
-	 * Return a shorter version of the absolute file name for the specified file.
-	 * The shorter version will not be longer than the maximum length.
-	 * The first directory (usually the drive letter) and the file name or the
-	 * last directory will always be added to the generated string regardless of
-	 * the maximum length allowed.
-	 */
-	public static String shortenFileName(File file, int maxLength) {
-		String absoluteFileName = canonicalFile(file).getAbsolutePath();
-		if (absoluteFileName.length() <= maxLength) {
-			// no need to shorten
-			return absoluteFileName;
-		}
-
-		// break down the path into its components
-		String fs = File.separator;
-		String[] paths = absoluteFileName.split('\\' + fs);
-
-		if (paths.length <= 1) {
-			// e.g. "C:\"
-			return paths[0];
-		}
-
-		if (paths.length == 2) {
-			// e.g. "C:\MyReallyLongFileName.ext" or "C:\MyReallyLongDirectoryName"
-			// return the complete file name since this is a minimum requirement,
-			// regardless of the maximum length allowed
-			return absoluteFileName;
-		}
-
-		StringBuilder sb = new StringBuilder();
-		sb.append(paths[0]);		// always add the first directory, which is usually the drive letter
-
-		// Keep the index of insertion into the string buffer
-		int insertIndex = sb.length();
-
-		sb.append(fs);
-		sb.append(paths[paths.length - 1]);		// append the file name or the last directory
-
-		maxLength -= 4;                      // -4 for "/..."
-
-		int currentLength = sb.length() - 4; // -4 for "/..."
-		int leftIndex = 1;                   //  1 to skip the root directory
-		int rightIndex = paths.length - 2;   // -1 for the file name or the last directory
-
-		boolean canAddFromLeft = true;
-		boolean canAddFromRight = true;
-
-		// Add each directory, the insertion is going in both direction: left and
-		// right, once a side can't be added, the other side is still continuing
-		// until both can't add anymore
-		while (true) {
-			if (!canAddFromLeft && !canAddFromRight)
-				break;
-
-			if (canAddFromRight) {
-				String rightDirectory = paths[rightIndex];
-				int rightLength = rightDirectory.length();
-
-				// Add the directory on the right side of the loop
-				if (currentLength + rightLength + 1 <= maxLength) {
-					sb.insert(insertIndex,     fs);
-					sb.insert(insertIndex + 1, rightDirectory);
-
-					currentLength += rightLength + 1;
-					rightIndex--;
-
-					// The right side is now overlapping the left side, that means
-					// we can't add from the right side anymore
-					if (leftIndex >= rightIndex) {
-						canAddFromRight = false;
-					}
-				} else {
-					canAddFromRight = false;
-				}
-			}
-
-			if (canAddFromLeft) {
-				String leftDirectory = paths[leftIndex];
-				int leftLength = leftDirectory.length();
-
-				// Add the directory on the left side of the loop
-				if (currentLength + leftLength + 1 <= maxLength) {
-					sb.insert(insertIndex,     fs);
-					sb.insert(insertIndex + 1, leftDirectory);
-
-					insertIndex += leftLength + 1;
-					currentLength += leftLength + 1;
-					leftIndex++;
-
-					// The left side is now overlapping the right side, that means
-					// we can't add from the left side anymore
-					if (leftIndex >= rightIndex) {
-						canAddFromLeft = false;
-					}
-				} else {
-					canAddFromLeft = false;
-				}
-			}
-		}
-
-		if (leftIndex <= rightIndex) {
-			sb.insert(insertIndex, fs);
-			sb.insert(insertIndex + 1, "..."); //$NON-NLS-1$
-		}
-
-		return sb.toString();
-	}
-
-
-	// ********** system properties **********
-
-	/**
-	 * Return a file representing the user's home directory.
-	 */
-	public static File userHomeDirectory() {
-		return new File(USER_HOME_DIRECTORY_NAME);
-	}
-	
-	/**
-	 * Return a file representing the user's temporary directory.
-	 */
-	public static File userTemporaryDirectory() {
-		return new File(USER_TEMPORARY_DIRECTORY_NAME);
-	}
-	
-	/**
-	 * Return a file representing the current working directory.
-	 */
-	public static File currentWorkingDirectory() {
-		return new File(CURRENT_WORKING_DIRECTORY_NAME);
-	}
-	
-
-	// ********** miscellaneous **********
-
-	private static boolean executingOnWindows() {
-		return executingOn("Windows"); //$NON-NLS-1$
-	}
-
-//	private static boolean executingOnLinux() {
-//		return executingOn("Linux");
-//	}
-//
-	private static boolean executingOn(String osName) {
-		return System.getProperty("os.name").indexOf(osName) != -1; //$NON-NLS-1$
-	}
-
-	/**
-	 * Return only the files that fit the filter.
-	 * File#files(FileFilter fileFilter)
-	 */
-	public static Iterator<File> filter(Iterator<File> files, final FileFilter fileFilter) {
-		return new FilteringIterator<File, File>(files) {
-			@Override
-			protected boolean accept(File next) {
-				return fileFilter.accept(next);
-			}
-		};
-	}
-
-	/**
-	 * Return a file that is a re-specification of the specified
-	 * file, relative to the specified directory.
-	 *     Linux/Unix/Mac:
-	 *         convertToRelativeFile(/foo/bar/baz.java, /foo)
-	 *             => bar/baz.java
-	 *     Windows:
-	 *         convertToRelativeFile(C:\foo\bar\baz.java, C:\foo)
-	 *             => bar/baz.java
-	 * The file can be either a file or a directory; the directory
-	 * *should* be a directory.
-	 * If the file is already relative or it cannot be made relative
-	 * to the directory, it will be returned unchanged.
-	 * 
-	 * NB: This method has been tested on Windows and Linux,
-	 * but not Mac (but the Mac is Unix-based these days, so
-	 * it shouldn't be a problem...).
-	 */
-	public static File convertToRelativeFile(final File file, final File dir) {
-		// check whether the file is already relative
-		if ( ! file.isAbsolute()) {
-			return file;		// return unchanged
-		}
-
-		File cFile = canonicalFile(file);
-		File cDir = canonicalFile(dir);
-
-		// the two are the same directory
-		if (cFile.equals(cDir)) {
-			return new File("."); //$NON-NLS-1$
-		}
-
-		File[] filePathFiles = pathFiles(cFile);
-		File[] dirPathFiles = pathFiles(cDir);
-
-		// Windows only (?): the roots are different - e.g. D:\ vs. C:\
-		if ( ! dirPathFiles[0].equals(filePathFiles[0])) {
-			return file;		// return unchanged
-		}
-
-		// at this point we know the root is the same, now find how much is in common
-		int i = 0;		// this will point at the first miscompare
-		while ((i < dirPathFiles.length) && (i < filePathFiles.length)) {
-			if (dirPathFiles[i].equals(filePathFiles[i])) {
-				i++;
-			} else {
-				break;
-			}
-		}
-		// save our current position
-		int firstMismatch = i;
-
-		// check whether the file is ABOVE the directory: ../..
-		if (firstMismatch == filePathFiles.length) {
-			return relativeParentFile(dirPathFiles.length - firstMismatch);
-		}
-
-		// build a new file from the path beyond the matching portions
-		File diff = new File(filePathFiles[i].getName());
-		while (++i < filePathFiles.length) {
-			diff = new File(diff, filePathFiles[i].getName());
-		}
-
-		// check whether the file is BELOW the directory: subdir1/subdir2/file.ext
-		if (firstMismatch == dirPathFiles.length) {
-			return diff;
-		}
-
-		// the file must be a PEER of the directory: ../../subdir1/subdir2/file.ext
-		return new File(relativeParentFile(dirPathFiles.length - firstMismatch), diff.getPath());
-	}
-
-	/**
-	 * Return a file that is a re-specification of the specified
-	 * file, relative to the current working directory.
-	 *     Linux/Unix/Mac (CWD = /foo):
-	 *         convertToRelativeFile(/foo/bar/baz.java)
-	 *             => bar/baz.java
-	 *     Windows (CWD = C:\foo):
-	 *         convertToRelativeFile(C:\foo\bar\baz.java)
-	 *             => bar/baz.java
-	 * The file can be either a file or a directory.
-	 * If the file is already relative or it cannot be made relative
-	 * to the directory, it will be returned unchanged.
-	 * 
-	 * NB: This method has been tested on Windows and Linux,
-	 * but not Mac (but the Mac is Unix-based these days, so
-	 * it shouldn't be a problem...).
-	 */
-	public static File convertToRelativeFile(final File file) {
-		return convertToRelativeFile(file, currentWorkingDirectory());
-	}
-
-	/**
-	 * Return an array of files representing the path to the specified
-	 * file. For example:
-	 *     C:/foo/bar/baz.txt =>
-	 *     { C:/, C:/foo, C:/foo/bar, C:/foo/bar/baz.txt }
-	 */
-	private static File[] pathFiles(File file) {
-		List<File> path = new ArrayList<File>();
-		for (File f = file; f != null; f = f.getParentFile()) {
-			path.add(f);
-		}
-		Collections.reverse(path);
-		return path.toArray(new File[path.size()]);
-	}
-
-	/**
-	 * Return a file with the specified (non-zero) number of relative
-	 * file names, e.g. xxx(3) => ../../..
-	 */
-	private static File relativeParentFile(int len) {
-		if (len <= 0) {
-			throw new IllegalArgumentException("length must be greater than zero: " + len); //$NON-NLS-1$
-		}
-		File result = new File(".."); //$NON-NLS-1$
-		for (int i = len - 1; i-- > 0; ) {
-			result = new File(result, ".."); //$NON-NLS-1$
-		}
-		return result;
-	}
-
-	/**
-	 * Return a file that is a re-specification of the specified
-	 * file, absolute to the specified directory.
-	 *     Linux/Unix/Mac:
-	 *         convertToAbsoluteFile(bar/baz.java, /foo)
-	 *             => /foo/bar/baz.java
-	 *     Windows:
-	 *         convertToAbsoluteFile(bar/baz.java, C:\foo)
-	 *             => C:\foo\bar\baz.java
-	 * The file can be either a file or a directory; the directory
-	 * *should* be a directory.
-	 * If the file is already absolute, it will be returned unchanged.
-	 * 
-	 * NB: This method has been tested on Windows and Linux,
-	 * but not Mac (but the Mac is Unix-based these days, so
-	 * it shouldn't be a problem...).
-	 */
-	public static File convertToAbsoluteFile(final File file, final File dir) {
-		// check whether the file is already absolute
-		if (file.isAbsolute()) {
-			return file;		// return unchanged
-		}
-		return canonicalFile(new File(dir, file.getPath()));
-	}
-
-	/**
-	 * Return a file that is a re-specification of the specified
-	 * file, absolute to the current working directory.
-	 *     Linux/Unix/Mac (CWD = /foo):
-	 *         convertToAbsoluteFile(bar/baz.java)
-	 *             => /foo/bar/baz.java
-	 *     Windows (CWD = C:\foo):
-	 *         convertToAbsoluteFile(bar/baz.java)
-	 *             => C:\foo\bar\baz.java
-	 * The file can be either a file or a directory.
-	 * If the file is already absolute, it will be returned unchanged.
-	 * 
-	 * NB: This method has been tested on Windows and Linux,
-	 * but not Mac (but the Mac is Unix-based these days, so
-	 * it shouldn't be a problem...).
-	 */
-	public static File convertToAbsoluteFile(final File file) {
-		return convertToAbsoluteFile(file, currentWorkingDirectory());
-	}
-
-
-	// ********** constructor **********
-
-	/**
-	 * Suppress default constructor, ensuring non-instantiability.
-	 */
-	private FileTools() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/HashBag.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/HashBag.java
deleted file mode 100644
index b3540e2395..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/HashBag.java
+++ /dev/null
@@ -1,913 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.utility.internal;
-
-import java.io.Serializable;
-import java.util.AbstractCollection;
-import java.util.Collection;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-/**
- * This class implements the <code>Bag</code> interface, backed by a
- * hash table. It makes no guarantees as to the iteration order of
- * the bag's elements; in particular, it does not guarantee that the order
- * will remain constant over time. This class permits the <code>null</code>
- * element.
- * <p>
- * This class offers constant time performance for the basic operations
- * (<code>add</code>, <code>remove</code>, <code>contains</code> and
- * <code>size</code>), assuming the hash function disperses the elements
- * properly among the buckets. Iterating over this bag requires time
- * proportional to the sum of the bag's size (the number of elements) plus the
- * "capacity" of the backing hash table (the number of buckets). Thus, it is
- * important not to set the initial capacity too high (or the load factor too
- * low) if iteration performance is important.
- * <p>
- * <b>Note that this implementation is not synchronized.</b> If multiple
- * threads access a bag concurrently, and at least one of the threads modifies
- * the bag, it <i>must</i> be synchronized externally. This is typically
- * accomplished by synchronizing on some object that naturally encapsulates
- * the bag. If no such object exists, the bag should be "wrapped" using the
- * <code>Collections.synchronizedCollection</code> method. This is
- * best done at creation time, to prevent accidental unsynchronized access
- * to the bag:
- * <pre>
- * Collection c = Collections.synchronizedCollection(new HashBag(...));
- * </pre>
- * <p>
- * The iterators returned by this class's <code>iterator</code> method are
- * <i>fail-fast</i>: if the bag is modified at any time after the iterator is
- * created, in any way except through the iterator's own <code>remove</code>
- * method, the iterator throws a <code>ConcurrentModificationException</code>.
- * Thus, in the face of concurrent modification, the iterator fails quickly
- * and cleanly, rather than risking arbitrary, non-deterministic behavior at
- * an undetermined time in the future.
- * 
- * @see	Collections#synchronizedCollection(Collection)
- */
-public class HashBag<E>
-	extends AbstractCollection<E>
-	implements Bag<E>, Cloneable, Serializable
-{
-
-	/** The hash table. */
-	transient Entry<E>[] table;
-
-	/** The total number of entries in the bag. */
-	transient int count = 0;
-
-	/** The number of unique entries in the bag. */
-	transient int uniqueCount = 0;
-
-	/**
-	 * The hash table is rehashed when its size exceeds this threshold. (The
-	 * value of this field is (int)(capacity * loadFactor).)
-	 *
-	 * @serial
-	 */
-	private int threshold;
-
-	/**
-	 * The load factor for the hash table.
-	 *
-	 * @serial
-	 */
-	private float loadFactor;
-
-	/**
-	 * The number of times this bag has been structurally modified.
-	 * Structural modifications are those that change the number of entries in
-	 * the bag or otherwise modify its internal structure (e.g. rehash).
-	 * This field is used to make iterators on this bag fail-fast.
-	 *
-	 * @see java.util.ConcurrentModificationException
-	 */
-	transient int modCount = 0;
-
-	/**
-	 * Constructs a new, empty bag with the
-	 * default capacity, which is 11, and load factor, which is 0.75.
-	 */
-	public HashBag() {
-		this(11, 0.75f);
-	}
-
-	/**
-	 * Constructs a new, empty bag with the specified initial capacity
-	 * and default load factor, which is 0.75.
-	 *
-	 * @param initialCapacity the initial capacity of the backing map.
-	 * @throws IllegalArgumentException if the initial capacity is less
-	 *     than zero.
-	 */
-	public HashBag(int initialCapacity) {
-		this(initialCapacity, 0.75f);
-	}
-
-	/**
-	 * Constructs a new, empty bag with
-	 * the specified initial capacity and the specified load factor.
-	 *
-	 * @param initialCapacity the initial capacity of the backing map.
-	 * @param loadFactor the load factor of the backing map.
-	 * @throws IllegalArgumentException if the initial capacity is less
-	 *     than zero, or if the load factor is nonpositive.
-	 */
-	public HashBag(int initialCapacity, float loadFactor) {
-		if (initialCapacity < 0) {
-			throw new IllegalArgumentException("Illegal Initial Capacity: " + initialCapacity); //$NON-NLS-1$
-		}
-		if (loadFactor <= 0 || Float.isNaN(loadFactor)) {
-			throw new IllegalArgumentException("Illegal Load factor: " + loadFactor); //$NON-NLS-1$
-		}
-		if (initialCapacity == 0) {
-			initialCapacity = 1;
-		}
-		this.loadFactor = loadFactor;
-		this.table = this.buildTable(initialCapacity);
-		this.threshold = (int) (initialCapacity * loadFactor);
-	}
-
-	/**
-	 * Constructs a new bag containing the elements in the specified
-	 * collection. The capacity of the bag is
-	 * twice the size of the specified collection or 11 (whichever is
-	 * greater), and the default load factor, which is 0.75, is used.
-	 *
-	 * @param c the collection whose elements are to be placed into this bag.
-	 */
-	public HashBag(Collection<? extends E> c) {
-		this(Math.max(2*c.size(), 11));
-		this.addAll(c);
-	}
-
-	/**
-	 * This implementation simply returns the maintained count.
-	 */
-	@Override
-	public int size() {
-		return this.count;
-	}
-
-	/**
-	 * This implementation simply compares the maintained count to zero.
-	 */
-	@Override
-	public boolean isEmpty() {
-		return this.count == 0;
-	}
-
-	/**
-	 * This implementation searches for the object in the hash table by calculating
-	 * the object's hash code and examining the entries in the corresponding hash
-	 * table bucket.
-	 */
-	@Override
-	public boolean contains(Object o) {
-		Entry<E>[] tab = this.table;
-		if (o == null) {
-			for (Entry<E> e = tab[0]; e != null; e = e.next) {
-				if (e.object == null) {
-					return true;
-				}
-			}
-		} else {
-			int hash = o.hashCode();
-			int index = (hash & 0x7FFFFFFF) % tab.length;
-			for (Entry<E> e = tab[index]; e != null; e = e.next) {
-				if ((e.hash == hash) && o.equals(e.object)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public int count(Object o) {
-		Entry<E>[] tab = this.table;
-		if (o == null) {
-			for (Entry<E> e = tab[0]; e != null; e = e.next) {
-				if (e.object == null) {
-					return e.count;
-				}
-			}
-		} else {
-			int hash = o.hashCode();
-			int index = (hash & 0x7FFFFFFF) % tab.length;
-			for (Entry<E> e = tab[index]; e != null; e = e.next) {
-				if ((e.hash == hash) && o.equals(e.object)) {
-					return e.count;
-				}
-			}
-		}
-		return 0;
-	}
-
-	/**
-	 * Rehashes the contents of this bag into a new hash table
-	 * with a larger capacity. This method is called when the
-	 * number of different elements in this map exceeds its
-	 * capacity and load factor.
-	 */
-	private void rehash() {
-		Entry<E>[] oldMap = this.table;
-		int oldCapacity = oldMap.length;
-
-		int newCapacity = oldCapacity * 2 + 1;
-		Entry<E>[] newTable = this.buildTable(newCapacity);
-
-		this.modCount++;
-		this.threshold = (int) (newCapacity * this.loadFactor);
-		this.table = newTable;
-
-		for (int i = oldCapacity; i-- > 0; ) {
-			for (Entry<E> old = oldMap[i]; old != null; ) {
-				Entry<E> e = old;
-				old = old.next;
-
-				int index = (e.hash & 0x7FFFFFFF) % newCapacity;
-				e.next = newTable[index];
-				newTable[index] = e;
-			}
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	private Entry<E>[] buildTable(int capacity) {
-		return new Entry[capacity];
-	}
-
-	@SuppressWarnings("unchecked")
-	private <T> Entry<E> buildEntry(int hash, Object o, Entry<T> next) {
-		return new Entry(hash, o, next);
-	}
-
-	@SuppressWarnings("unchecked")
-	private <T> Entry<E> buildEntry(int hash, Object o, int cnt, Entry<T> next) {
-		return new Entry(hash, o, cnt, next);
-	}
-
-	/**
-	 * This implementation searches for the object in the hash table by calculating
-	 * the object's hash code and examining the entries in the corresponding hash
-	 * table bucket.
-	 */
-	@Override
-	public boolean add(E o) {
-		this.modCount++;
-		Entry<E>[] tab = this.table;
-		int hash = 0;
-		int index = 0;
-
-		// if the object is already in the bag, simply bump its count
-		if (o == null) {
-			for (Entry<E> e = tab[0]; e != null; e = e.next) {
-				if (e.object == null) {
-					e.count++;
-					this.count++;
-					return true;
-				}
-			}
-		} else {
-			hash = o.hashCode();
-			index = (hash & 0x7FFFFFFF) % tab.length;
-			for (Entry<E> e = tab[index]; e != null; e = e.next) {
-				if ((e.hash == hash) && o.equals(e.object)) {
-					e.count++;
-					this.count++;
-					return true;
-				}
-			}
-		}
-
-		// rehash the table if the threshold is exceeded
-		if (this.uniqueCount >= this.threshold) {
-			this.rehash();
-			tab = this.table;
-			index = (hash & 0x7FFFFFFF) % tab.length;
-		}
-
-		// create the new entry and put it in the table
-		Entry<E> e = this.buildEntry(hash, o, tab[index]);
-		tab[index] = e;
-		this.count++;
-		this.uniqueCount++;
-		return true;
-	}
-
-	/**
-	 * This implementation searches for the object in the hash table by calculating
-	 * the object's hash code and examining the entries in the corresponding hash
-	 * table bucket.
-	 */
-	public boolean add(E o, int cnt) {
-		if (cnt <= 0) {
-			return false;
-		}
-		this.modCount++;
-		Entry<E>[] tab = this.table;
-		int hash = 0;
-		int index = 0;
-
-		// if the object is already in the bag, simply bump its count
-		if (o == null) {
-			for (Entry<E> e = tab[0]; e != null; e = e.next) {
-				if (e.object == null) {
-					e.count += cnt;
-					this.count += cnt;
-					return true;
-				}
-			}
-		} else {
-			hash = o.hashCode();
-			index = (hash & 0x7FFFFFFF) % tab.length;
-			for (Entry<E> e = tab[index]; e != null; e = e.next) {
-				if ((e.hash == hash) && o.equals(e.object)) {
-					e.count += cnt;
-					this.count += cnt;
-					return true;
-				}
-			}
-		}
-
-		// rehash the table if the threshold is exceeded
-		if (this.uniqueCount >= this.threshold) {
-			this.rehash();
-			tab = this.table;
-			index = (hash & 0x7FFFFFFF) % tab.length;
-		}
-
-		// create the new entry and put it in the table
-		Entry<E> e = this.buildEntry(hash, o, cnt, tab[index]);
-		tab[index] = e;
-		this.count += cnt;
-		this.uniqueCount++;
-		return true;
-	}
-
-	/**
-	 * This implementation searches for the object in the hash table by calculating
-	 * the object's hash code and examining the entries in the corresponding hash
-	 * table bucket.
-	 */
-	@Override
-	public boolean remove(Object o) {
-		Entry<E>[] tab = this.table;
-		if (o == null) {
-			for (Entry<E> e = tab[0], prev = null; e != null; prev = e, e = e.next) {
-				if (e.object == null) {
-					this.modCount++;
-					e.count--;
-					// if we are removing the last one, remove the entry from the table
-					if (e.count == 0) {
-						if (prev == null) {
-							tab[0] = e.next;
-						} else {
-							prev.next = e.next;
-						}
-						this.uniqueCount--;
-					}
-					this.count--;
-					return true;
-				}
-			}
-		} else {
-			int hash = o.hashCode();
-			int index = (hash & 0x7FFFFFFF) % tab.length;
-			for (Entry<E> e = tab[index], prev = null; e != null; prev = e, e = e.next) {
-				if ((e.hash == hash) && o.equals(e.object)) {
-					this.modCount++;
-					e.count--;
-					// if we are removing the last one, remove the entry from the table
-					if (e.count == 0) {
-						if (prev == null) {
-							tab[index] = e.next;
-						} else {
-							prev.next = e.next;
-						}
-						this.uniqueCount--;
-					}
-					this.count--;
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * This implementation searches for the object in the hash table by calculating
-	 * the object's hash code and examining the entries in the corresponding hash
-	 * table bucket.
-	 */
-	public boolean remove(Object o, int cnt) {
-		if (cnt <= 0) {
-			return false;
-		}
-		Entry<E>[] tab = this.table;
-		if (o == null) {
-			for (Entry<E> e = tab[0], prev = null; e != null; prev = e, e = e.next) {
-				if (e.object == null) {
-					this.modCount++;
-					int cnt2 = (cnt < e.count) ? cnt : e.count;
-					e.count -= cnt2;
-					// if we are removing the last element(s), remove the entry from the table
-					if (e.count == 0) {
-						if (prev == null) {
-							tab[0] = e.next;
-						} else {
-							prev.next = e.next;
-						}
-						this.uniqueCount--;
-					}
-					this.count -= cnt2;
-					return true;
-				}
-			}
-		} else {
-			int hash = o.hashCode();
-			int index = (hash & 0x7FFFFFFF) % tab.length;
-			for (Entry<E> e = tab[index], prev = null; e != null; prev = e, e = e.next) {
-				if ((e.hash == hash) && o.equals(e.object)) {
-					this.modCount++;
-					int cnt2 = (cnt < e.count) ? cnt : e.count;
-					e.count -= cnt2;
-					// if we are removing the last element(s), remove the entry from the table
-					if (e.count == 0) {
-						if (prev == null) {
-							tab[index] = e.next;
-						} else {
-							prev.next = e.next;
-						}
-						this.uniqueCount--;
-					}
-					this.count -= cnt2;
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * This implementation simply clears out all of the hash table buckets.
-	 */
-	@Override
-	public void clear() {
-		Entry<E>[] tab = this.table;
-		this.modCount++;
-		for (int i = tab.length; --i >= 0; ) {
-			tab[i] = null;
-		}
-		this.count = 0;
-		this.uniqueCount = 0;
-	}
-
-	/**
-	 * Returns a shallow copy of this bag: the elements
-	 * themselves are not cloned.
-	 *
-	 * @return a shallow copy of this bag.
-	 */
-	@Override
-	public HashBag<E> clone() {
-		try {
-			@SuppressWarnings("unchecked")
-			HashBag<E> clone = (HashBag<E>) super.clone();
-			clone.table = this.buildTable(this.table.length);
-			for (int i = this.table.length; i-- > 0; ) {
-				clone.table[i] = (this.table[i] == null) 
-						? null : (Entry<E>) this.table[i].clone();
-			}
-			clone.modCount = 0;
-			return clone;
-		} catch (CloneNotSupportedException e) {
-			throw new InternalError();
-		}
-	}
-
-
-	/**
-	 * Hash table collision list entry.
-	 */
-	private static class Entry<E> implements Bag.Entry<E> {
-		int hash;
-		E object;
-		int count;
-		Entry<E> next;
-
-		Entry(int hash, E object, Entry<E> next) {
-			this(hash, object, 1, next);
-		}
-
-		Entry(int hash, E object, int count, Entry<E> next) {
-			this.hash = hash;
-			this.object = object;
-			this.count = count;
-			this.next = next;
-		}
-
-		/**
-		 * Cascade the clone to all the entries in the same bucket.
-		 */
-		@Override
-		@SuppressWarnings("unchecked")
-		protected Entry<E> clone() {
-			return new Entry(this.hash, this.object, this.count,
-					(this.next == null ? null : this.next.clone()));
-		}
-
-		// ***** Bag.Entry implementation
-		public E getElement() {
-			return this.object;
-		}
-
-		public int getCount() {
-			return this.count;
-		}
-
-		public int setCount(int count) {
-			if (count <= 0) {
-				throw new IllegalArgumentException("count must be greater than zero: " + count); //$NON-NLS-1$
-			}
-			int old = this.count;
-			this.count = count;
-			return old;
-		}
-
-		@Override
-		public boolean equals(Object o) {
-			if ( ! (o instanceof Bag.Entry)) {
-				return false;
-			}
-			@SuppressWarnings("unchecked")
-			Bag.Entry e = (Bag.Entry) o;
-			if (this.count != e.getCount()) {
-				return false;
-			}
-			Object o1 = this.object;
-			Object o2 = e.getElement();
-			if (o1 == o2) {
-				return true;
-			}
-			if (o1 == null) {
-				return false;
-			}
-			return o1.equals(o2);
-		}
-
-		@Override
-		public int hashCode() {
-			E o = this.object;
-			return (o == null) ? 0 : (this.count * o.hashCode());
-		}
-
-		@Override
-		public String toString() {
-			return this.object + "=>" + this.count; //$NON-NLS-1$
-		}
-	}
-
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterator<E> iterator() {
-		return (this.count == 0) ? EMPTY_ITERATOR : new HashIterator();
-	}
-
-	@SuppressWarnings("unchecked")
-	public Iterator<E> uniqueIterator() {
-		return (this.count == 0) ? EMPTY_ITERATOR : new UniqueIterator();
-	}
-
-	@SuppressWarnings("unchecked")
-	public Iterator<Bag.Entry<E>> entries() {
-		return (this.count == 0) ? EMPTY_ITERATOR : new EntryIterator();
-	}
-
-
-	/**
-	 * Empty iterator that does just about nothing.
-	 */
-	@SuppressWarnings("unchecked")
-	private static final Iterator EMPTY_ITERATOR = new EmptyIterator();
-
-	@SuppressWarnings("unchecked")
-	private static class EmptyIterator implements Iterator {
-
-		EmptyIterator() {
-			super();
-		}
-
-		public boolean hasNext() {
-			return false;
-		}
-
-		public Object next() {
-			throw new NoSuchElementException();
-		}
-
-		public void remove() {
-			throw new IllegalStateException();
-		}
-	}
-
-
-	private class HashIterator implements Iterator<E> {
-		private Entry<E>[] localTable = HashBag.this.table;
-		private int index = this.localTable.length;	// start at the end of the table
-		private Entry<E> nextEntry = null;
-		private int nextEntryCount = 0;
-		private Entry<E> lastReturnedEntry = null;
-
-		/**
-		 * The modCount value that the iterator believes that the backing
-		 * bag should have. If this expectation is violated, the iterator
-		 * has detected a concurrent modification.
-		 */
-		private int expectedModCount = HashBag.this.modCount;
-
-		HashIterator() {
-			super();
-		}
-
-		public boolean hasNext() {
-			Entry<E> e = this.nextEntry;
-			int i = this.index;
-			Entry<E>[] tab = this.localTable;
-			// Use locals for faster loop iteration
-			while ((e == null) && (i > 0)) {
-				e = tab[--i];		// move backwards through the table
-			}
-			this.nextEntry = e;
-			this.index = i;
-			return e != null;
-		}
-
-		public E next() {
-			if (HashBag.this.modCount != this.expectedModCount) {
-				throw new ConcurrentModificationException();
-			}
-			Entry<E> et = this.nextEntry;
-			int i = this.index;
-			Entry<E>[] tab = this.localTable;
-			// Use locals for faster loop iteration
-			while ((et == null) && (i > 0)) {
-				et = tab[--i];		// move backwards through the table
-			}
-			this.nextEntry = et;
-			this.index = i;
-			if (et == null) {
-				throw new NoSuchElementException();
-			}
-			Entry<E> e = this.lastReturnedEntry = this.nextEntry;
-			this.nextEntryCount++;
-			if (this.nextEntryCount == e.count) {
-				this.nextEntry = e.next;
-				this.nextEntryCount = 0;
-			}
-			return e.object;
-		}
-
-		public void remove() {
-			if (this.lastReturnedEntry == null) {
-				throw new IllegalStateException();
-			}
-			if (HashBag.this.modCount != this.expectedModCount) {
-				throw new ConcurrentModificationException();
-			}
-			Entry<E>[] tab = this.localTable;
-			int slot = (this.lastReturnedEntry.hash & 0x7FFFFFFF) % tab.length;
-			for (Entry<E> e = tab[slot], prev = null; e != null; prev = e, e = e.next) {
-				if (e == this.lastReturnedEntry) {
-					HashBag.this.modCount++;
-					this.expectedModCount++;
-					e.count--;
-					if (e.count == 0) {
-						// if we are removing the last one, remove the entry from the table
-						if (prev == null) {
-							tab[slot] = e.next;
-						} else {
-							prev.next = e.next;
-						}
-						HashBag.this.uniqueCount--;
-					} else {
-						// slide back the count to account for the just-removed element
-						this.nextEntryCount--;
-					}
-					HashBag.this.count--;
-					this.lastReturnedEntry = null;	// it cannot be removed again
-					return;
-				}
-			}
-			throw new ConcurrentModificationException();
-		}
-
-	}
-
-
-	private class EntryIterator implements Iterator<Entry<E>> {
-		private Entry<E>[] localTable = HashBag.this.table;
-		private int index = this.localTable.length;	// start at the end of the table
-		private Entry<E> nextEntry = null;
-		private Entry<E> lastReturnedEntry = null;
-
-		/**
-		 * The modCount value that the iterator believes that the backing
-		 * bag should have. If this expectation is violated, the iterator
-		 * has detected a concurrent modification.
-		 */
-		private int expectedModCount = HashBag.this.modCount;
-
-		EntryIterator() {
-			super();
-		}
-
-		public boolean hasNext() {
-			Entry<E> e = this.nextEntry;
-			int i = this.index;
-			Entry<E>[] tab = this.localTable;
-			// Use locals for faster loop iteration
-			while ((e == null) && (i > 0)) {
-				e = tab[--i];		// move backwards through the table
-			}
-			this.nextEntry = e;
-			this.index = i;
-			return e != null;
-		}
-
-		public Entry<E> next() {
-			if (HashBag.this.modCount != this.expectedModCount) {
-				throw new ConcurrentModificationException();
-			}
-			Entry<E> et = this.nextEntry;
-			int i = this.index;
-			Entry<E>[] tab = this.localTable;
-			// Use locals for faster loop iteration
-			while ((et == null) && (i > 0)) {
-				et = tab[--i];		// move backwards through the table
-			}
-			this.nextEntry = et;
-			this.index = i;
-			if (et == null) {
-				throw new NoSuchElementException();
-			}
-			Entry<E> e = this.lastReturnedEntry = this.nextEntry;
-			this.nextEntry = e.next;
-			return e;
-		}
-
-		public void remove() {
-			if (this.lastReturnedEntry == null) {
-				throw new IllegalStateException();
-			}
-			if (HashBag.this.modCount != this.expectedModCount) {
-				throw new ConcurrentModificationException();
-			}
-			Entry<E>[] tab = this.localTable;
-			int slot = (this.lastReturnedEntry.hash & 0x7FFFFFFF) % tab.length;
-			for (Entry<E> e = tab[slot], prev = null; e != null; prev = e, e = e.next) {
-				if (e == this.lastReturnedEntry) {
-					HashBag.this.modCount++;
-					this.expectedModCount++;
-					// remove the entry from the table
-					if (prev == null) {
-						tab[slot] = e.next;
-					} else {
-						prev.next = e.next;
-					}
-					HashBag.this.uniqueCount--;
-					HashBag.this.count -= this.lastReturnedEntry.count;
-					this.lastReturnedEntry = null;	// it cannot be removed again
-					return;
-				}
-			}
-			throw new ConcurrentModificationException();
-		}
-
-	}
-
-
-	private class UniqueIterator implements Iterator<E> {
-		private EntryIterator entryIterator = new EntryIterator();
-		
-		UniqueIterator() {
-			super();
-		}
-
-		public boolean hasNext() {
-			return this.entryIterator.hasNext();
-		}
-
-		public E next() {
-			return this.entryIterator.next().object;
-		}
-
-		public void remove() {
-			this.entryIterator.remove();
-		}
-
-	}
-
-
-	@Override
-	public boolean equals(Object o) {
-		if (o == this) {
-			return true;
-		}
-		if ( ! (o instanceof Bag)) {
-			return false;
-		}
-		@SuppressWarnings("unchecked")
-		Bag<E> b = (Bag<E>) o;
-		if (b.size() != this.size()) {
-			return false;
-		}
-		Bag<E> clone = this.clone();
-		for (E e : b) {
-			if ( ! clone.remove(e)) {
-				return false;
-			}
-		}
-		return clone.isEmpty();
-	}
-
-	@Override
-	public int hashCode() {
-		int h = 0;
-		for (Iterator<E> stream = this.iterator(); stream.hasNext(); ) {
-			Object next = stream.next();
-			if (next != null) {
-				h += next.hashCode();
-			}
-		}
-		return h;
-	}
-
-	/**
-	 * Save the state of this bag to a stream (i.e. serialize it).
-	 *
-	 * @serialData Emit the capacity of the bag (int),
-	 *     followed by the number of unique elements in the bag (int),
-	 *     followed by all of the bag's elements (each an Object) and
-	 *     their counts (each an int), in no particular order.
-	 */
-	private synchronized void writeObject(java.io.ObjectOutputStream s)
-				throws java.io.IOException {
-		// write out the threshold, load factor, and any hidden stuff
-		s.defaultWriteObject();
-
-		// write out number of buckets
-		s.writeInt(this.table.length);
-
-		// write out number of unique elements
-		s.writeInt(this.uniqueCount);
-
-		Entry<E>[] tab = this.table;
-		// write out elements and counts (alternating)
-		for (Entry<E> entry : tab) {
-			while (entry != null) {
-				s.writeObject(entry.object);
-				s.writeInt(entry.count);
-				entry = entry.next;
-			}
-		}
-	}
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Reconstitute the bag from a stream (i.e. deserialize it).
-	 */
-	private synchronized void readObject(java.io.ObjectInputStream s)
-				throws java.io.IOException, ClassNotFoundException {
-		// read in the threshold, loadfactor, and any hidden stuff
-		s.defaultReadObject();
-
-		// read in number of buckets and allocate the bucket array
-		this.table = this.buildTable(s.readInt());
-
-		// read in number of unique elements
-		int unique = s.readInt();
-
-		// read the elements and counts, and put the elements in the bag
-		for (int i = 0; i < unique; i++) {
-			@SuppressWarnings("unchecked")
-			E element = (E) s.readObject();
-			int elementCount = s.readInt();
-			this.add(element, elementCount);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/IdentityHashBag.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/IdentityHashBag.java
deleted file mode 100644
index 523a390f73..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/IdentityHashBag.java
+++ /dev/null
@@ -1,878 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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.utility.internal;
-
-import java.io.Serializable;
-import java.util.AbstractCollection;
-import java.util.Collection;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-/**
- * This class implements the <code>Bag</code> interface with a
- * hash table, using object-identity in place of object-equality when
- * comparing elements. In other words, in an <code>IdentityHashBag</code>,
- * two objects <code>k1</code> and <code>k2</code> are considered
- * equal if and only if <code>(k1 == k2)</code>. (In normal <code>Bag</code>
- * implementations (like <code>HashBag</code>) two objects <code>k1</code>
- * and <code>k2</code> are considered equal if and only if
- * <code>(k1 == null ? k2 == null : k1.equals(k2))</code>.)
- * <p>
- * <b>
- * This class is <i>not</i> a general-purpose <code>Bag</code>
- * implementation! While this class implements the <code>Bag</code> interface, it
- * intentionally violates <code>Bag's</code> general contract, which mandates the
- * use of the <code>equals</code> method when comparing objects. This class is
- * designed for use only in the rare cases wherein object-identity
- * semantics are required.
- * </b>
- * <p>
- * This class makes no guarantees as to the iteration order of
- * the bag's elements; in particular, it does not guarantee that the order
- * will remain constant over time. This class permits the <code>null</code>
- * element.
- * <p>
- * This class offers constant time performance for the basic operations
- * (<code>add</code>, <code>remove</code>, <code>contains</code> and
- * <code>size</code>), assuming the system identity hash function
- * ({@link System#identityHashCode(Object)}) disperses elements properly
- * among the buckets. Iterating over this bag requires time
- * proportional to the sum of the bag's size (the number of elements) plus the
- * "capacity" of the backing hash table (the number of buckets). Thus, it is
- * important not to set the initial capacity too high (or the load factor too
- * low) if iteration performance is important.
- * <p>
- * <b>Note that this implementation is not synchronized.</b> If multiple
- * threads access a bag concurrently, and at least one of the threads modifies
- * the bag, it <i>must</i> be synchronized externally. This is typically
- * accomplished by synchronizing on some object that naturally encapsulates
- * the bag. If no such object exists, the bag should be "wrapped" using the
- * <code>Collections.synchronizedCollection</code> method. This is
- * best done at creation time, to prevent accidental unsynchronized access
- * to the bag:
- * <pre>
- * Collection c = Collections.synchronizedCollection(new IdentityHashBag(...));
- * </pre>
- * <p>
- * The iterators returned by this class's <code>iterator</code> method are
- * <i>fail-fast</i>: if the bag is modified at any time after the iterator is
- * created, in any way except through the iterator's own <code>remove</code>
- * method, the iterator throws a <code>ConcurrentModificationException</code>.
- * Thus, in the face of concurrent modification, the iterator fails quickly
- * and cleanly, rather than risking arbitrary, non-deterministic behavior at
- * an undetermined time in the future.
- * 
- * @see	Collections#synchronizedCollection(Collection)
- */
-
-public class IdentityHashBag<E>
-	extends AbstractCollection<E>
-	implements Bag<E>, Cloneable, Serializable
-{
-
-	/** The hash table. */
-	transient Entry<E>[] table;
-
-	/** The total number of entries in the bag. */
-	transient int count = 0;
-
-	/** The number of unique entries in the bag. */
-	transient int uniqueCount = 0;
-
-	/**
-	 * The hash table is rehashed when its size exceeds this threshold. (The
-	 * value of this field is (int)(capacity * loadFactor).)
-	 *
-	 * @serial
-	 */
-	private int threshold;
-
-	/**
-	 * The load factor for the hash table.
-	 *
-	 * @serial
-	 */
-	private float loadFactor;
-
-	/**
-	 * The number of times this bag has been structurally modified.
-	 * Structural modifications are those that change the number of entries in
-	 * the bag or otherwise modify its internal structure (e.g. rehash).
-	 * This field is used to make iterators on this bag fail-fast.
-	 *
-	 * @see java.util.ConcurrentModificationException
-	 */
-	transient int modCount = 0;
-
-	/**
-	 * Constructs a new, empty bag with the
-	 * default capacity, which is 11, and load factor, which is 0.75.
-	 */
-	public IdentityHashBag() {
-		this(11, 0.75f);
-	}
-
-	/**
-	 * Constructs a new, empty bag with the specified initial capacity
-	 * and default load factor, which is 0.75.
-	 *
-	 * @param initialCapacity the initial capacity of the backing map.
-	 * @throws IllegalArgumentException if the initial capacity is less
-	 *     than zero.
-	 */
-	public IdentityHashBag(int initialCapacity) {
-		this(initialCapacity, 0.75f);
-	}
-
-	/**
-	 * Constructs a new, empty bag with
-	 * the specified initial capacity and the specified load factor.
-	 *
-	 * @param initialCapacity the initial capacity of the backing map.
-	 * @param loadFactor the load factor of the backing map.
-	 * @throws IllegalArgumentException if the initial capacity is less
-	 *     than zero, or if the load factor is nonpositive.
-	 */
-	public IdentityHashBag(int initialCapacity, float loadFactor) {
-		if (initialCapacity < 0) {
-			throw new IllegalArgumentException("Illegal Initial Capacity: " + initialCapacity); //$NON-NLS-1$
-		}
-		if (loadFactor <= 0 || Float.isNaN(loadFactor)) {
-			throw new IllegalArgumentException("Illegal Load factor: " + loadFactor); //$NON-NLS-1$
-		}
-		if (initialCapacity == 0) {
-			initialCapacity = 1;
-		}
-		this.loadFactor = loadFactor;
-		this.table = this.buildTable(initialCapacity);
-		this.threshold = (int) (initialCapacity * loadFactor);
-	}
-
-	/**
-	 * Constructs a new bag containing the elements in the specified
-	 * collection. The capacity of the bag is
-	 * twice the size of the specified collection or 11 (whichever is
-	 * greater), and the default load factor, which is 0.75, is used.
-	 *
-	 * @param c the collection whose elements are to be placed into this bag.
-	 */
-	public IdentityHashBag(Collection<? extends E> c) {
-		this(Math.max(2*c.size(), 11));
-		this.addAll(c);
-	}
-
-	/**
-	 * This implementation simply returns the maintained count.
-	 */
-	@Override
-	public int size() {
-		return this.count;
-	}
-
-	/**
-	 * This implementation simply compares the maintained count to zero.
-	 */
-	@Override
-	public boolean isEmpty() {
-		return this.count == 0;
-	}
-
-	/**
-	 * This implementation searches for the object in the hash table by
-	 * calculating the object's identity hash code and examining the
-	 * entries in the corresponding hash table bucket.
-	 */
-	@Override
-	public boolean contains(Object o) {
-		Entry<E>[] tab = this.table;
-		int hash = System.identityHashCode(o);
-		int index = (hash & 0x7FFFFFFF) % tab.length;
-		for (Entry<E> e = tab[index]; e != null; e = e.next) {
-			if ((e.hash == hash) && (e.object == o)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public int count(Object o) {
-		Entry<E>[] tab = this.table;
-		int hash = System.identityHashCode(o);
-		int index = (hash & 0x7FFFFFFF) % tab.length;
-		for (Entry<E> e = tab[index]; e != null; e = e.next) {
-			if ((e.hash == hash) && (e.object == o)) {
-				return e.count;
-			}
-		}
-		return 0;
-	}
-
-	/**
-	 * Rehashes the contents of this bag into a new hash table
-	 * with a larger capacity. This method is called when the
-	 * number of different elements in this map exceeds its
-	 * capacity and load factor.
-	 */
-	private void rehash() {
-		Entry<E>[] oldMap = this.table;
-		int oldCapacity = oldMap.length;
-
-		int newCapacity = oldCapacity * 2 + 1;
-		Entry<E>[] newTable = this.buildTable(newCapacity);
-
-		this.modCount++;
-		this.threshold = (int) (newCapacity * this.loadFactor);
-		this.table = newTable;
-
-		for (int i = oldCapacity; i-- > 0; ) {
-			for (Entry<E> old = oldMap[i]; old != null; ) {
-				Entry<E> e = old;
-				old = old.next;
-
-				int index = (e.hash & 0x7FFFFFFF) % newCapacity;
-				e.next = newTable[index];
-				newTable[index] = e;
-			}
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	private Entry<E>[] buildTable(int capacity) {
-		return new Entry[capacity];
-	}
-
-	@SuppressWarnings("unchecked")
-	private <T> Entry<E> buildEntry(int hash, Object o, Entry<T> next) {
-		return new Entry(hash, o, next);
-	}
-
-	@SuppressWarnings("unchecked")
-	private <T> Entry<E> buildEntry(int hash, Object o, int cnt, Entry<T> next) {
-		return new Entry(hash, o, cnt, next);
-	}
-
-	/**
-	 * This implementation searches for the object in the hash table by
-	 * calculating the object's identity hash code and examining the
-	 * entries in the corresponding hash table bucket.
-	 */
-	@Override
-	public boolean add(E o) {
-		this.modCount++;
-		Entry<E>[] tab = this.table;
-		int hash = 0;
-		int index = 0;
-
-		// if the object is already in the bag, simply bump its count
-		hash = System.identityHashCode(o);
-		index = (hash & 0x7FFFFFFF) % tab.length;
-		for (Entry<E> e = tab[index]; e != null; e = e.next) {
-			if ((e.hash == hash) && (e.object == o)) {
-				e.count++;
-				this.count++;
-				return true;
-			}
-		}
-
-		// rehash the table if the threshold is exceeded
-		if (this.uniqueCount >= this.threshold) {
-			this.rehash();
-			tab = this.table;
-			index = (hash & 0x7FFFFFFF) % tab.length;
-		}
-
-		// create the new entry and put it in the table
-		Entry<E> e = this.buildEntry(hash, o, tab[index]);
-		tab[index] = e;
-		this.count++;
-		this.uniqueCount++;
-		return true;
-	}
-
-	/**
-	 * This implementation searches for the object in the hash table by
-	 * calculating the object's identity hash code and examining the
-	 * entries in the corresponding hash table bucket.
-	 */
-	public boolean add(E o, int cnt) {
-		if (cnt <= 0) {
-			return false;
-		}
-		this.modCount++;
-		Entry<E>[] tab = this.table;
-		int hash = 0;
-		int index = 0;
-
-		// if the object is already in the bag, simply bump its count
-		hash = System.identityHashCode(o);
-		index = (hash & 0x7FFFFFFF) % tab.length;
-		for (Entry<E> e = tab[index]; e != null; e = e.next) {
-			if ((e.hash == hash) && (e.object == o)) {
-				e.count += cnt;
-				this.count += cnt;
-				return true;
-			}
-		}
-
-		// rehash the table if the threshold is exceeded
-		if (this.uniqueCount >= this.threshold) {
-			this.rehash();
-			tab = this.table;
-			index = (hash & 0x7FFFFFFF) % tab.length;
-		}
-
-		// create the new entry and put it in the table
-		Entry<E> e = this.buildEntry(hash, o, cnt, tab[index]);
-		tab[index] = e;
-		this.count += cnt;
-		this.uniqueCount++;
-		return true;
-	}
-
-	/**
-	 * This implementation searches for the object in the hash table by
-	 * calculating the object's identity hash code and examining the
-	 * entries in the corresponding hash table bucket.
-	 */
-	@Override
-	public boolean remove(Object o) {
-		Entry<E>[] tab = this.table;
-		int hash = System.identityHashCode(o);
-		int index = (hash & 0x7FFFFFFF) % tab.length;
-		for (Entry<E> e = tab[index], prev = null; e != null; prev = e, e = e.next) {
-			if ((e.hash == hash) && (e.object == o)) {
-				this.modCount++;
-				e.count--;
-				// if we are removing the last one, remove the entry from the table
-				if (e.count == 0) {
-					if (prev == null) {
-						tab[index] = e.next;
-					} else {
-						prev.next = e.next;
-					}
-					this.uniqueCount--;
-				}
-				this.count--;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * This implementation searches for the object in the hash table by
-	 * calculating the object's identity hash code and examining the
-	 * entries in the corresponding hash table bucket.
-	 */
-	public boolean remove(Object o, int cnt) {
-		if (cnt <= 0) {
-			return false;
-		}
-		Entry<E>[] tab = this.table;
-		int hash = System.identityHashCode(o);
-		int index = (hash & 0x7FFFFFFF) % tab.length;
-		for (Entry<E> e = tab[index], prev = null; e != null; prev = e, e = e.next) {
-			if ((e.hash == hash) && (e.object == o)) {
-				this.modCount++;
-				int cnt2 = (cnt < e.count) ? cnt : e.count;
-				e.count -= cnt2;
-				// if we are removing the last element(s), remove the entry from the table
-				if (e.count == 0) {
-					if (prev == null) {
-						tab[index] = e.next;
-					} else {
-						prev.next = e.next;
-					}
-					this.uniqueCount--;
-				}
-				this.count -= cnt2;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * This implementation uses object-identity to determine whether
-	 * specified collection contains a particular element.
-	 */
-	@Override
-	public boolean removeAll(Collection<?> c) {
-		return super.removeAll(this.buildIdentityHashBag(c));
-	}
-
-	/**
-	 * This implementation uses object-identity to determine whether
-	 * specified collection contains a particular element.
-	 */
-	@Override
-	public boolean retainAll(Collection<?> c) {
-		return super.retainAll(this.buildIdentityHashBag(c));
-	}
-
-	@SuppressWarnings("unchecked")
-	private Collection<?> buildIdentityHashBag(Collection<?> c) {
-		return new IdentityHashBag(c);
-	}
-
-	/**
-	 * This implementation simply clears out all of the hash table buckets.
-	 */
-	@Override
-	public void clear() {
-		Entry<E>[] tab = this.table;
-		this.modCount++;
-		for (int i = tab.length; --i >= 0; ) {
-			tab[i] = null;
-		}
-		this.count = 0;
-		this.uniqueCount = 0;
-	}
-
-	/**
-	 * Returns a shallow copy of this bag: the elements
-	 * themselves are not cloned.
-	 *
-	 * @return a shallow copy of this bag.
-	 */
-	@Override
-	public IdentityHashBag<E> clone() {
-		try {
-			@SuppressWarnings("unchecked")
-			IdentityHashBag<E> clone = (IdentityHashBag<E>) super.clone();
-			clone.table = this.buildTable(this.table.length);
-			for (int i = this.table.length; i-- > 0; ) {
-				clone.table[i] = (this.table[i] == null) 
-						? null : (Entry<E>) this.table[i].clone();
-			}
-			clone.modCount = 0;
-			return clone;
-		} catch (CloneNotSupportedException e) {
-			throw new InternalError();
-		}
-	}
-
-
-	/**
-	 * Hash table collision list entry.
-	 */
-	private static class Entry<E> implements Bag.Entry<E> {
-		int hash;
-		E object;
-		int count;
-		Entry<E> next;
-
-		Entry(int hash, E object, Entry<E> next) {
-			this(hash, object, 1, next);
-		}
-
-		Entry(int hash, E object, int count, Entry<E> next) {
-			this.hash = hash;
-			this.object = object;
-			this.count = count;
-			this.next = next;
-		}
-
-		/**
-		 * Cascade the clone to all the entries in the same bucket.
-		 */
-		@Override
-		@SuppressWarnings("unchecked")
-		protected Entry<E> clone() {
-			return new Entry(this.hash, this.object, this.count,
-					(this.next == null ? null : this.next.clone()));
-		}
-
-
-		// ***** Bag.Entry implementation
-		public E getElement() {
-			return this.object;
-		}
-
-		public int getCount() {
-			return this.count;
-		}
-
-		public int setCount(int count) {
-			if (count <= 0) {
-				throw new IllegalArgumentException("count must be greater than zero: " + count); //$NON-NLS-1$
-			}
-			int old = this.count;
-			this.count = count;
-			return old;
-		}
-
-		@Override
-		public boolean equals(Object o) {
-			if ( ! (o instanceof Bag.Entry)) {
-				return false;
-			}
-			@SuppressWarnings("unchecked")
-			Bag.Entry e = (Bag.Entry) o;
-			return (this.object == e.getElement())
-					&& (this.count == e.getCount());
-		}
-
-		@Override
-		public int hashCode() {
-			E o = this.object;
-			return (o == null) ? 0 : (this.count * o.hashCode());
-		}
-
-		@Override
-		public String toString() {
-			return this.object + "=>" + this.count; //$NON-NLS-1$
-		}
-	}
-
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterator<E> iterator() {
-		return (this.count == 0) ? EMPTY_ITERATOR : new HashIterator();
-	}
-
-	/**
-	 * Return an iterator that returns each item in the bag
-	 * once and only once, irrespective of how many times
-	 * the item was added to the bag.
-	 */
-	@SuppressWarnings("unchecked")
-	public Iterator<E> uniqueIterator() {
-		return (this.count == 0) ? EMPTY_ITERATOR : new UniqueIterator();
-	}
-
-	@SuppressWarnings("unchecked")
-	public Iterator<Bag.Entry<E>> entries() {
-		return (this.count == 0) ? EMPTY_ITERATOR : new EntryIterator();
-	}
-
-
-	/**
-	 * Empty iterator that does just about nothing.
-	 */
-	@SuppressWarnings("unchecked")
-	private static final Iterator EMPTY_ITERATOR = new EmptyIterator();
-
-	@SuppressWarnings("unchecked")
-	private static class EmptyIterator implements Iterator {
-
-		EmptyIterator() {
-			super();
-		}
-
-		public boolean hasNext() {
-			return false;
-		}
-
-		public Object next() {
-			throw new NoSuchElementException();
-		}
-
-		public void remove() {
-			throw new IllegalStateException();
-		}
-	}
-
-
-	private class HashIterator implements Iterator<E> {
-		private Entry<E>[] localTable = IdentityHashBag.this.table;
-		private int index = this.localTable.length;	// start at the end of the table
-		private Entry<E> nextEntry = null;
-		private int nextEntryCount = 0;
-		private Entry<E> lastReturnedEntry = null;
-
-		/**
-		 * The modCount value that the iterator believes that the backing
-		 * bag should have. If this expectation is violated, the iterator
-		 * has detected a concurrent modification.
-		 */
-		private int expectedModCount = IdentityHashBag.this.modCount;
-
-		HashIterator() {
-			super();
-		}
-
-		public boolean hasNext() {
-			Entry<E> e = this.nextEntry;
-			int i = this.index;
-			Entry<E>[] tab = this.localTable;
-			// Use locals for faster loop iteration
-			while ((e == null) && (i > 0)) {
-				e = tab[--i];		// move backwards through the table
-			}
-			this.nextEntry = e;
-			this.index = i;
-			return e != null;
-		}
-
-		public E next() {
-			if (IdentityHashBag.this.modCount != this.expectedModCount) {
-				throw new ConcurrentModificationException();
-			}
-			Entry<E> et = this.nextEntry;
-			int i = this.index;
-			Entry<E>[] tab = this.localTable;
-			// Use locals for faster loop iteration
-			while ((et == null) && (i > 0)) {
-				et = tab[--i];		// move backwards through the table
-			}
-			this.nextEntry = et;
-			this.index = i;
-			if (et == null) {
-				throw new NoSuchElementException();
-			}
-			Entry<E> e = this.lastReturnedEntry = this.nextEntry;
-			this.nextEntryCount++;
-			if (this.nextEntryCount == e.count) {
-				this.nextEntry = e.next;
-				this.nextEntryCount = 0;
-			}
-			return e.object;
-		}
-
-		public void remove() {
-			if (this.lastReturnedEntry == null) {
-				throw new IllegalStateException();
-			}
-			if (IdentityHashBag.this.modCount != this.expectedModCount) {
-				throw new ConcurrentModificationException();
-			}
-			Entry<E>[] tab = this.localTable;
-			int slot = (this.lastReturnedEntry.hash & 0x7FFFFFFF) % tab.length;
-			for (Entry<E> e = tab[slot], prev = null; e != null; prev = e, e = e.next) {
-				if (e == this.lastReturnedEntry) {
-					IdentityHashBag.this.modCount++;
-					this.expectedModCount++;
-					e.count--;
-					if (e.count == 0) {
-						// if we are removing the last one, remove the entry from the table
-						if (prev == null) {
-							tab[slot] = e.next;
-						} else {
-							prev.next = e.next;
-						}
-						IdentityHashBag.this.uniqueCount--;
-					} else {
-						// slide back the count to account for the just-removed element
-						this.nextEntryCount--;
-					}
-					IdentityHashBag.this.count--;
-					this.lastReturnedEntry = null;	// it cannot be removed again
-					return;
-				}
-			}
-			throw new ConcurrentModificationException();
-		}
-	}
-
-
-	private class EntryIterator implements Iterator<Entry<E>> {
-		private Entry<E>[] localTable = IdentityHashBag.this.table;
-		private int index = this.localTable.length;	// start at the end of the table
-		private Entry<E> nextEntry = null;
-		private Entry<E> lastReturnedEntry = null;
-
-		/**
-		 * The modCount value that the iterator believes that the backing
-		 * bag should have. If this expectation is violated, the iterator
-		 * has detected a concurrent modification.
-		 */
-		private int expectedModCount = IdentityHashBag.this.modCount;
-
-		EntryIterator() {
-			super();
-		}
-
-		public boolean hasNext() {
-			Entry<E> e = this.nextEntry;
-			int i = this.index;
-			Entry<E>[] tab = this.localTable;
-			// Use locals for faster loop iteration
-			while ((e == null) && (i > 0)) {
-				e = tab[--i];		// move backwards through the table
-			}
-			this.nextEntry = e;
-			this.index = i;
-			return e != null;
-		}
-
-		public Entry<E> next() {
-			if (IdentityHashBag.this.modCount != this.expectedModCount) {
-				throw new ConcurrentModificationException();
-			}
-			Entry<E> et = this.nextEntry;
-			int i = this.index;
-			Entry<E>[] tab = this.localTable;
-			// Use locals for faster loop iteration
-			while ((et == null) && (i > 0)) {
-				et = tab[--i];		// move backwards through the table
-			}
-			this.nextEntry = et;
-			this.index = i;
-			if (et == null) {
-				throw new NoSuchElementException();
-			}
-			Entry<E> e = this.lastReturnedEntry = this.nextEntry;
-			this.nextEntry = e.next;
-			return e;
-		}
-
-		public void remove() {
-			if (this.lastReturnedEntry == null) {
-				throw new IllegalStateException();
-			}
-			if (IdentityHashBag.this.modCount != this.expectedModCount) {
-				throw new ConcurrentModificationException();
-			}
-			Entry<E>[] tab = this.localTable;
-			int slot = (this.lastReturnedEntry.hash & 0x7FFFFFFF) % tab.length;
-			for (Entry<E> e = tab[slot], prev = null; e != null; prev = e, e = e.next) {
-				if (e == this.lastReturnedEntry) {
-					IdentityHashBag.this.modCount++;
-					this.expectedModCount++;
-					// remove the entry from the table
-					if (prev == null) {
-						tab[slot] = e.next;
-					} else {
-						prev.next = e.next;
-					}
-					IdentityHashBag.this.uniqueCount--;
-					IdentityHashBag.this.count -= this.lastReturnedEntry.count;
-					this.lastReturnedEntry = null;	// it cannot be removed again
-					return;
-				}
-			}
-			throw new ConcurrentModificationException();
-		}
-
-	}
-
-
-	private class UniqueIterator implements Iterator<E> {
-		private EntryIterator entryIterator = new EntryIterator();
-		
-		UniqueIterator() {
-			super();
-		}
-
-		public boolean hasNext() {
-			return this.entryIterator.hasNext();
-		}
-
-		public E next() {
-			return this.entryIterator.next().object;
-		}
-
-		public void remove() {
-			this.entryIterator.remove();
-		}
-
-	}
-
-
-	@Override
-	public boolean equals(Object o) {
-		if (o == this) {
-			return true;
-		} else if (o instanceof IdentityHashBag) {
-			@SuppressWarnings("unchecked")
-			IdentityHashBag<E> b = (IdentityHashBag<E>) o;
-			if (b.size() != this.size()) {
-				return false;
-			}
-			IdentityHashBag<E> clone = this.clone();
-			for (E e : b) {
-				if ( ! clone.remove(e)) {
-					return false;
-				}
-			}
-			return clone.isEmpty();
-		} else if (o instanceof Bag) {
-			// hmmm...
-			return this.buildBag().equals(o);
-		} else {
-			return false;
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	private Bag<E> buildBag() {
-		return new HashBag(this);
-	}
-
-	@Override
-	public int hashCode() {
-		int h = 0;
-		for (E e : this) {
-			h += System.identityHashCode(e);
-		}
-		return h;
-	}
-
-	/**
-	 * Save the state of this bag to a stream (i.e. serialize it).
-	 *
-	 * @serialData Emit the capacity of the bag (int),
-	 *     followed by the number of unique elements in the bag (int),
-	 *     followed by all of the bag's elements (each an Object) and
-	 *     their counts (each an int), in no particular order.
-	 */
-	private synchronized void writeObject(java.io.ObjectOutputStream s)
-				throws java.io.IOException {
-		// write out the threshold, load factor, and any hidden stuff
-		s.defaultWriteObject();
-
-		// write out number of buckets
-		s.writeInt(this.table.length);
-
-		// write out number of unique elements
-		s.writeInt(this.uniqueCount);
-
-		Entry<E>[] tab = this.table;
-		// write out elements and counts (alternating)
-		for (Entry<E> entry : tab) {
-			while (entry != null) {
-				s.writeObject(entry.object);
-				s.writeInt(entry.count);
-				entry = entry.next;
-			}
-		}
-	}
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Reconstitute the bag from a stream (i.e. deserialize it).
-	 */
-	private synchronized void readObject(java.io.ObjectInputStream s)
-				throws java.io.IOException, ClassNotFoundException {
-		// read in the threshold, loadfactor, and any hidden stuff
-		s.defaultReadObject();
-
-		// read in number of buckets and allocate the bucket array
-		this.table = this.buildTable(s.readInt());
-
-		// read in number of unique elements
-		int unique = s.readInt();
-
-		// read the elements and counts, and put the elements in the bag
-		for (int i = 0; i < unique; i++) {
-			@SuppressWarnings("unchecked")
-			E element = (E) s.readObject();
-			int elementCount = s.readInt();
-			for (int j = 0; j < elementCount; j++) {
-				this.add(element);
-			}
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/IndentingPrintWriter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/IndentingPrintWriter.java
deleted file mode 100644
index 53e61be06f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/IndentingPrintWriter.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.utility.internal;
-
-import java.io.PrintWriter;
-import java.io.Writer;
-
-/**
- * Extend PrintWriter to automatically indent new lines.
- */
-public class IndentingPrintWriter extends PrintWriter {
-
-	private final String indent;
-	private int indentLevel;
-	private boolean needsIndent;
-
-	public static String DEFAULT_INDENT = "\t"; //$NON-NLS-1$
-
-
-	/**
-	 * Construct a writer that indents with tabs.
-	 */
-	public IndentingPrintWriter(Writer out) {
-		this(out, DEFAULT_INDENT);
-	}
-	
-	/**
-	 * Construct a writer that indents with the specified string.
-	 */
-	public IndentingPrintWriter(Writer out, String indent) {
-		super(out);
-		this.indent = indent;
-		this.indentLevel = 0;
-		this.needsIndent = true;
-	}
-	
-	/**
-	 * Set flag so following line is indented.
-	 */
-	@Override
-	public void println() {
-		synchronized (this.lock) {
-			super.println();
-			this.needsIndent = true;
-		}
-	}
-	
-	/**
-	 * Print the appropriate indent.
-	 */
-	private void printIndent() {
-		if (this.needsIndent) {
-			this.needsIndent = false;
-			for (int i = this.indentLevel; i-- > 0; ) {
-				this.print(this.indent);
-			}
-		}
-	}
-	
-	/**
-	 * Write a portion of an array of characters.
-	 */
-	@Override
-	public void write(char buf[], int off, int len) {
-		synchronized (this.lock) {
-			this.printIndent();
-			super.write(buf, off, len);
-		}
-	}
-	
-	/**
-	 * Write a single character.
-	 */
-	@Override
-	public void write(int c) {
-		synchronized (this.lock) {
-			this.printIndent();
-			super.write(c);
-		}
-	}
-	
-	/**
-	 * Write a portion of a string.
-	 */
-	@Override
-	public void write(String s, int off, int len) {
-		synchronized (this.lock) {
-			this.printIndent();
-			super.write(s, off, len);
-		}
-	}
-	
-	/**
-	 * Bump the indent level.
-	 */
-	public void indent() {
-		this.incrementIndentLevel();
-	}
-	
-	/**
-	 * Decrement the indent level.
-	 */
-	public void undent() {
-		this.decrementIndentLevel();
-	}
-	
-	/**
-	 * Bump the indent level.
-	 */
-	public void incrementIndentLevel() {
-		synchronized (this.lock) {
-			this.indentLevel++;
-		}
-	}
-	
-	/**
-	 * Decrement the indent level.
-	 */
-	public void decrementIndentLevel() {
-		synchronized (this.lock) {
-			this.indentLevel--;
-		}
-	}
-	
-	/**
-	 * Return the current indent level.
-	 */
-	public int indentLevel() {
-		return this.indentLevel;
-	}
-	
-	/**
-	 * Allow the indent level to be set directly.
-	 */
-	public void setIndentLevel(int indentLevel) {
-		synchronized (this.lock) {
-			this.indentLevel = indentLevel;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/JDBCTools.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/JDBCTools.java
deleted file mode 100644
index d3899eeae4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/JDBCTools.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.utility.internal;
-
-import java.sql.Types;
-import java.util.HashMap;
-import org.eclipse.jpt.utility.JavaType;
-
-/**
- * Helper methods for dealing with the JDBC API.
- */
-public final class JDBCTools {
-
-
-	/**
-	 * Return the JDBC type corresponding to the specified class.
-	 * @see java.sql.Types
-	 */
-	public static JDBCType jdbcTypeForClassNamed(String className) {
-		JavaToJDBCTypeMapping mapping = javaToJDBCTypeMapping(className);
-		return (mapping == null) ? DEFAULT_JDBC_TYPE : mapping.getJDBCType();
-	}
-
-	/**
-	 * Return the JDBC type corresponding to the specified class.
-	 * @see java.sql.Types
-	 */
-	public static JDBCType jdbcTypeFor(Class<?> javaClass) {
-		return jdbcTypeForClassNamed(javaClass.getName());
-	}
-
-	/**
-	 * Return the JDBC type corresponding to the specified class.
-	 * @see java.sql.Types
-	 */
-	public static JDBCType jdbcTypeFor(JavaType javaType) {
-		return jdbcTypeForClassNamed(javaType.getJavaClassName());
-	}
-
-	/**
-	 * Return the Java type corresponding to the specified JDBC type.
-	 * @see java.sql.Types
-	 */
-	public static JavaType javaTypeForJDBCTypeNamed(String jdbcTypeName) {
-		JDBCToJavaTypeMapping mapping = jdbcToJavaTypeMapping(jdbcTypeName);
-		return (mapping == null) ? DEFAULT_JAVA_TYPE : mapping.getJavaType();
-	}
-
-	/**
-	 * Return the Java type corresponding to the specified JDBC type.
-	 * @see java.sql.Types
-	 */
-	public static JavaType javaTypeFor(JDBCType jdbcType) {
-		return javaTypeForJDBCTypeNamed(jdbcType.name());
-	}
-
-	/**
-	 * Return the Java type corresponding to the specified JDBC type.
-	 * @see java.sql.Types
-	 */
-	public static JavaType javaTypeForJDBCTypeCode(int jdbcTypeCode) {
-		return javaTypeFor(JDBCType.type(jdbcTypeCode));
-	}
-
-
-	// ********** internal stuff **********
-
-
-	// ********** JDBC => Java **********
-
-	/**
-	 * JDBC => Java type mappings, keyed by JDBC type name (e.g. "VARCHAR")
-	 */
-	private static HashMap<String, JDBCToJavaTypeMapping> JDBC_TO_JAVA_TYPE_MAPPINGS;  // pseudo 'final' - lazy-initialized
-	private static final JavaType DEFAULT_JAVA_TYPE = new SimpleJavaType(java.lang.Object.class);  // TODO Object is the default?
-
-
-	private static JDBCToJavaTypeMapping jdbcToJavaTypeMapping(String jdbcTypeName) {
-		return jdbcToJavaTypeMappings().get(jdbcTypeName);
-	}
-
-	private static synchronized HashMap<String, JDBCToJavaTypeMapping> jdbcToJavaTypeMappings() {
-		if (JDBC_TO_JAVA_TYPE_MAPPINGS == null) {
-			JDBC_TO_JAVA_TYPE_MAPPINGS = buildJDBCToJavaTypeMappings();
-		}
-		return JDBC_TO_JAVA_TYPE_MAPPINGS;
-	}
-
-	private static HashMap<String, JDBCToJavaTypeMapping> buildJDBCToJavaTypeMappings() {
-		HashMap<String, JDBCToJavaTypeMapping> mappings = new HashMap<String, JDBCToJavaTypeMapping>();
-		addJDBCToJavaTypeMappingsTo(mappings);
-		return mappings;
-	}
-
-	/**
-	 * hard code the default mappings from the JDBC types to the
-	 * appropriate Java types
-	 * @see java.sql.Types
-	 * see "JDBC 3.0 Specification" Appendix B
-	 */
-	private static void addJDBCToJavaTypeMappingsTo(HashMap<String, JDBCToJavaTypeMapping> mappings) {
-		addJDBCToJavaTypeMappingTo(Types.ARRAY, java.sql.Array.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.BIGINT, long.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.BINARY, byte[].class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.BIT, boolean.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.BLOB, java.sql.Blob.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.BOOLEAN, boolean.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.CHAR, java.lang.String.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.CLOB, java.sql.Clob.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.DATALINK, java.net.URL.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.DATE, java.sql.Date.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.DECIMAL, java.math.BigDecimal.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.DISTINCT, java.lang.Object.class, mappings);  // ???
-		addJDBCToJavaTypeMappingTo(Types.DOUBLE, double.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.FLOAT, double.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.INTEGER, int.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.JAVA_OBJECT, java.lang.Object.class, mappings);  // ???
-		addJDBCToJavaTypeMappingTo(Types.LONGVARBINARY, byte[].class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.LONGVARCHAR, java.lang.String.class, mappings);
-		// not sure why this is defined in java.sql.Types
-//		addJDBCToJavaTypeMappingTo(Types.NULL, java.lang.Object.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.NUMERIC, java.math.BigDecimal.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.OTHER, java.lang.Object.class, mappings);	// ???
-		addJDBCToJavaTypeMappingTo(Types.REAL, float.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.REF, java.sql.Ref.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.SMALLINT, short.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.STRUCT, java.sql.Struct.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.TIME, java.sql.Time.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.TIMESTAMP, java.sql.Timestamp.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.TINYINT, byte.class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.VARBINARY, byte[].class, mappings);
-		addJDBCToJavaTypeMappingTo(Types.VARCHAR, java.lang.String.class, mappings);
-	}
-
-	private static void addJDBCToJavaTypeMappingTo(int jdbcTypeCode, Class<?> javaClass, HashMap<String, JDBCToJavaTypeMapping> mappings) {
-		// check for duplicates
-		JDBCType jdbcType = JDBCType.type(jdbcTypeCode);
-		Object prev = mappings.put(jdbcType.name(), buildJDBCToJavaTypeMapping(jdbcType, javaClass));
-		if (prev != null) {
-			throw new IllegalArgumentException("duplicate JDBC type: " + jdbcType.name()); //$NON-NLS-1$
-		}
-	}
-
-	private static JDBCToJavaTypeMapping buildJDBCToJavaTypeMapping(JDBCType jdbcType, Class<?> javaClass) {
-		return new JDBCToJavaTypeMapping(jdbcType, new SimpleJavaType(javaClass));
-	}
-
-
-	// ********** Java => JDBC **********
-
-	/**
-	 * Java => JDBC type mappings, keyed by Java class name (e.g. "java.lang.Object")
-	 */
-	private static HashMap<String, JavaToJDBCTypeMapping> JAVA_TO_JDBC_TYPE_MAPPINGS;  // pseudo 'final' - lazy-initialized
-	private static final JDBCType DEFAULT_JDBC_TYPE = JDBCType.type(Types.VARCHAR);  // TODO VARCHAR is the default?
-
-
-	private static JavaToJDBCTypeMapping javaToJDBCTypeMapping(String className) {
-		return javaToJDBCTypeMappings().get(className);
-	}
-
-	private static synchronized HashMap<String, JavaToJDBCTypeMapping> javaToJDBCTypeMappings() {
-		if (JAVA_TO_JDBC_TYPE_MAPPINGS == null) {
-			JAVA_TO_JDBC_TYPE_MAPPINGS = buildJavaToJDBCTypeMappings();
-		}
-		return JAVA_TO_JDBC_TYPE_MAPPINGS;
-	}
-
-	private static HashMap<String, JavaToJDBCTypeMapping> buildJavaToJDBCTypeMappings() {
-		HashMap<String, JavaToJDBCTypeMapping> mappings = new HashMap<String, JavaToJDBCTypeMapping>();
-		addJavaToJDBCTypeMappingsTo(mappings);
-		return mappings;
-	}
-
-	/**
-	 * hard code the default mappings from the Java types to the
-	 * appropriate JDBC types
-	 * @see java.sql.Types
-	 * see "JDBC 3.0 Specification" Appendix B
-	 */
-	private static void addJavaToJDBCTypeMappingsTo(HashMap<String, JavaToJDBCTypeMapping> mappings) {
-		// primitives
-		addJavaToJDBCTypeMappingTo(boolean.class, Types.BIT, mappings);
-		addJavaToJDBCTypeMappingTo(byte.class, Types.TINYINT, mappings);
-		addJavaToJDBCTypeMappingTo(double.class, Types.DOUBLE, mappings);
-		addJavaToJDBCTypeMappingTo(float.class, Types.REAL, mappings);
-		addJavaToJDBCTypeMappingTo(int.class, Types.INTEGER, mappings);
-		addJavaToJDBCTypeMappingTo(long.class, Types.BIGINT, mappings);
-		addJavaToJDBCTypeMappingTo(short.class, Types.SMALLINT, mappings);
-
-		// reference classes
-		addJavaToJDBCTypeMappingTo(java.lang.Boolean.class, Types.BIT, mappings);
-		addJavaToJDBCTypeMappingTo(java.lang.Byte.class, Types.TINYINT, mappings);
-		addJavaToJDBCTypeMappingTo(java.lang.Double.class, Types.DOUBLE, mappings);
-		addJavaToJDBCTypeMappingTo(java.lang.Float.class, Types.REAL, mappings);
-		addJavaToJDBCTypeMappingTo(java.lang.Integer.class, Types.INTEGER, mappings);
-		addJavaToJDBCTypeMappingTo(java.lang.Long.class, Types.BIGINT, mappings);
-		addJavaToJDBCTypeMappingTo(java.lang.Short.class, Types.SMALLINT, mappings);
-		addJavaToJDBCTypeMappingTo(java.lang.String.class, Types.VARCHAR, mappings);
-		addJavaToJDBCTypeMappingTo(java.math.BigDecimal.class, Types.NUMERIC, mappings);
-		addJavaToJDBCTypeMappingTo(java.net.URL.class, Types.DATALINK, mappings);
-		addJavaToJDBCTypeMappingTo(java.sql.Array.class, Types.ARRAY, mappings);
-		addJavaToJDBCTypeMappingTo(java.sql.Blob.class, Types.BLOB, mappings);
-		addJavaToJDBCTypeMappingTo(java.sql.Clob.class, Types.CLOB, mappings);
-		addJavaToJDBCTypeMappingTo(java.sql.Date.class, Types.DATE, mappings);
-		addJavaToJDBCTypeMappingTo(java.sql.Ref.class, Types.REF, mappings);
-		addJavaToJDBCTypeMappingTo(java.sql.Struct.class, Types.STRUCT, mappings);
-		addJavaToJDBCTypeMappingTo(java.sql.Time.class, Types.TIME, mappings);
-		addJavaToJDBCTypeMappingTo(java.sql.Timestamp.class, Types.TIMESTAMP, mappings);
-
-		// arrays
-		addJavaToJDBCTypeMappingTo(byte[].class, Types.VARBINARY, mappings);
-		addJavaToJDBCTypeMappingTo(java.lang.Byte[].class, Types.VARBINARY, mappings);
-	}
-
-	private static void addJavaToJDBCTypeMappingTo(Class<?> javaClass, int jdbcTypeCode, HashMap<String, JavaToJDBCTypeMapping> mappings) {
-		// check for duplicates
-		Object prev = mappings.put(javaClass.getName(), buildJavaToJDBCTypeMapping(javaClass, jdbcTypeCode));
-		if (prev != null) {
-			throw new IllegalArgumentException("duplicate Java class: " + ((JavaToJDBCTypeMapping) prev).getJavaType().declaration()); //$NON-NLS-1$
-		}
-	}
-
-	private static JavaToJDBCTypeMapping buildJavaToJDBCTypeMapping(Class<?> javaClass, int jdbcTypeCode) {
-		return new JavaToJDBCTypeMapping(new SimpleJavaType(javaClass), JDBCType.type(jdbcTypeCode));
-	}
-
-
-	// ********** constructor **********
-
-	/**
-	 * Suppress default constructor, ensuring non-instantiability.
-	 */
-	private JDBCTools() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-
-
-	// ********** member classes **********
-
-	/**
-	 * JDBC => Java
-	 */
-	private static class JDBCToJavaTypeMapping {
-		private final JDBCType jdbcType;
-		private final JavaType javaType;
-
-		JDBCToJavaTypeMapping(JDBCType jdbcType, JavaType javaType) {
-			super();
-			this.jdbcType = jdbcType;
-			this.javaType = javaType;
-		}
-
-		public JDBCType getJDBCType() {
-			return this.jdbcType;
-		}
-
-		public JavaType getJavaType() {
-			return this.javaType;
-		}
-
-		public boolean maps(int jdbcTypeCode) {
-			return this.jdbcType.code() == jdbcTypeCode;
-		}
-
-		public boolean maps(String jdbcTypeName) {
-			return this.jdbcType.name().equals(jdbcTypeName);
-		}
-
-		public boolean maps(JDBCType type) {
-			return this.jdbcType == type;
-		}
-
-		@Override
-		public String toString() {
-			StringBuilder sb = new StringBuilder();
-			this.appendTo(sb);
-			return sb.toString();
-		}
-
-		public void appendTo(StringBuilder sb) {
-			this.jdbcType.appendTo(sb);
-			sb.append(" => "); //$NON-NLS-1$
-			this.javaType.appendDeclarationTo(sb);
-		}
-
-	}
-
-	/**
-	 * Java => JDBC
-	 */
-	private static class JavaToJDBCTypeMapping {
-		private final JavaType javaType;
-		private final JDBCType jdbcType;
-
-		JavaToJDBCTypeMapping(JavaType javaType, JDBCType jdbcType) {
-			super();
-			this.javaType = javaType;
-			this.jdbcType = jdbcType;
-		}
-
-		public JavaType getJavaType() {
-			return this.javaType;
-		}
-
-		public JDBCType getJDBCType() {
-			return this.jdbcType;
-		}
-
-		public boolean maps(JavaType jt) {
-			return this.javaType.equals(jt);
-		}
-
-		public boolean maps(String elementTypeName, int arrayDepth) {
-			return this.javaType.equals(elementTypeName, arrayDepth);
-		}
-
-		public boolean maps(String javaClassName) {
-			return this.javaType.describes(javaClassName);
-		}
-
-		public boolean maps(Class<?> javaClass) {
-			return this.javaType.describes(javaClass);
-		}
-
-		@Override
-		public String toString() {
-			StringBuilder sb = new StringBuilder();
-			this.appendTo(sb);
-			return sb.toString();
-		}
-
-		public void appendTo(StringBuilder sb) {
-			this.javaType.appendDeclarationTo(sb);
-			sb.append(" => "); //$NON-NLS-1$
-			this.jdbcType.appendTo(sb);
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/JDBCType.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/JDBCType.java
deleted file mode 100644
index 96352838fb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/JDBCType.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.utility.internal;
-
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.sql.Types;
-import java.text.Collator;
-
-/**
- * Associate the Java constant and the JDBC type name.
- * These are derived from java.sql.Types.
- * 
- * @see java.sql.Types
- */
-public final class JDBCType
-	implements Comparable<JDBCType>, Cloneable, Serializable
-{
-
-	/**
-	 * the constant name (e.g. VARCHAR)
-	 */
-	private final String name;
-
-	/**
-	 * the JDBC code used by JDBC drivers
-	 */
-	private final int code;
-
-	private static final long serialVersionUID = 1L;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a JDBC type with the specified name and type code.
-	 * This is private because all the possible JDBC types are built and
-	 * stored in the static array TYPES.
-	 * @see #types()
-	 */
-	private JDBCType(String name, int code) {
-		super();
-		this.name = name;
-		this.code = code;
-	}
-
-
-	// ********** accessors **********
-
-	/**
-	 * Return the name of the type, as defined in java.sql.Types.
-	 */
-	public String name() {
-		return this.name;
-	}
-
-
-	/**
-	 * Return the type code, as defined in java.sql.Types.
-	 */
-	public int code() {
-		return this.code;
-	}
-
-
-	// ********** printing and displaying **********
-
-	public void appendTo(StringBuilder sb) {
-		sb.append(this.name);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append(ClassTools.shortClassNameForObject(this));
-		sb.append('(');
-		this.appendTo(sb);
-		sb.append(')');
-		return sb.toString();
-	}
-
-	@Override
-	public JDBCType clone() {
-		try {
-			return (JDBCType) super.clone();
-		} catch (CloneNotSupportedException ex) {
-			throw new InternalError();
-		}
-	}
-
-	public int compareTo(JDBCType type) {
-		return Collator.getInstance().compare(this.name, type.name);
-	}
-
-
-	// ********** static stuff **********
-
-	/**
-	 * all the JDBC type defined in java.sql.Types
-	 */
-	private static JDBCType[] TYPES;		// pseudo 'final' - lazy-initialized
-
-
-	public synchronized static JDBCType[] types() {
-		if (TYPES == null) {
-			TYPES = buildTypes();
-		}
-		return TYPES;
-	}
-
-	/**
-	 * Return the JDBC type for the specified type code (e.g. Types.VARCHAR).
-	 * @see java.sql.Types
-	 */
-	public static JDBCType type(int code) {
-		JDBCType[] types = types();
-		for (int i = types.length; i-- > 0; ) {
-			if (types[i].code() == code) {
-				return types[i];
-			}
-		}
-		throw new IllegalArgumentException("invalid JDBC type code: " + code); //$NON-NLS-1$
-	}
-
-	/**
-	 * Return the JDBC type for the specified type name (e.g. "VARCHAR").
-	 * @see java.sql.Types
-	 */
-	public static JDBCType type(String name) {
-		JDBCType[] types = types();
-		for (int i = types.length; i-- > 0; ) {
-			if (types[i].name().equals(name)) {
-				return types[i];
-			}
-		}
-		throw new IllegalArgumentException("invalid JDBC type name: " + name); //$NON-NLS-1$
-	}
-
-	/**
-	 * build up the JDBC types via reflection
-	 * @see java.sql.Types
-	 */
-	private static JDBCType[] buildTypes() {
-		Field[] fields = Types.class.getDeclaredFields();
-		int len = fields.length;
-		JDBCType[] types = new JDBCType[len];
-		for (int i = len; i-- > 0; ) {
-			String name = fields[i].getName();
-			int code;
-			try {
-				code = ((Integer) fields[i].get(null)).intValue();
-			} catch (IllegalAccessException ex) {
-				throw new RuntimeException(ex);	// shouldn't happen...
-			}
-			types[i] = new JDBCType(name, code);
-		}
-		return types;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/ListenerList.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/ListenerList.java
deleted file mode 100644
index a7749bd731..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/ListenerList.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.lang.reflect.Array;
-import java.util.Arrays;
-import java.util.EventListener;
-
-/**
- * Maintain a thread-safe list of listeners that does not allow duplicates.
- */
-public class ListenerList<L extends EventListener>
-	implements Serializable
-{
-	private transient volatile L[] listeners;
-
-	private static final long serialVersionUID = 1L;
-
-
-	public ListenerList(Class<L> listenerClass) {
-		super();
-		this.listeners = this.buildEmptyArray(listenerClass);
-	}
-
-	@SuppressWarnings("unchecked")
-	private L[] buildEmptyArray(Class<L> listenerClass) {
-		return (L[]) Array.newInstance(listenerClass, 0);
-	}
-
-	public L[] getListeners() {
-		return this.listeners;
-	}
-
-	public int size() {
-		return this.listeners.length;
-	}
-
-	public boolean isEmpty() {
-		return this.listeners.length == 0;
-	}
-
-	public synchronized void add(L listener) {
-		if (listener == null) {
-			throw new NullPointerException();
-		}
-		if (CollectionTools.contains(this.listeners, listener)) {
-			return;//throw new IllegalArgumentException("duplicate listener: " + listener); //$NON-NLS-1$
-		}
-		this.listeners = CollectionTools.add(this.listeners, listener);
-	}
-
-	public synchronized void remove(L listener) {
-		if (listener == null) {
-			throw new NullPointerException();
-		}
-		int index = CollectionTools.indexOf(this.listeners, listener);
-		if (index == -1) {
-			return;//throw new IllegalArgumentException("unregistered listener: " + listener); //$NON-NLS-1$
-		}
-		this.listeners = CollectionTools.removeElementAtIndex(this.listeners, index);
-	}
-
-	public synchronized void clear() {
-		this.listeners = CollectionTools.clear(this.listeners);
-	}
-
-	@Override
-	public String toString() {
-		return Arrays.toString(this.listeners);
-	}
-
-
-	// ********** serialization **********
-
-	private synchronized void writeObject(ObjectOutputStream s) throws IOException {
-		// write out any hidden stuff
-		s.defaultWriteObject();
-
-		@SuppressWarnings("unchecked")
-		Class<L> listenerClass = (Class<L>) this.listeners.getClass().getComponentType();
-		s.writeObject(listenerClass);
-
-		// only write out serializable listeners
-		for (L listener : this.listeners) {
-			if (listener instanceof Serializable) {
-				s.writeObject(listener);
-			}
-		}
-
-		s.writeObject(null);
-    }
-
-	@SuppressWarnings("unchecked")
-	private synchronized void readObject(ObjectInputStream s) throws ClassNotFoundException, IOException {
-		// read in any hidden stuff
-		s.defaultReadObject();
-
-		Class<L> listenerClass = (Class<L>) s.readObject();
-		this.listeners = this.buildEmptyArray(listenerClass);
-		Object o;
-		while ((o = s.readObject()) != null) {
-			this.add((L) o);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/NameTools.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/NameTools.java
deleted file mode 100644
index e024549592..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/NameTools.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.utility.internal;
-
-import java.beans.Introspector;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.SortedSet;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-
-/**
- * Various helper methods for generating names.
- */
-public final class NameTools {
-
-	/**
-	 * Given a "root" name and a set of existing names, generate a unique
-	 * name that is either the "root" name or some variation on the "root"
-	 * name (e.g. "root2", "root3",...). The names are case-sensitive
-	 * (i.e. "Root" and "root" are both allowed).
-	 */
-	public static String uniqueNameFor(String rootName, Iterator<String> existingNames) {
-		return uniqueNameFor(rootName, CollectionTools.set(existingNames));
-	}
-	
-	/**
-	 * Given a "root" name and a set of existing names, generate a unique
-	 * name that is either the "root" name or some variation on the "root"
-	 * name (e.g. "root2", "root3",...). The names are case-sensitive
-	 * (i.e. "Root" and "root" are both allowed).
-	 */
-	public static String uniqueNameFor(String rootName, Collection<String> existingNames) {
-		return uniqueNameFor(rootName, existingNames, rootName);
-	}
-
-	/**
-	 * Given a "root" name and a set of existing names, generate a unique
-	 * name that is either the "root" name or some variation on the "root"
-	 * name (e.g. "root2", "root3",...). The names are NOT case-sensitive
-	 * (i.e. "Root" and "root" are NOT both allowed).
-	 */
-	public static String uniqueNameForIgnoreCase(String rootName, Iterator<String> existingNames) {
-		return uniqueNameForIgnoreCase(rootName, CollectionTools.set(existingNames));
-	}
-
-	/**
-	 * Given a "root" name and a set of existing names, generate a unique
-	 * name that is either the "root" name or some variation on the "root"
-	 * name (e.g. "root2", "root3",...). The names are NOT case-sensitive
-	 * (i.e. "Root" and "root" are NOT both allowed).
-	 */
-	public static String uniqueNameForIgnoreCase(String rootName, Collection<String> existingNames) {
-		return uniqueNameFor(rootName, convertToLowerCase(existingNames), rootName.toLowerCase());
-	}
-
-	/**
-	 * use the suffixed "template" name to perform the comparisons, but RETURN
-	 * the suffixed "root" name; this allows case-insensitive comparisons
-	 * (i.e. the "template" name has been morphed to the same case as
-	 * the "existing" names, while the "root" name has not, but the "root" name
-	 * is what the client wants morphed to be unique)
-	 */
-	private static String uniqueNameFor(String rootName, Collection<String> existingNames, String templateName) {
-		if ( ! existingNames.contains(templateName)) {
-			return rootName;
-		}
-		String uniqueName = templateName;
-		for (int suffix = 2; true; suffix++) {
-			if ( ! existingNames.contains(uniqueName + suffix)) {
-				return rootName.concat(String.valueOf(suffix));
-			}
-		}
-	}
-
-	/**
-	 * Convert the specified collection of strings to a collection of the same
-	 * strings converted to lower case.
-	 */
-	private static HashSet<String> convertToLowerCase(Collection<String> strings) {
-		HashSet<String> result = new HashSet<String>(strings.size());
-		for (String string : strings) {
-			result.add(string.toLowerCase());
-		}
-		return result;
-	}
-
-	/**
-	 * Build a fully-qualified name for the specified database object.
-	 * Variations:
-	 *     catalog.schema.name
-	 *     catalog..name
-	 *     schema.name
-	 *     name
-	 */
-	public static String buildQualifiedDatabaseObjectName(String catalog, String schema, String name) {
-		if (name == null) {
-			return null;
-		}
-		if ((catalog == null) && (schema == null)) {
-			return name;
-		}
-
-		StringBuilder sb = new StringBuilder(100);
-		if (catalog != null) {
-			sb.append(catalog);
-			sb.append('.');
-		}
-		if (schema != null) {
-			sb.append(schema);
-		}
-		sb.append('.');
-		sb.append(name);
-		return sb.toString();
-	}
-
-	/**
-	 * The set of reserved words in the Java programming language.
-	 * These words cannot be used as identifiers (i.e. names).
-	 * http://java.sun.com/docs/books/tutorial/java/nutsandbolts/_keywords.html
-	 */
-	@SuppressWarnings("nls")
-	public static final String[] JAVA_RESERVED_WORDS = new String[] {
-				"abstract",
-				"assert",  // jdk 1.4
-				"boolean",
-				"break",
-				"byte",
-				"case",
-				"catch",
-				"char",
-				"class",
-				"const",  // unused
-				"continue",
-				"default",
-				"do",
-				"double",
-				"else",
-				"enum",  // jdk 1.5
-				"extends",
-				"false",
-				"final",
-				"finally",
-				"float",
-				"for",
-				"goto",  // unused
-				"if",
-				"implements",
-				"import",
-				"instanceof",
-				"int",
-				"interface",
-				"long",
-				"native",
-				"new",
-				"null",
-				"package",
-				"private",
-				"protected",
-				"public",
-				"return",
-				"short",
-				"static",
-				"strictfp",  // jdk 1.2
-				"super",
-				"switch",
-				"synchronized",
-				"this",
-				"throw",
-				"throws",
-				"transient",
-				"true",
-				"try",
-				"void",
-				"volatile",
-				"while"
-			};
-
-	/**
-	 * The set of reserved words in the Java programming language.
-	 * These words cannot be used as identifiers (i.e. names).
-	 * http://java.sun.com/docs/books/tutorial/java/nutsandbolts/_keywords.html
-	 */
-	public static final SortedSet<String> JAVA_RESERVED_WORDS_SET = 
-		Collections.unmodifiableSortedSet(CollectionTools.sortedSet(JAVA_RESERVED_WORDS));
-
-	/**
-	 * Return the set of Java programming language reserved words.
-	 * These words cannot be used as identifiers (i.e. names).
-	 * http://java.sun.com/docs/books/tutorial/java/nutsandbolts/_keywords.html
-	 */
-	public static Iterator<String> javaReservedWords() {
-		return new ArrayIterator<String>(JAVA_RESERVED_WORDS);
-	}
-
-	/**
-	 * Return whether the specified string consists of Java identifier
-	 * characters (but may be a reserved word).
-	 */
-	public static boolean stringConsistsOfJavaIdentifierCharacters(String string) {
-		if (string.length() == 0) {
-			return false;
-		}
-		return stringConsistsOfJavaIdentifierCharacters_(string.toCharArray());
-	}
-
-	/**
-	 * Return whether the specified string consists of Java identifier
-	 * characters (but may be a reserved word).
-	 */
-	public static boolean stringConsistsOfJavaIdentifierCharacters(char[] string) {
-		if (string.length == 0) {
-			return false;
-		}
-		return stringConsistsOfJavaIdentifierCharacters_(string);
-	}
-
-	/**
-	 * The specified string must not be empty.
-	 */
-	private static boolean stringConsistsOfJavaIdentifierCharacters_(char[] string) {
-		if ( ! Character.isJavaIdentifierStart(string[0])) {
-			return false;
-		}
-		for (int i = string.length; i-- > 1; ) {  // NB: end with 1
-			if ( ! Character.isJavaIdentifierPart(string[i])) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Return whether the specified string is a valid Java identifier.
-	 */
-	public static boolean stringIsLegalJavaIdentifier(String string) {
-		return stringConsistsOfJavaIdentifierCharacters(string)
-				&& ! JAVA_RESERVED_WORDS_SET.contains(string);
-	}
-
-	/**
-	 * Return whether the specified string is a valid Java identifier.
-	 */
-	public static boolean stringIsLegalJavaIdentifier(char[] string) {
-		return stringConsistsOfJavaIdentifierCharacters(string)
-				&& ! JAVA_RESERVED_WORDS_SET.contains(new String(string));
-	}
-
-	/**
-	 * Convert the specified string to a valid Java identifier
-	 * by substituting an underscore '_' for any invalid characters
-	 * in the string and appending an underscore '_' to the string if
-	 * it is a Java reserved word.
-	 */
-	public static String convertToJavaIdentifier(String string) {
-		return convertToJavaIdentifier(string, '_');
-	}
-
-	/**
-	 * Convert the specified string to a valid Java identifier
-	 * by substituting the specified character for any invalid characters
-	 * in the string and, if necessary, appending the specified character
-	 * to the string until it is not a Java reserved word.
-	 */
-	public static String convertToJavaIdentifier(String string, char c) {
-		if (string.length() == 0) {
-			return string;
-		}
-		if (JAVA_RESERVED_WORDS_SET.contains(string)) {
-			// a reserved word is a valid identifier, we just need to tweak it a bit
-			checkCharIsJavaIdentifierPart(c);
-			return convertToJavaIdentifier(string + c, c);
-		}
-		char[] array = string.toCharArray();
-		return convertToJavaIdentifier_(array, c) ? new String(array) : string;
-	}
-
-	/**
-	 * Convert the specified string to a valid Java identifier
-	 * by substituting an underscore '_' for any invalid characters
-	 * in the string and appending an underscore '_' to the string if
-	 * it is a Java reserved word.
-	 */
-	public static char[] convertToJavaIdentifier(char[] string) {
-		return convertToJavaIdentifier(string, '_');
-	}
-
-	/**
-	 * Convert the specified string to a valid Java identifier
-	 * by substituting the specified character for any invalid characters
-	 * in the string and, if necessary, appending the specified character
-	 * to the string until it is not a Java reserved word.
-	 */
-	public static char[] convertToJavaIdentifier(char[] string, char c) {
-		if (string.length == 0) {
-			return string;
-		}
-		if (JAVA_RESERVED_WORDS_SET.contains(new String(string))) {
-			// a reserved word is a valid identifier, we just need to tweak it a bit
-			checkCharIsJavaIdentifierPart(c);
-			return convertToJavaIdentifier(CollectionTools.add(string, c), c);
-		}
-		convertToJavaIdentifier_(string, c);
-		return string;
-	}
-
-	/**
-	 * The specified string must not be empty.
-	 * Return whether the string was modified.
-	 */
-	private static boolean convertToJavaIdentifier_(char[] string, char c) {
-		boolean mod = false;
-		if ( ! Character.isJavaIdentifierStart(string[0])) {
-			checkCharIsJavaIdentifierStart(c);
-			string[0] = c;
-			mod = true;
-		}
-		checkCharIsJavaIdentifierPart(c);
-		for (int i = string.length; i-- > 1; ) {  // NB: end with 1
-			if ( ! Character.isJavaIdentifierPart(string[i])) {
-				string[i] = c;
-				mod = true;
-			}
-		}
-		return mod;
-	}
-
-	private static void checkCharIsJavaIdentifierStart(char c) {
-		if ( ! Character.isJavaIdentifierStart(c)) {
-			throw new IllegalArgumentException("invalid Java identifier start char: '" + c + '\'');  //$NON-NLS-1$
-		}
-	}
-
-	private static void checkCharIsJavaIdentifierPart(char c) {
-		if ( ! Character.isJavaIdentifierPart(c)) {
-			throw new IllegalArgumentException("invalid Java identifier part char: '" + c + '\'');  //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Convert the specified method name to a property name.
-	 */
-	public static String convertGetterMethodNameToPropertyName(String methodName) {
-		int beginIndex = 0;
-		if (methodName.startsWith("get")) { //$NON-NLS-1$
-			beginIndex = 3;
-		} else if (methodName.startsWith("is")) { //$NON-NLS-1$
-			beginIndex = 2;
-		}
-		return Introspector.decapitalize(methodName.substring(beginIndex));
-	}
-
-
-	// ********** constructor **********
-
-	/**
-	 * Suppress default constructor, ensuring non-instantiability.
-	 */
-	private NameTools() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/NullList.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/NullList.java
deleted file mode 100644
index 1dec473ba8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/NullList.java
+++ /dev/null
@@ -1,150 +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.utility.internal;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-
-/**
- * A "null" list is a bit different from an "empty" list: it allows clients to
- * add/remove elements to/from it but never changes. This is useful
- * for passing to methods that require a "collecting parameter" but the
- * client will ignore the resulting "collection".
- * 
- * NB: We return 'null' from the following methods (as opposed to throwing
- * an exception):
- *     get(int) : E
- *     remove(int) : E
- *     set(int, E) : E
- */
-public final class NullList<E> implements List<E> {
-
-	// singleton
-	@SuppressWarnings("unchecked")
-	private static final NullList INSTANCE = new NullList();
-
-	/**
-	 * Return the singleton.
-	 */
-	@SuppressWarnings("unchecked")
-	public static <E> List<E> instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private NullList() {
-		super();
-	}
-
-	public boolean add(E o) {
-		return false;  // the list did not change
-	}
-
-	public void add(int index, E element) {
-		// ignore
-	}
-
-	public boolean addAll(Collection<? extends E> c) {
-		return false;  // the list did not change
-	}
-
-	public boolean addAll(int index, Collection<? extends E> c) {
-		return false;  // the list did not change
-	}
-
-	public void clear() {
-		// ignore
-	}
-
-	public boolean contains(Object o) {
-		return false;
-	}
-
-	public boolean containsAll(Collection<?> c) {
-		return c.isEmpty();
-	}
-
-	public E get(int index) {
-		throw new IndexOutOfBoundsException("Index: " + index + ", Size: 0"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public int indexOf(Object o) {
-		return -1;
-	}
-
-	public boolean isEmpty() {
-		return true;
-	}
-
-	public Iterator<E> iterator() {
-		return EmptyIterator.instance();
-	}
-
-	public int lastIndexOf(Object o) {
-		return -1;
-	}
-
-	public ListIterator<E> listIterator() {
-		return EmptyListIterator.instance();
-	}
-
-	public ListIterator<E> listIterator(int index) {
-		return EmptyListIterator.instance();
-	}
-
-	public boolean remove(Object o) {
-		return false;  // the list did not change
-	}
-
-	public E remove(int index) {
-		throw new IndexOutOfBoundsException("Index: " + index + ", Size: 0"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public boolean removeAll(Collection<?> c) {
-		return false;  // the list did not change
-	}
-
-	public boolean retainAll(Collection<?> c) {
-		return false;  // the list did not change
-	}
-
-	public E set(int index, E element) {
-		throw new IndexOutOfBoundsException("Index: " + index + ", Size: 0"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public int size() {
-		return 0;
-	}
-
-	public List<E> subList(int fromIndex, int toIndex) {
-		return this;
-	}
-
-	private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
-	public Object[] toArray() {
-		return EMPTY_OBJECT_ARRAY;
-	}
-
-	public <T> T[] toArray(T[] a) {
-		return a;
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Range.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Range.java
deleted file mode 100644
index 176918d635..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Range.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import java.io.Serializable;
-
-/**
- * This simple container class simply puts a bit of semantics
- * around a pair of numbers.
- */
-public class Range
-	implements Cloneable, Serializable
-{
-	/** The starting index of the range. */
-	public final int start;
-
-	/** The ending index of the range. */
-	public final int end;
-
-	/**
-	 * The size can be negative if the ending index
-	 * is less than the starting index.
-	 */
-	public final int size;
-
-	private static final long serialVersionUID = 1L;
-
-
-	/**
-	 * Construct with the specified start and end,
-	 * both of which are immutable.
-	 */
-	public Range(int start, int end) {
-		super();
-		this.start = start;
-		this.end = end;
-		this.size = end - start + 1;
-	}
-
-	/**
-	 * Return whether the range includes the specified
-	 * index.
-	 */
-	public boolean includes(int index) {
-		return (this.start <= index) && (index <= this.end);
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o) {
-			return true;
-		}
-		if ( ! (o instanceof Range)) {
-			return false;
-		}
-		Range otherRange = (Range) o;
-		return (this.start == otherRange.start)
-			&& (this.end == otherRange.end);
-	}
-
-	@Override
-	public int hashCode() {
-		return this.start ^ this.end;
-	}
-
-	@Override
-	public Range clone() {
-		try {
-			return (Range) super.clone();
-		} catch (CloneNotSupportedException ex) {
-			throw new InternalError();
-		}
-	}
-
-	@Override
-	public String toString() {
-		return '[' + this.start + ", " + this.end + ']'; //$NON-NLS-1$
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/ReverseComparator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/ReverseComparator.java
deleted file mode 100644
index 10c01f80f0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/ReverseComparator.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import java.io.Serializable;
-import java.util.Comparator;
-
-/**
- * This comparator will reverse the order of the specified comparator.
- * If the comparator is null, the natural ordering of the objects will be used.
- */
-public class ReverseComparator<E extends Comparable<? super E>>
-	implements Comparator<E>, Serializable
-{
-	private final Comparator<E> comparator;
-
-	public ReverseComparator() {
-		this(null);
-	}
-
-	public ReverseComparator(Comparator<E> comparator) {
-		super();
-		this.comparator = comparator;
-	}
-
-	public int compare(E e1, E e2) {
-		return (this.comparator == null) ?
-			e2.compareTo(e1)
-		:
-			this.comparator.compare(e2, e1);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/RunnableCommand.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/RunnableCommand.java
deleted file mode 100644
index 5b15ee088e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/RunnableCommand.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import org.eclipse.jpt.utility.Command;
-
-/**
- * Wrap a Runnable so it can be used as a Command.
- */
-public class RunnableCommand implements Command {
-	protected final Runnable runnable;
-
-	public RunnableCommand(Runnable runnable) {
-		super();
-		if (runnable == null) {
-			throw new NullPointerException();
-		}
-		this.runnable = runnable;
-	}
-
-	public void execute() {
-		this.runnable.run();
-	}
-
-	@Override
-	public String toString() {
-		return "Command[" + this.runnable.toString() +']'; //$NON-NLS-1$
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleAssociation.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleAssociation.java
deleted file mode 100644
index 7c9b0a7401..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleAssociation.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import java.io.Serializable;
-
-/**
- * Straightforward implementation of Association.
- */
-public class SimpleAssociation<K, V>
-	extends AbstractAssociation<K, V>
-	implements Cloneable, Serializable
-{
-	private final K key;
-	private V value;
-
-	private static final long serialVersionUID = 1L;
-
-
-	/**
-	 * Construct an association with the specified key
-	 * and a null value.
-	 */
-	public SimpleAssociation(K key) {
-		super();
-		this.key = key;
-	}
-
-	/**
-	 * Construct an association with the specified key and value.
-	 */
-	public SimpleAssociation(K key, V value) {
-		this(key);
-		this.value = value;
-	}
-
-
-	public K key() {
-		return this.key;
-	}
-
-	public synchronized V value() {
-		return this.value;
-	}
-
-	public synchronized V setValue(V value) {
-		V old = this.value;
-		this.value = value;
-		return old;
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public synchronized SimpleAssociation<K, V> clone() {
-		try {
-			return (SimpleAssociation<K, V>) super.clone();
-		} catch (CloneNotSupportedException ex) {
-			throw new InternalError();
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleFilter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleFilter.java
deleted file mode 100644
index 80e21f939b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleFilter.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import java.io.Serializable;
-import org.eclipse.jpt.utility.Filter;
-
-/**
- * Simple, abstract implementation of <code>Filter</code>
- * that holds on to a criterion object that can be used in the
- * <code>accept(Object)</code> or <code>reject(Object)</code>
- * methods. Subclasses can override either of these methods,
- * depending on which is easier to implement. Note that at least
- * one of these methods <em>must</em> be overridden or
- * an infinite loop will occur. If both of them are overridden,
- * only the <code>accept(Object)</code> method will be used.
- * <p>
- * Simplifies the implementation of straightforward inner classes.
- * Here is an example of a filter that can be used by a
- * <code>FilteringIterator</code> to return only those strings
- * in the nested iterator start with "prefix":
- * <pre>
- *	Filter<String> filter = new SimpleFilter<String>("prefix") {
- *		public boolean accept(String o) {
- *			return o.startsWith((String) criterion);
- *		}
- *	};
- * </pre>
- */
-public abstract class SimpleFilter<T, S>
-	implements Filter<T>, Cloneable, Serializable
-{
-	protected final S criterion;
-
-	private static final long serialVersionUID = 1L;
-
-
-	/**
-	 * More useful constructor. The specified criterion can
-	 * be used by a subclass to "accept" or "reject" objects.
-	 */
-	protected SimpleFilter(S criterion) {
-		super();
-		this.criterion = criterion;
-	}
-
-	/**
-	 * Construct a simple filter with a null criterion
-	 */
-	protected SimpleFilter() {
-		this(null);
-	}
-
-	/**
-	 * Return whether the the specified object should be "rejected".
-	 * The semantics of "rejected" is determined by the client.
-	 */
-	protected boolean reject(T o) {
-		return ! this.accept(o);
-	}
-
-	/**
-	 * Return whether the the specified object should be "accepted".
-	 * The semantics of "accepted" is determined by the client.
-	 */
-	public boolean accept(T o) {
-		return ! this.reject(o);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public SimpleFilter<T, S> clone() {
-		try {
-			return (SimpleFilter<T, S>) super.clone();
-		} catch (CloneNotSupportedException ex) {
-			throw new InternalError();
-		}
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if ( ! (o instanceof SimpleFilter)) {
-			return false;
-		}
-		SimpleFilter<?, ?> other = (SimpleFilter<?, ?>) o;
-		return (this.criterion == null) ?
-			(other.criterion == null) : this.criterion.equals(other.criterion);
-	}
-
-	@Override
-	public int hashCode() {
-		return (this.criterion == null) ? 0 : this.criterion.hashCode();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.criterion);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleJavaType.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleJavaType.java
deleted file mode 100644
index 403472031a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleJavaType.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.utility.internal;
-
-import java.io.PrintWriter;
-import java.io.Serializable;
-import java.text.Collator;
-import org.eclipse.jpt.utility.JavaType;
-
-/**
- * Straightforward implementation of the JavaType interface.
- */
-public final class SimpleJavaType
-	implements JavaType, Cloneable, Serializable
-{
-
-	/**
-	 * store the type as a name, so we can reference classes
-	 * that are not loaded
-	 */
-	private final String elementTypeName;
-
-	/**
-	 * non-array types have an array depth of zero
-	 */
-	private final int arrayDepth;
-
-	private static final String BRACKETS = "[]"; //$NON-NLS-1$
-	private static final long serialVersionUID = 1L;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a Java type with the specified element type and array depth.
-	 */
-	public SimpleJavaType(String elementTypeName, int arrayDepth) {
-		super();
-		if ((elementTypeName == null) || (elementTypeName.length() == 0)) {
-			throw new IllegalArgumentException("The element type name is required."); //$NON-NLS-1$
-		}
-		if (ClassTools.arrayDepthForClassNamed(elementTypeName) != 0) {		// e.g. "[Ljava.lang.Object;"
-			throw new IllegalArgumentException("The element type must not be an array: " + elementTypeName + '.'); //$NON-NLS-1$
-		}
-		if (arrayDepth < 0) {
-			throw new IllegalArgumentException("The array depth must be greater than or equal to zero: " + arrayDepth + '.'); //$NON-NLS-1$
-		}
-		if (elementTypeName.equals(void.class.getName()) && (arrayDepth != 0)) {
-			throw new IllegalArgumentException("'void' must have an array depth of zero: " + arrayDepth + '.'); //$NON-NLS-1$
-		}
-		this.elementTypeName = elementTypeName;
-		this.arrayDepth = arrayDepth;
-	}
-
-	/**
-	 * Construct a Java type for the specified class.
-	 * The class name can be in one of the following forms:
-	 *     java.lang.Object
-	 *     int
-	 *     java.util.Map$Entry
-	 *     [Ljava.lang.Object;
-	 *     [I
-	 *     [Ljava.util.Map$Entry;
-	 */
-	public SimpleJavaType(String javaClassName) {
-		this(ClassTools.elementTypeNameForClassNamed(javaClassName), ClassTools.arrayDepthForClassNamed(javaClassName));
-	}
-
-	/**
-	 * Construct a Java type for the specified class.
-	 */
-	public SimpleJavaType(Class<?> javaClass) {
-		this(javaClass.getName());
-	}
-
-
-	// ********** accessors **********
-
-	public String getElementTypeName() {
-		return this.elementTypeName;
-	}
-
-	public int getArrayDepth() {
-		return this.arrayDepth;
-	}
-
-
-	// ********** queries **********
-
-	public boolean isArray() {
-		return this.arrayDepth > 0;
-	}
-
-	public boolean isPrimitive() {
-		return (this.arrayDepth == 0) && ClassTools.classNamedIsPrimitive(this.elementTypeName);
-	}
-
-	public boolean isPrimitiveWrapper() {
-		return (this.arrayDepth == 0) && ClassTools.classNamedIsPrimitiveWrapperClass(this.elementTypeName);
-	}
-
-	public boolean isVariablePrimitive() {
-		return (this.arrayDepth == 0) && ClassTools.classNamedIsVariablePrimitive(this.elementTypeName);
-	}
-
-	public boolean isVariablePrimitiveWrapper() {
-		return (this.arrayDepth == 0) && ClassTools.classNamedIsVariablePrimitiveWrapperClass(this.elementTypeName);
-	}
-
-	public Class<?> getJavaClass() throws ClassNotFoundException {
-		return ClassTools.classForTypeDeclaration(this.elementTypeName, this.arrayDepth);
-	}
-
-	public String getJavaClassName() {
-		return ClassTools.classNameForTypeDeclaration(this.elementTypeName, this.arrayDepth);
-	}
-
-
-	// ********** comparison **********
-
-	public boolean equals(String otherElementTypeName, int otherArrayDepth) {
-		return (this.arrayDepth == otherArrayDepth)
-			&& this.elementTypeName.equals(otherElementTypeName);
-	}
-
-	public boolean describes(String className) {
-		return this.equals(ClassTools.elementTypeNameForClassNamed(className), ClassTools.arrayDepthForClassNamed(className));
-	}
-
-	public boolean describes(Class<?> javaClass) {
-		return this.describes(javaClass.getName());
-	}
-
-	public boolean equals(JavaType other) {
-		return this.equals(other.getElementTypeName(), other.getArrayDepth());
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		return (this == o) ? true : (o instanceof JavaType) ? this.equals((JavaType) o) : false;
-	}
-
-	@Override
-	public int hashCode() {
-		return this.elementTypeName.hashCode() ^ this.arrayDepth;
-	}
-
-	public int compareTo(JavaType jt) {
-		int x = Collator.getInstance().compare(this.elementTypeName, jt.getElementTypeName());
-		return (x != 0) ? x : (this.arrayDepth - jt.getArrayDepth());
-	}
-
-
-	// ********** printing and displaying **********
-
-	/**
-	 * Return the version of the type's name that can be used in source code:
-	 *     "[[J" => "long[][]"
-	 *     "java.util.Map$Entry" => "java.util.Map.Entry"
-	 */
-	public String declaration() {
-		if (this.arrayDepth == 0) {
-			return this.getElementTypeNameDeclaration();
-		}
-		StringBuilder sb = new StringBuilder(this.elementTypeName.length() + (2 * this.arrayDepth));
-		this.appendDeclarationTo(sb);
-		return sb.toString();
-	}
-
-	/**
-	 * Append the version of the type's name that can be used in source code:
-	 *     "[[J" => "long[][]"
-	 *     "java.util.Map$Entry" => "java.util.Map.Entry"
-	 */
-	public void appendDeclarationTo(StringBuilder sb) {
-		sb.append(this.getElementTypeNameDeclaration());
-		for (int i = this.arrayDepth; i-- > 0; ) {
-			sb.append(BRACKETS);
-		}
-	}
-
-	/**
-	 * Print the version of the type's name that can be used in source code:
-	 *     "[[J" => "long[][]"
-	 *     "java.util.Map$Entry" => "java.util.Map.Entry"
-	 */
-	public void printDeclarationOn(PrintWriter pw) {
-		pw.print(this.getElementTypeNameDeclaration());
-		for (int i = this.arrayDepth; i-- > 0; ) {
-			pw.print(BRACKETS);
-		}
-	}
-
-	/**
-	 * The '$' version of the name is used in Class.forName(String),
-	 * but the '.' version of the name is used in source code.
-	 * Very irritating....
-	 */
-	private String getElementTypeNameDeclaration() {
-		return this.elementTypeName.replace('$', '.');
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append(ClassTools.shortClassNameForObject(this));
-		sb.append('(');
-		this.appendDeclarationTo(sb);
-		sb.append(')');
-		return sb.toString();
-	}
-
-
-	// ********** cloning **********
-
-	@Override
-	public Object clone() {
-		try {
-			return super.clone();
-		} catch (CloneNotSupportedException ex) {
-			throw new InternalError();
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleMethodSignature.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleMethodSignature.java
deleted file mode 100644
index a02891379d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleMethodSignature.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import java.io.PrintWriter;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.text.Collator;
-import java.util.Arrays;
-import org.eclipse.jpt.utility.JavaType;
-import org.eclipse.jpt.utility.MethodSignature;
-
-/**
- * Straightforward implementation of the MethodSignature interface.
- */
-public final class SimpleMethodSignature
-	implements MethodSignature, Cloneable, Serializable
-{
-	private final String name;
-
-	/**
-	 * store the parameter types as names, so we can reference classes
-	 * that are not loaded
-	 */
-	private final JavaType[] parameterTypes;
-
-	public static final JavaType[] EMPTY_PARAMETER_TYPES = new JavaType[0];
-
-	private static final String PARAMETER_SEPARATOR = ", "; //$NON-NLS-1$
-	private static final long serialVersionUID = 1L;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a method signature with the specified name and
-	 * no parameter types.
-	 */
-	public SimpleMethodSignature(String name) {
-		this(name, EMPTY_PARAMETER_TYPES);
-	}
-
-	/**
-	 * Construct a method signature with the specified name and parameter
-	 * types.
-	 */
-	public SimpleMethodSignature(String name, JavaType... parameterTypes) {
-		super();
-		if ((name == null) || (name.length() == 0)) {
-			throw new IllegalArgumentException("The name is required."); //$NON-NLS-1$
-		}
-		if (parameterTypes == null) {
-			throw new IllegalArgumentException("The parameter types are required."); //$NON-NLS-1$
-		}
-		checkParameterTypes(parameterTypes);
-		this.name = name;
-		this.parameterTypes = parameterTypes;
-	}
-
-	private static void checkParameterTypes(JavaType[] parameterTypes) {
-		for (int i = 0; i < parameterTypes.length; i++) {
-			if (parameterTypes[i] == null) {
-				throw new IllegalArgumentException("Missing parameter type: " + i); //$NON-NLS-1$
-			}
-			if (parameterTypes[i].getElementTypeName().equals(void.class.getName())) {
-				throw new IllegalArgumentException("A parameter type of 'void' is not allowed: " + i); //$NON-NLS-1$
-			}
-		}
-	}
-
-	/**
-	 * Construct a method signature with the specified name and parameter
-	 * types.
-	 */
-	public SimpleMethodSignature(String name, String... parameterTypeNames) {
-		this(name, buildParameterTypes(parameterTypeNames));
-	}
-
-	private static JavaType[] buildParameterTypes(String[] parameterTypeNames) {
-		if (parameterTypeNames == null) {
-			throw new IllegalArgumentException("The parameter type names are required."); //$NON-NLS-1$
-		}
-		JavaType[] parameterTypes = new JavaType[parameterTypeNames.length];
-		for (int i = 0; i < parameterTypeNames.length; i++) {
-			if (parameterTypeNames[i] == null) {
-				throw new IllegalArgumentException("Missing parameter type name: " + i); //$NON-NLS-1$
-			}
-			parameterTypes[i] = new SimpleJavaType(parameterTypeNames[i]);
-		}
-		return parameterTypes;
-	}
-
-	/**
-	 * Construct a method signature with the specified name and parameter
-	 * types.
-	 */
-	public SimpleMethodSignature(String name, Class<?>... parameterJavaClasses) {
-		this(name, buildParameterTypeNames(parameterJavaClasses));
-	}
-
-	private static String[] buildParameterTypeNames(Class<?>[] parameterJavaClasses) {
-		if (parameterJavaClasses == null) {
-			throw new IllegalArgumentException("The parameter Java classes are required."); //$NON-NLS-1$
-		}
-		String[] parameterTypeNames = new String[parameterJavaClasses.length];
-		for (int i = 0; i < parameterJavaClasses.length; i++) {
-			if (parameterJavaClasses[i] == null) {
-				throw new IllegalArgumentException("Missing parameter Java class: " + i); //$NON-NLS-1$
-			}
-			parameterTypeNames[i] = parameterJavaClasses[i].getName();
-		}
-		return parameterTypeNames;
-	}
-
-	/**
-	 * Construct a method signature for the specified Java method.
-	 */
-	public SimpleMethodSignature(Method method) {
-		this(method.getName(), method.getParameterTypes());
-	}
-
-
-	// ********** accessors **********
-
-	public String getName() {
-		return this.name;
-	}
-
-	public JavaType[] getParameterTypes() {
-		return this.parameterTypes;
-	}
-
-
-	// ********** comparison **********
-
-	public boolean describes(Method method) {
-		return this.name.equals(method.getName())
-				&& this.parameterTypesDescribe(method.getParameterTypes());
-	}
-
-	private boolean parameterTypesDescribe(Class<?>[] otherParameterTypes) {
-		JavaType[] localParameterTypes = this.parameterTypes;
-		int len = localParameterTypes.length;
-		if (otherParameterTypes.length != len) {
-			return false;
-		}
-		for (int i = len; i-- > 0; ) {
-			if ( ! localParameterTypes[i].describes(otherParameterTypes[i])) {
-				return false;
-			}
-		}
-        return true;
-	}
-
-	public boolean equals(String otherName, JavaType[] otherParameterTypes) {
-		return this.name.equals(otherName)
-				&& Arrays.equals(this.parameterTypes, otherParameterTypes);
-	}
-
-	public boolean equals(MethodSignature other) {
-		return this.equals(other.getName(), other.getParameterTypes());
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		return (this == o) ? true : (o instanceof MethodSignature) ? this.equals((MethodSignature) o) : false;
-	}
-
-	@Override
-	public int hashCode() {
-		return this.name.hashCode() ^ Arrays.hashCode(this.parameterTypes);
-	}
-
-	public int compareTo(MethodSignature ms) {
-		int compare = Collator.getInstance().compare(this.name, ms.getName());
-		return (compare != 0) ? compare : this.compareParameterTypes(ms.getParameterTypes());
-	}
-
-	private int compareParameterTypes(JavaType[] otherParameterTypes) {
-		JavaType[] localParameterTypes = this.parameterTypes;
-		int len1 = localParameterTypes.length;
-		int len2 = otherParameterTypes.length;
-		int min = Math.min(len1, len2);
-		for (int i = 0; i < min; i++) {
-			int compare = localParameterTypes[i].compareTo(otherParameterTypes[i]);
-			if (compare != 0) {
-				return compare;
-			}
-		}
-		return (len1 == len2) ? 0 : (len1 < len2) ? -1 : 1;
-	}
-
-
-	// ********** printing and displaying **********
-
-	public String getSignature() {
-		StringBuilder sb = new StringBuilder(200);
-		this.appendSignatureTo(sb);
-		return sb.toString();
-	}
-
-	public void appendSignatureTo(StringBuilder sb) {
-		sb.append(this.name);
-		sb.append('(');
-		JavaType[] localParameterTypes = this.parameterTypes;
-		int len = localParameterTypes.length;
-		for (int i = 0; i < len; i++) {
-			if (i != 0) {
-				sb.append(PARAMETER_SEPARATOR);
-			}
-			localParameterTypes[i].appendDeclarationTo(sb);
-		}
-		sb.append(')');
-	}
-
-	public void printSignatureOn(PrintWriter pw) {
-		pw.print(this.name);
-		pw.print('(');
-		JavaType[] localParameterTypes = this.parameterTypes;
-		int len = localParameterTypes.length;
-		for (int i = 0; i < len; i++) {
-			if (i != 0) {
-				pw.print(PARAMETER_SEPARATOR);
-			}
-			localParameterTypes[i].printDeclarationOn(pw);
-		}
-		pw.print(')');
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder(200);
-		sb.append(ClassTools.shortClassNameForObject(this));
-		sb.append('(');
-		this.appendSignatureTo(sb);
-		sb.append(')');
-		return sb.toString();
-	}
-
-
-	// ********** cloning **********
-
-	@Override
-	public Object clone() {
-		try {
-			return super.clone();
-		} catch (CloneNotSupportedException ex) {
-			throw new InternalError();
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleStack.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleStack.java
deleted file mode 100644
index f183943d9a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleStack.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.EmptyStackException;
-import java.util.LinkedList;
-import java.util.NoSuchElementException;
-
-/**
- * Straightforward implementation of the Stack interface.
- */
-public class SimpleStack<E>
-	implements Stack<E>, Cloneable, Serializable
-{
-	private LinkedList<E> elements;
-
-	private static final long serialVersionUID = 1L;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct an empty stack.
-	 */
-	public SimpleStack() {
-		super();
-		this.elements = new LinkedList<E>();
-	}
-
-	/**
-	 * Construct a stack containing the elements of the specified
-	 * collection. The stack will pop its elements in reverse of the
-	 * order they are returned by the collection's iterator (i.e. the
-	 * last element returned by the collection's iterator will be the
-	 * first element returned by #pop()).
-	 */
-	public SimpleStack(Collection<? extends E> c) {
-		super();
-		this.elements = new LinkedList<E>(c);
-	}
-
-
-	// ********** Stack implementation **********
-
-	public void push(E o) {
-		this.elements.addLast(o);
-	}
-
-	public E pop() {
-		try {
-			return this.elements.removeLast();
-		} catch (NoSuchElementException ex) {
-			throw new EmptyStackException();
-		}
-	}
-
-	public E peek() {
-		try {
-			return this.elements.getLast();
-		} catch (NoSuchElementException ex) {
-			throw new EmptyStackException();
-		}
-	}
-
-	public boolean isEmpty() {
-		return this.elements.isEmpty();
-	}
-
-
-	// ********** Cloneable implementation **********
-
-	@Override
-	public SimpleStack<E> clone() {
-		try {
-			@SuppressWarnings("unchecked")
-			SimpleStack<E> clone = (SimpleStack<E>) super.clone();
-			@SuppressWarnings("unchecked")
-			LinkedList<E> ll = (LinkedList<E>) this.elements.clone();
-			clone.elements = ll;
-			return clone;
-		} catch (CloneNotSupportedException ex) {
-			throw new InternalError();
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleStringMatcher.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleStringMatcher.java
deleted file mode 100644
index 36c9676495..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleStringMatcher.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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.utility.internal;
-
-import java.io.Serializable;
-import java.util.regex.Pattern;
-import org.eclipse.jpt.utility.Filter;
-
-// TODO the regex code is not very fast - we could probably do better,
-// hand-coding the matching algorithm (eclipse StringMatcher?)
-/**
- * This class implements a simple string-matching algorithm that is a little
- * more user-friendly than standard regular expressions. Instantiate a
- * string matcher with a filter pattern and then you can use the matcher
- * to determine whether another string (or object) matches the pattern.
- * You can also specify whether the matching should be case-sensitive.
- * 
- * The pattern can contain two "meta-characters":
- * 	'*' will match any set of zero or more characters
- * 	'?' will match any single character
- * 
- * Subclasses can override #prefix() and/or #suffix() to change what
- * strings are prepended or appended to the original pattern string.
- * This can offer a slight performance improvement over concatenating
- * strings before calling #setPatternString(String).
- * By default, a '*' is appended to every string.
- * 
- * This class also uses the string-matching algorithm to "filter" objects
- * (and, as a result, also implements the Filter interface).
- * A string converter is used to determine what string aspect of the
- * object is compared to the pattern. By default the string returned
- * by the object's #toString() method is passed to the pattern matcher.
- */
-public class SimpleStringMatcher<T>
-	implements StringMatcher, Filter<T>, Serializable
-{
-
-	/** An adapter that converts the objects into strings to be matched with the pattern. */
-	private StringConverter<T> stringConverter;
-
-	/** The string used to construct the regular expression pattern. */
-	private String patternString;
-
-	/** Whether the matcher ignores case - the default is true. */
-	private boolean ignoresCase;
-
-	/** The regular expression pattern built from the pattern string. */
-	private Pattern pattern;
-
-	/** A list of the meta-characters we need to escape if found in the pattern string. */
-	public static final char[] REG_EX_META_CHARS = { '(', '[', '{', '\\', '^', '$', '|', ')', '?', '*', '+', '.' };
-
-	private static final long serialVersionUID = 1L;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a string matcher with an pattern that will match
-	 * any string and ignore case.
-	 */
-	public SimpleStringMatcher() {
-		this("*"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Construct a string matcher with the specified pattern
-	 * that will ignore case.
-	 */
-	public SimpleStringMatcher(String patternString) {
-		this(patternString, true);
-	}
-
-	/**
-	 * Construct a string matcher with the specified pattern that will
-	 * ignore case as specified.
-	 */
-	public SimpleStringMatcher(String patternString, boolean ignoresCase) {
-		super();
-		this.patternString = patternString;
-		this.ignoresCase = ignoresCase;
-		this.initialize();
-	}
-
-
-	// ********** initialization **********
-
-	protected void initialize() {
-		this.stringConverter = StringConverter.Default.instance();
-		this.rebuildPattern();
-	}
-
-	/**
-	 * Given the current pattern string and case-sensitivity setting,
-	 * re-build the regular expression pattern.
-	 */
-	protected synchronized void rebuildPattern() {
-		this.pattern = this.buildPattern();
-	}
-
-	/**
-	 * Given the current pattern string and case-sensitivity setting,
-	 * build and return a regular expression pattern that can be used
-	 * to match strings.
-	 */
-	protected Pattern buildPattern() {
-		int patternFlags = 0x0;
-		if (this.ignoresCase) {
-			patternFlags = Pattern.UNICODE_CASE | Pattern.CASE_INSENSITIVE;
-		}
-		return Pattern.compile(this.convertToRegEx(this.patternString), patternFlags);
-	}
-
-
-	// ********** StringMatcher implementation **********
-
-	public synchronized void setPatternString(String patternString) {
-		this.patternString = patternString;
-		this.rebuildPattern();
-	}
-
-	/**
-	 * Return whether the specified string matches the pattern.
-	 */
-	public synchronized boolean matches(String string) {
-		return this.pattern.matcher(string).matches();
-	}
-
-
-	// ********** Filter implementation **********
-
-	public synchronized boolean accept(T o) {
-		return this.matches(this.stringConverter.convertToString(o));
-	}
-
-
-	// ********** accessors **********
-
-	/**
-	 * Return the string converter used to convert the objects
-	 * passed to the matcher into strings.
-	 */
-	public synchronized StringConverter<T> stringConverter() {
-		return this.stringConverter;
-	}
-
-	/**
-	 * Set the string converter used to convert the objects
-	 * passed to the matcher into strings.
-	 */
-	public synchronized void setStringConverter(StringConverter<T> stringConverter) {
-		this.stringConverter = stringConverter;
-	}
-
-	/**
-	 * Return the original pattern string.
-	 */
-	public synchronized String patternString() {
-		return this.patternString;
-	}
-
-	/**
-	 * Return whether the matcher ignores case.
-	 */
-	public synchronized boolean ignoresCase() {
-		return this.ignoresCase;
-	}
-
-	/**
-	 * Set whether the matcher ignores case.
-	 */
-	public synchronized void setIgnoresCase(boolean ignoresCase) {
-		this.ignoresCase = ignoresCase;
-		this.rebuildPattern();
-	}
-
-	/**
-	 * Return the regular expression pattern.
-	 */
-	public synchronized Pattern pattern() {
-		return this.pattern;
-	}
-
-
-	// ********** other public API **********
-
-	/**
-	 * Return the regular expression corresponding to
-	 * the original pattern string.
-	 */
-	public synchronized String regularExpression() {
-		return this.convertToRegEx(this.patternString);
-	}
-
-
-	// ********** converting **********
-
-	/**
-	 * Convert the specified string to a regular expression.
-	 */
-	protected String convertToRegEx(String string) {
-		StringBuffer sb = new StringBuffer(string.length() + 10);
-		this.convertToRegExOn(this.prefix(), sb);
-		this.convertToRegExOn(string, sb);
-		this.convertToRegExOn(this.suffix(), sb);
-		return sb.toString();
-	}
-
-	/**
-	 * Return any prefix that should be prepended to the original
-	 * string. By default, there is no prefix.
-	 */
-	protected String prefix() {
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * Return any suffix that should be appended to the original
-	 * string. Since this class is typically used in UI situation where
-	 * the user is typing in a pattern used to filter a list, the default
-	 * suffix is a wildcard character.
-	 */
-	protected String suffix() {
-		return "*"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Convert the specified string to a regular expression.
-	 */
-	protected void convertToRegExOn(String string, StringBuffer sb) {
-		char[] charArray = string.toCharArray();
-		int length = charArray.length;
-		for (int i = 0; i < length; i++) {
-			char c = charArray[i];
-			// convert user-friendly meta-chars into regex meta-chars
-			if (c == '*') {
-				sb.append(".*"); //$NON-NLS-1$
-				continue;
-			}
-			if (c == '?') {
-				sb.append('.');
-				continue;
-			}
-			// escape regex meta-chars
-			if (CollectionTools.contains(REG_EX_META_CHARS, c)) {
-				sb.append('\\');
-			}
-			sb.append(c);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Stack.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Stack.java
deleted file mode 100644
index 93bef64f4b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Stack.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import java.io.Serializable;
-import java.util.EmptyStackException;
-
-/**
- * Interface defining the classic stack behavior,
- * without the backdoors allowed by java.util.Stack.
- * E is the type of elements contained by the Stack.
- */
-public interface Stack<E> {
-
-	/**
-	 * "Push" the specified item on to the top of the stack.
-	 */
-	void push(E o);
-
-	/**
-	 * "Pop" an item from the top of the stack.
-	 */
-	E pop();
-
-	/**
-	 * Return the item on the top of the stack
-	 * without removing it from the stack.
-	 */
-	E peek();
-
-	/**
-	 * Return whether the stack is empty.
-	 */
-	boolean isEmpty();
-
-
-	final class Empty<E> implements Stack<E>, Serializable {
-		@SuppressWarnings("unchecked")
-		public static final Stack INSTANCE = new Empty();
-		@SuppressWarnings("unchecked")
-		public static <T> Stack<T> instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Empty() {
-			super();
-		}
-		public void push(E o) {
-			throw new UnsupportedOperationException();
-		}
-		public E pop() {
-			throw new EmptyStackException();
-		}
-		public E peek() {
-			throw new EmptyStackException();
-		}
-		public boolean isEmpty() {
-			return true;
-		}
-		private static final long serialVersionUID = 1L;
-		private Object readResolve() {
-			return INSTANCE;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/StringConverter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/StringConverter.java
deleted file mode 100644
index 8782e07c3e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/StringConverter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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.utility.internal;
-
-/**
- * Used by various "pluggable" classes to transform objects
- * into strings.
- */
-public interface StringConverter<T> {
-
-	/**
-	 * Convert the specified object into a string.
-	 * The semantics of "convert" is determined by the
-	 * contract between the client and the server.
-	 */
-	String convertToString(T o);
-
-
-	final class Default<S> implements StringConverter<S> {
-		@SuppressWarnings("unchecked")
-		public static final StringConverter INSTANCE = new Default();
-		@SuppressWarnings("unchecked")
-		public static <R> StringConverter<R> instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Default() {
-			super();
-		}
-		// simply return the object's #toString() result
-		public String convertToString(S o) {
-			return (o == null) ? null : o.toString();
-		}
-		@Override
-		public String toString() {
-			return "StringConverter.Default"; //$NON-NLS-1$
-		}
-	}
-
-	final class Disabled<S> implements StringConverter<S> {
-		@SuppressWarnings("unchecked")
-		public static final StringConverter INSTANCE = new Disabled();
-		@SuppressWarnings("unchecked")
-		public static <R> StringConverter<R> instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Disabled() {
-			super();
-		}
-		// throw an exception
-		public String convertToString(S o) {
-			throw new UnsupportedOperationException();
-		}
-		@Override
-		public String toString() {
-			return "StringConverter.Disabled"; //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/StringMatcher.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/StringMatcher.java
deleted file mode 100644
index 2095fe69a4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/StringMatcher.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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.utility.internal;
-
-/**
- * This interface defines a simple API for allowing "pluggable"
- * string matchers that can be configured with a pattern string
- * then used to determine what strings match the pattern.
- */
-public interface StringMatcher {
-
-	/**
-	 * Set the pattern string used to determine future
-	 * matches. The format and semantics of the pattern
-	 * string are determined by the contract between the
-	 * client and the server.
-	 */
-	void setPatternString(String patternString);
-
-	/**
-	 * Return whether the specified string matches the
-	 * established pattern string. The semantics of a match
-	 * is determined by the contract between the
-	 * client and the server.
-	 */
-	boolean matches(String string);
-
-
-	final class Null implements StringMatcher {
-		public static final StringMatcher INSTANCE = new Null();
-		public static StringMatcher instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Null() {
-			super();
-		}
-		public void setPatternString(String patternString) {
-			// ignore the pattern string
-		}
-		public boolean matches(String string) {
-			// everything is a match
-			return true;
-		}
-		@Override
-		public String toString() {
-			return "StringMatcher.Null"; //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/StringTools.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/StringTools.java
deleted file mode 100644
index b3c69b1f5a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/StringTools.java
+++ /dev/null
@@ -1,4145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Arrays;
-import java.util.Iterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-
-/**
- * Convenience methods related to the java.lang.String class.
- * 
- * As of jdk 1.5, it's tempting to convert all of these methods to use
- * java.lang.Appendable (instead of StringBuffer, StringBuilder, and Writer);
- * but all the Appendable methods throw java.io.IOException (yech) and we
- * [might?] get a bit better performance invoking methods on classes than
- * we get on interfaces. :-)
- */
-public final class StringTools {
-
-	/** carriage return */
-	public static final String CR = System.getProperty("line.separator");  //$NON-NLS-1$
-
-	/** double quote */
-	public static final char QUOTE = '"';
-
-	/** parenthesis */
-	public static final char OPEN_PARENTHESIS = '(';
-	public static final char CLOSE_PARENTHESIS = ')';
-
-	/** brackets */
-	public static final char OPEN_BRACKET = '[';
-	public static final char CLOSE_BRACKET = ']';
-
-	/** brackets */
-	public static final char OPEN_BRACE = '{';
-	public static final char CLOSE_BRACE = '}';
-
-	/** brackets */
-	public static final char OPEN_CHEVRON = '<';
-	public static final char CLOSE_CHEVRON = '>';
-
-	/** empty string */
-	public static final String EMPTY_STRING = ""; //$NON-NLS-1$
-
-	/** empty char array */
-	public static final char[] EMPTY_CHAR_ARRAY = new char[0];
-
-
-
-	// ********** padding/truncating **********
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with spaces at the end.
-	 * String#pad(int)
-	 */
-	public static String pad(String string, int length) {
-		return pad(string, length, ' ');
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with spaces at the end.
-	 * String#padOn(int, Writer)
-	 */
-	public static void padOn(String string, int length, Writer writer) {
-		padOn(string, length, ' ', writer);
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with spaces at the end.
-	 * String#padOn(int, StringBuffer)
-	 */
-	public static void padOn(String string, int length, StringBuffer sb) {
-		padOn(string, length, ' ', sb);
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with spaces at the end.
-	 * String#padOn(int, StringBuilder)
-	 */
-	public static void padOn(String string, int length, StringBuilder sb) {
-		padOn(string, length, ' ', sb);
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the end.
-	 * String#pad(int, char)
-	 */
-	public static String pad(String string, int length, char c) {
-		int stringLength = string.length();
-		if (stringLength > length) {
-			throw new IllegalArgumentException("String is too long: " + stringLength + " > " + length);  //$NON-NLS-1$  //$NON-NLS-2$
-		}
-		if (stringLength == length) {
-			return string;
-		}
-		return pad_(string, length, c);
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the end.
-	 * String#padOn(int, char, Writer)
-	 */
-	public static void padOn(String string, int length, char c, Writer writer) {
-		int stringLength = string.length();
-		if (stringLength > length) {
-			throw new IllegalArgumentException("String is too long: " + stringLength + " > " + length);  //$NON-NLS-1$  //$NON-NLS-2$
-		}
-		if (stringLength == length) {
-			writeStringOn(string, writer);
-		} else {
-			padOn_(string, length, c, writer);
-		}
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the end.
-	 * String#padOn(int, char, StringBuffer)
-	 */
-	public static void padOn(String string, int length, char c, StringBuffer sb) {
-		int stringLength = string.length();
-		if (stringLength > length) {
-			throw new IllegalArgumentException("String is too long: " + stringLength + " > " + length);  //$NON-NLS-1$  //$NON-NLS-2$
-		}
-		if (stringLength == length) {
-			sb.append(string);
-		} else {
-			padOn_(string, length, c, sb);
-		}
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the end.
-	 * String#padOn(int, char, StringBuilder)
-	 */
-	public static void padOn(String string, int length, char c, StringBuilder sb) {
-		int stringLength = string.length();
-		if (stringLength > length) {
-			throw new IllegalArgumentException("String is too long: " + stringLength + " > " + length);  //$NON-NLS-1$  //$NON-NLS-2$
-		}
-		if (stringLength == length) {
-			sb.append(string);
-		} else {
-			padOn_(string, length, c, sb);
-		}
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with spaces at the end.
-	 * String#pad(int)
-	 */
-	public static char[] pad(char[] string, int length) {
-		return pad(string, length, ' ');
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with spaces at the end.
-	 * String#padOn(int, writer)
-	 */
-	public static void padOn(char[] string, int length, Writer writer) {
-		padOn(string, length, ' ', writer);
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with spaces at the end.
-	 * String#padOn(int, StringBuffer)
-	 */
-	public static void padOn(char[] string, int length, StringBuffer sb) {
-		padOn(string, length, ' ', sb);
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with spaces at the end.
-	 * String#padOn(int, StringBuilder)
-	 */
-	public static void padOn(char[] string, int length, StringBuilder sb) {
-		padOn(string, length, ' ', sb);
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the end.
-	 * String#pad(int, char)
-	 */
-	public static char[] pad(char[] string, int length, char c) {
-		int stringLength = string.length;
-		if (stringLength > length) {
-			throw new IllegalArgumentException("String is too long: " + stringLength + " > " + length);  //$NON-NLS-1$  //$NON-NLS-2$
-		}
-		if (stringLength == length) {
-			return string;
-		}
-		return pad_(string, length, c);
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the end.
-	 * String#padOn(int, char, Writer)
-	 */
-	public static void padOn(char[] string, int length, char c, Writer writer) {
-		int stringLength = string.length;
-		if (stringLength > length) {
-			throw new IllegalArgumentException("String is too long: " + stringLength + " > " + length);  //$NON-NLS-1$  //$NON-NLS-2$
-		}
-		if (stringLength == length) {
-			writeStringOn(string, writer);
-		} else {
-			padOn_(string, length, c, writer);
-		}
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the end.
-	 * String#padOn(int, char, StringBuffer)
-	 */
-	public static void padOn(char[] string, int length, char c, StringBuffer sb) {
-		int stringLength = string.length;
-		if (stringLength > length) {
-			throw new IllegalArgumentException("String is too long: " + stringLength + " > " + length);  //$NON-NLS-1$  //$NON-NLS-2$
-		}
-		if (stringLength == length) {
-			sb.append(string);
-		} else {
-			padOn_(string, length, c, sb);
-		}
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the end.
-	 * String#padOn(int, char, StringBuilder)
-	 */
-	public static void padOn(char[] string, int length, char c, StringBuilder sb) {
-		int stringLength = string.length;
-		if (stringLength > length) {
-			throw new IllegalArgumentException("String is too long: " + stringLength + " > " + length);  //$NON-NLS-1$  //$NON-NLS-2$
-		}
-		if (stringLength == length) {
-			sb.append(string);
-		} else {
-			padOn_(string, length, c, sb);
-		}
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, it is truncated.
-	 * If it is shorter than the specified length, it is padded with spaces at the end.
-	 * String#padOrTruncate(int)
-	 */
-	public static String padOrTruncate(String string, int length) {
-		return padOrTruncate(string, length, ' ');
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, it is truncated.
-	 * If it is shorter than the specified length, it is padded with spaces at the end.
-	 * String#padOrTruncateOn(int, Writer)
-	 */
-	public static void padOrTruncateOn(String string, int length, Writer writer) {
-		padOrTruncateOn(string, length, ' ', writer);
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, it is truncated.
-	 * If it is shorter than the specified length, it is padded with spaces at the end.
-	 * String#padOrTruncateOn(int, StringBuffer)
-	 */
-	public static void padOrTruncateOn(String string, int length, StringBuffer sb) {
-		padOrTruncateOn(string, length, ' ', sb);
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, it is truncated.
-	 * If it is shorter than the specified length, it is padded with spaces at the end.
-	 * String#padOrTruncateOn(int, StringBuilder)
-	 */
-	public static void padOrTruncateOn(String string, int length, StringBuilder sb) {
-		padOrTruncateOn(string, length, ' ', sb);
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, it is truncated.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the end.
-	 * String#padOrTruncate(int, char)
-	 */
-	public static String padOrTruncate(String string, int length, char c) {
-		int stringLength = string.length();
-		if (stringLength == length) {
-			return string;
-		}
-		if (stringLength > length) {
-			return string.substring(0, length);
-		}
-		return pad_(string, length, c);
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, it is truncated.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the end.
-	 * String#padOrTruncateOn(int, char, Writer)
-	 */
-	public static void padOrTruncateOn(String string, int length, char c, Writer writer) {
-		int stringLength = string.length();
-		if (stringLength == length) {
-			writeStringOn(string, writer);
-		} else if (stringLength > length) {
-			writeStringOn(string.substring(0, length), writer);
-		} else {
-			padOn_(string, length, c, writer);
-		}
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, it is truncated.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the end.
-	 * String#padOrTruncateOn(int, char, StringBuffer)
-	 */
-	public static void padOrTruncateOn(String string, int length, char c, StringBuffer sb) {
-		int stringLength = string.length();
-		if (stringLength == length) {
-			sb.append(string);
-		} else if (stringLength > length) {
-			sb.append(string.substring(0, length));
-		} else {
-			padOn_(string, length, c, sb);
-		}
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, it is truncated.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the end.
-	 * String#padOrTruncateOn(int, char, StringBuilder)
-	 */
-	public static void padOrTruncateOn(String string, int length, char c, StringBuilder sb) {
-		int stringLength = string.length();
-		if (stringLength == length) {
-			sb.append(string);
-		} else if (stringLength > length) {
-			sb.append(string.substring(0, length));
-		} else {
-			padOn_(string, length, c, sb);
-		}
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, it is truncated.
-	 * If it is shorter than the specified length, it is padded with spaces at the end.
-	 * String#padOrTruncate(int)
-	 */
-	public static char[] padOrTruncate(char[] string, int length) {
-		return padOrTruncate(string, length, ' ');
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, it is truncated.
-	 * If it is shorter than the specified length, it is padded with spaces at the end.
-	 * String#padOrTruncateOn(int, Writer)
-	 */
-	public static void padOrTruncateOn(char[] string, int length, Writer writer) {
-		padOrTruncateOn(string, length, ' ', writer);
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, it is truncated.
-	 * If it is shorter than the specified length, it is padded with spaces at the end.
-	 * String#padOrTruncateOn(int, StringBuffer)
-	 */
-	public static void padOrTruncate(char[] string, int length, StringBuffer sb) {
-		padOrTruncateOn(string, length, ' ', sb);
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, it is truncated.
-	 * If it is shorter than the specified length, it is padded with spaces at the end.
-	 * String#padOrTruncateOn(int, StringBuilder)
-	 */
-	public static void padOrTruncate(char[] string, int length, StringBuilder sb) {
-		padOrTruncateOn(string, length, ' ', sb);
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, it is truncated.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the end.
-	 * String#padOrTruncate(int, char)
-	 */
-	public static char[] padOrTruncate(char[] string, int length, char c) {
-		int stringLength = string.length;
-		if (stringLength == length) {
-			return string;
-		}
-		if (stringLength > length) {
-			char[] result = new char[length];
-			System.arraycopy(string, 0, result, 0, length);
-			return result;
-		}
-		return pad_(string, length, c);
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, it is truncated.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the end.
-	 * String#padOrTruncateOn(int, char, Writer)
-	 */
-	public static void padOrTruncateOn(char[] string, int length, char c, Writer writer) {
-		int stringLength = string.length;
-		if (stringLength == length) {
-			writeStringOn(string, writer);
-		} else if (stringLength > length) {
-			writeStringOn(string, 0, length, writer);
-		} else {
-			padOn_(string, length, c, writer);
-		}
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, it is truncated.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the end.
-	 * String#padOrTruncateOn(int, char, StringBuffer)
-	 */
-	public static void padOrTruncateOn(char[] string, int length, char c, StringBuffer sb) {
-		int stringLength = string.length;
-		if (stringLength == length) {
-			sb.append(string);
-		} else if (stringLength > length) {
-			sb.append(string, 0, length);
-		} else {
-			padOn_(string, length, c, sb);
-		}
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, it is truncated.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the end.
-	 * String#padOrTruncateOn(int, char, StringBuilder)
-	 */
-	public static void padOrTruncateOn(char[] string, int length, char c, StringBuilder sb) {
-		int stringLength = string.length;
-		if (stringLength == length) {
-			sb.append(string);
-		} else if (stringLength > length) {
-			sb.append(string, 0, length);
-		} else {
-			padOn_(string, length, c, sb);
-		}
-	}
-
-	/*
-	 * Pad the specified string without validating the parms.
-	 */
-	private static String pad_(String string, int length, char c) {
-		return new String(pad_(string.toCharArray(), length, c));
-	}
-
-	/*
-	 * Pad the specified string without validating the parms.
-	 */
-	private static void padOn_(String string, int length, char c, Writer writer) {
-		writeStringOn(string, writer);
-		fill_(string, length, c, writer);
-	}
-
-	/*
-	 * Add enough characters to the specified writer to compensate for
-	 * the difference between the specified string and specified length.
-	 */
-	private static void fill_(String string, int length, char c, Writer writer) {
-		fill_(string.length(), length, c, writer);
-	}
-
-	/*
-	 * Add enough characters to the specified writer to compensate for
-	 * the difference between the specified string and specified length.
-	 */
-	private static void fill_(char[] string, int length, char c, Writer writer) {
-		fill_(string.length, length, c, writer);
-	}
-
-	/*
-	 * Add enough characters to the specified writer to compensate for
-	 * the difference between the specified string and specified length.
-	 */
-	private static void fill_(int stringLength, int length, char c, Writer writer) {
-		writeStringOn(CollectionTools.fill(new char[length - stringLength], c), writer);
-	}
-
-	/*
-	 * Pad the specified string without validating the parms.
-	 */
-	private static void padOn_(String string, int length, char c, StringBuffer sb) {
-		sb.append(string);
-		fill_(string, length, c, sb);
-	}
-
-	/*
-	 * Add enough characters to the specified string buffer to compensate for
-	 * the difference between the specified string and specified length.
-	 */
-	private static void fill_(String string, int length, char c, StringBuffer sb) {
-		fill_(string.length(), length, c, sb);
-	}
-
-	/*
-	 * Add enough characters to the specified string buffer to compensate for
-	 * the difference between the specified string and specified length.
-	 */
-	private static void fill_(char[] string, int length, char c, StringBuffer sb) {
-		fill_(string.length, length, c, sb);
-	}
-
-	/*
-	 * Add enough characters to the specified string buffer to compensate for
-	 * the difference between the specified string and specified length.
-	 */
-	private static void fill_(int stringLength, int length, char c, StringBuffer sb) {
-		sb.append(CollectionTools.fill(new char[length - stringLength], c));
-	}
-
-	/*
-	 * Pad the specified string without validating the parms.
-	 */
-	private static void padOn_(String string, int length, char c, StringBuilder sb) {
-		sb.append(string);
-		fill_(string, length, c, sb);
-	}
-
-	/*
-	 * Add enough characters to the specified string builder to compensate for
-	 * the difference between the specified string and specified length.
-	 */
-	private static void fill_(String string, int length, char c, StringBuilder sb) {
-		fill_(string.length(), length, c, sb);
-	}
-
-	/*
-	 * Add enough characters to the specified string builder to compensate for
-	 * the difference between the specified string and specified length.
-	 */
-	private static void fill_(char[] string, int length, char c, StringBuilder sb) {
-		fill_(string.length, length, c, sb);
-	}
-
-	/*
-	 * Add enough characters to the specified string builder to compensate for
-	 * the difference between the specified string and specified length.
-	 */
-	private static void fill_(int stringLength, int length, char c, StringBuilder sb) {
-		sb.append(CollectionTools.fill(new char[length - stringLength], c));
-	}
-
-	/*
-	 * Pad the specified string without validating the parms.
-	 */
-	private static char[] pad_(char[] string, int length, char c) {
-		char[] result = new char[length];
-		int stringLength = string.length;
-		System.arraycopy(string, 0, result, 0, stringLength);
-		Arrays.fill(result, stringLength, length, c);
-		return result;
-	}
-
-	/*
-	 * Pad the specified string without validating the parms.
-	 */
-	private static void padOn_(char[] string, int length, char c, Writer writer) {
-		writeStringOn(string, writer);
-		fill_(string, length, c, writer);
-	}
-
-	/*
-	 * Pad the specified string without validating the parms.
-	 */
-	private static void padOn_(char[] string, int length, char c, StringBuffer sb) {
-		sb.append(string);
-		fill_(string, length, c, sb);
-	}
-
-	/*
-	 * Pad the specified string without validating the parms.
-	 */
-	private static void padOn_(char[] string, int length, char c, StringBuilder sb) {
-		sb.append(string);
-		fill_(string, length, c, sb);
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with zeros at the front.
-	 * String#zeroPad(int)
-	 */
-	public static String zeroPad(String string, int length) {
-		return frontPad(string, length, '0');
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with zeros at the front.
-	 * String#zeroPadOn(int, Writer)
-	 */
-	public static void zeroPadOn(String string, int length, Writer writer) {
-		frontPadOn(string, length, '0', writer);
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with zeros at the front.
-	 * String#zeroPadOn(int, StringBuffer)
-	 */
-	public static void zeroPadOn(String string, int length, StringBuffer sb) {
-		frontPadOn(string, length, '0', sb);
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with zeros at the front.
-	 * String#zeroPadOn(int, StringBuilder)
-	 */
-	public static void zeroPadOn(String string, int length, StringBuilder sb) {
-		frontPadOn(string, length, '0', sb);
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the front.
-	 * String#frontPad(int, char)
-	 */
-	public static String frontPad(String string, int length, char c) {
-		int stringLength = string.length();
-		if (stringLength > length) {
-			throw new IllegalArgumentException("String is too long: " + stringLength + " > " + length);  //$NON-NLS-1$  //$NON-NLS-2$
-		}
-		if (stringLength == length) {
-			return string;
-		}
-		return frontPad_(string, length, c);
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the front.
-	 * String#frontPadOn(int, char, Writer)
-	 */
-	public static void frontPadOn(String string, int length, char c, Writer writer) {
-		int stringLength = string.length();
-		if (stringLength > length) {
-			throw new IllegalArgumentException("String is too long: " + stringLength + " > " + length);  //$NON-NLS-1$  //$NON-NLS-2$
-		}
-		if (stringLength == length) {
-			writeStringOn(string, writer);
-		} else {
-			frontPadOn_(string, length, c, writer);
-		}
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the front.
-	 * String#frontPadOn(int, char, StringBuffer)
-	 */
-	public static void frontPadOn(String string, int length, char c, StringBuffer sb) {
-		int stringLength = string.length();
-		if (stringLength > length) {
-			throw new IllegalArgumentException("String is too long: " + stringLength + " > " + length);  //$NON-NLS-1$  //$NON-NLS-2$
-		}
-		if (stringLength == length) {
-			sb.append(string);
-		} else {
-			frontPadOn_(string, length, c, sb);
-		}
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the front.
-	 * String#frontPadOn(int, char, StringBuilder)
-	 */
-	public static void frontPadOn(String string, int length, char c, StringBuilder sb) {
-		int stringLength = string.length();
-		if (stringLength > length) {
-			throw new IllegalArgumentException("String is too long: " + stringLength + " > " + length);  //$NON-NLS-1$  //$NON-NLS-2$
-		}
-		if (stringLength == length) {
-			sb.append(string);
-		} else {
-			frontPadOn_(string, length, c, sb);
-		}
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with zeros at the front.
-	 * String#zeroPad(int)
-	 */
-	public static char[] zeroPad(char[] string, int length) {
-		return frontPad(string, length, '0');
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with zeros at the front.
-	 * String#zeroPadOn(int, Writer)
-	 */
-	public static void zeroPadOn(char[] string, int length, Writer writer) {
-		frontPadOn(string, length, '0', writer);
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with zeros at the front.
-	 * String#zeroPadOn(int, StringBuffer)
-	 */
-	public static void zeroPadOn(char[] string, int length, StringBuffer sb) {
-		frontPadOn(string, length, '0', sb);
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with zeros at the front.
-	 * String#zeroPadOn(int, StringBuilder)
-	 */
-	public static void zeroPadOn(char[] string, int length, StringBuilder sb) {
-		frontPadOn(string, length, '0', sb);
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the front.
-	 * String#frontPad(int, char)
-	 */
-	public static char[] frontPad(char[] string, int length, char c) {
-		int stringLength = string.length;
-		if (stringLength > length) {
-			throw new IllegalArgumentException("String is too long: " + stringLength + " > " + length);  //$NON-NLS-1$  //$NON-NLS-2$
-		}
-		if (stringLength == length) {
-			return string;
-		}
-		return frontPad_(string, length, c);
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the front.
-	 * String#frontPadOn(int, char, Writer)
-	 */
-	public static void frontPadOn(char[] string, int length, char c, Writer writer) {
-		int stringLength = string.length;
-		if (stringLength > length) {
-			throw new IllegalArgumentException("String is too long: " + stringLength + " > " + length);  //$NON-NLS-1$  //$NON-NLS-2$
-		}
-		if (stringLength == length) {
-			writeStringOn(string, writer);
-		} else {
-			frontPadOn_(string, length, c, writer);
-		}
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the front.
-	 * String#frontPadOn(int, char, StringBuffer)
-	 */
-	public static void frontPadOn(char[] string, int length, char c, StringBuffer sb) {
-		int stringLength = string.length;
-		if (stringLength > length) {
-			throw new IllegalArgumentException("String is too long: " + stringLength + " > " + length);  //$NON-NLS-1$  //$NON-NLS-2$
-		}
-		if (stringLength == length) {
-			sb.append(string);
-		} else {
-			frontPadOn_(string, length, c, sb);
-		}
-	}
-
-	/**
-	 * Pad the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, an IllegalArgumentException is thrown.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the front.
-	 * String#frontPadOn(int, char, StringBuilder)
-	 */
-	public static void frontPadOn(char[] string, int length, char c, StringBuilder sb) {
-		int stringLength = string.length;
-		if (stringLength > length) {
-			throw new IllegalArgumentException("String is too long: " + stringLength + " > " + length);  //$NON-NLS-1$  //$NON-NLS-2$
-		}
-		if (stringLength == length) {
-			sb.append(string);
-		} else {
-			frontPadOn_(string, length, c, sb);
-		}
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, only the last part of the string is returned.
-	 * If it is shorter than the specified length, it is padded with zeros at the front.
-	 * String#zeroPadOrTruncate(int)
-	 */
-	public static String zeroPadOrTruncate(String string, int length) {
-		return frontPadOrTruncate(string, length, '0');
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, only the last part of the string is returned.
-	 * If it is shorter than the specified length, it is padded with zeros at the front.
-	 * String#zeroPadOrTruncateOn(int, Writer)
-	 */
-	public static void zeroPadOrTruncateOn(String string, int length, Writer writer) {
-		frontPadOrTruncateOn(string, length, '0', writer);
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, only the last part of the string is returned.
-	 * If it is shorter than the specified length, it is padded with zeros at the front.
-	 * String#zeroPadOrTruncateOn(int, StringBuffer)
-	 */
-	public static void zeroPadOrTruncateOn(String string, int length, StringBuffer sb) {
-		frontPadOrTruncateOn(string, length, '0', sb);
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, only the last part of the string is returned.
-	 * If it is shorter than the specified length, it is padded with zeros at the front.
-	 * String#zeroPadOrTruncateOn(int, StringBuilder)
-	 */
-	public static void zeroPadOrTruncateOn(String string, int length, StringBuilder sb) {
-		frontPadOrTruncateOn(string, length, '0', sb);
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, only the last part of the string is returned.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the front.
-	 * String#frontPadOrTruncate(int, char)
-	 */
-	public static String frontPadOrTruncate(String string, int length, char c) {
-		int stringLength = string.length();
-		if (stringLength == length) {
-			return string;
-		}
-		if (stringLength > length) {
-			return string.substring(stringLength - length);
-		}
-		return frontPad_(string, length, c);
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, only the last part of the string is returned.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the front.
-	 * String#frontPadOrTruncateOn(int, char, Writer)
-	 */
-	public static void frontPadOrTruncateOn(String string, int length, char c, Writer writer) {
-		int stringLength = string.length();
-		if (stringLength == length) {
-			writeStringOn(string, writer);
-		} else if (stringLength > length) {
-			writeStringOn(string.substring(stringLength - length), writer);
-		} else {
-			frontPadOn_(string, length, c, writer);
-		}
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, only the last part of the string is returned.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the front.
-	 * String#frontPadOrTruncateOn(int, char, StringBuffer)
-	 */
-	public static void frontPadOrTruncateOn(String string, int length, char c, StringBuffer sb) {
-		int stringLength = string.length();
-		if (stringLength == length) {
-			sb.append(string);
-		} else if (stringLength > length) {
-			sb.append(string.substring(stringLength - length));
-		} else {
-			frontPadOn_(string, length, c, sb);
-		}
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, only the last part of the string is returned.
-	 * If it is shorter than the specified length, it is padded with the
-	 * specified character at the front.
-	 * String#frontPadOrTruncateOn(int, char, StringBuilder)
-	 */
-	public static void frontPadOrTruncateOn(String string, int length, char c, StringBuilder sb) {
-		int stringLength = string.length();
-		if (stringLength == length) {
-			sb.append(string);
-		} else if (stringLength > length) {
-			sb.append(string.substring(stringLength - length));
-		} else {
-			frontPadOn_(string, length, c, sb);
-		}
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, only the last part of the string is returned.
-	 * If it is shorter than the specified length, it is padded with zeros at the front.
-	 * String#zeroPadOrTruncate(int)
-	 */
-	public static char[] zeroPadOrTruncate(char[] string, int length) {
-		return frontPadOrTruncate(string, length, '0');
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, only the last part of the string is returned.
-	 * If it is shorter than the specified length, it is padded with zeros at the front.
-	 * String#zeroPadOrTruncateOn(int, Writer)
-	 */
-	public static void zeroPadOrTruncateOn(char[] string, int length, Writer writer) {
-		frontPadOrTruncateOn(string, length, '0', writer);
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, only the last part of the string is returned.
-	 * If it is shorter than the specified length, it is padded with zeros at the front.
-	 * String#zeroPadOrTruncateOn(int, StringBuffer)
-	 */
-	public static void zeroPadOrTruncateOn(char[] string, int length, StringBuffer sb) {
-		frontPadOrTruncateOn(string, length, '0', sb);
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, only the last part of the string is returned.
-	 * If it is shorter than the specified length, it is padded with zeros at the front.
-	 * String#zeroPadOrTruncateOn(int, StringBuilder)
-	 */
-	public static void zeroPadOrTruncateOn(char[] string, int length, StringBuilder sb) {
-		frontPadOrTruncateOn(string, length, '0', sb);
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, only the last part of the string is returned.
-	 * If it is shorter than the specified length, it is padded with the 
-	 * specified character at the front.
-	 * String#frontPadOrTruncate(int, char)
-	 */
-	public static char[] frontPadOrTruncate(char[] string, int length, char c) {
-		int stringLength = string.length;
-		if (stringLength == length) {
-			return string;
-		}
-		if (stringLength > length) {
-			char[] result = new char[length];
-			System.arraycopy(string, stringLength - length, result, 0, length);
-			return result;
-		}
-		return frontPad_(string, length, c);
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, only the last part of the string is returned.
-	 * If it is shorter than the specified length, it is padded with the 
-	 * specified character at the front.
-	 * String#frontPadOrTruncateOn(int, char, Writer)
-	 */
-	public static void frontPadOrTruncateOn(char[] string, int length, char c, Writer writer) {
-		int stringLength = string.length;
-		if (stringLength == length) {
-			writeStringOn(string, writer);
-		} else if (stringLength > length) {
-			writeStringOn(string, stringLength - length, length, writer);
-		} else {
-			frontPadOn_(string, length, c, writer);
-		}
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, only the last part of the string is returned.
-	 * If it is shorter than the specified length, it is padded with the 
-	 * specified character at the front.
-	 * String#frontPadOrTruncateOn(int, char, StringBuffer)
-	 */
-	public static void frontPadOrTruncateOn(char[] string, int length, char c, StringBuffer sb) {
-		int stringLength = string.length;
-		if (stringLength == length) {
-			sb.append(string);
-		} else if (stringLength > length) {
-			sb.append(string, stringLength - length, length);
-		} else {
-			frontPadOn_(string, length, c, sb);
-		}
-	}
-
-	/**
-	 * Pad or truncate the specified string to the specified length.
-	 * If the string is already the specified length, it is returned unchanged.
-	 * If it is longer than the specified length, only the last part of the string is returned.
-	 * If it is shorter than the specified length, it is padded with the 
-	 * specified character at the front.
-	 * String#frontPadOrTruncateOn(int, char, StringBuilder)
-	 */
-	public static void frontPadOrTruncateOn(char[] string, int length, char c, StringBuilder sb) {
-		int stringLength = string.length;
-		if (stringLength == length) {
-			sb.append(string);
-		} else if (stringLength > length) {
-			sb.append(string, stringLength - length, length);
-		} else {
-			frontPadOn_(string, length, c, sb);
-		}
-	}
-
-	/*
-	 * Front-pad the specified string without validating the parms.
-	 */
-	private static String frontPad_(String string, int length, char c) {
-		return new String(frontPad_(string.toCharArray(), length, c));
-	}
-
-	/*
-	 * Zero-pad the specified string without validating the parms.
-	 */
-	private static char[] frontPad_(char[] string, int length, char c) {
-		char[] result = new char[length];
-		int stringLength = string.length;
-		int padLength = length - stringLength;
-		System.arraycopy(string, 0, result, padLength, stringLength);
-		Arrays.fill(result, 0, padLength, c);
-		return result;
-	}
-
-	/*
-	 * Pad the specified string without validating the parms.
-	 */
-	private static void frontPadOn_(String string, int length, char c, Writer writer) {
-		fill_(string, length, c, writer);
-		writeStringOn(string, writer);
-	}
-
-	/*
-	 * Pad the specified string without validating the parms.
-	 */
-	private static void frontPadOn_(char[] string, int length, char c, Writer writer) {
-		fill_(string, length, c, writer);
-		writeStringOn(string, writer);
-	}
-
-	/*
-	 * Pad the specified string without validating the parms.
-	 */
-	private static void frontPadOn_(String string, int length, char c, StringBuffer sb) {
-		fill_(string, length, c, sb);
-		sb.append(string);
-	}
-
-	/*
-	 * Pad the specified string without validating the parms.
-	 */
-	private static void frontPadOn_(char[] string, int length, char c, StringBuffer sb) {
-		fill_(string, length, c, sb);
-		sb.append(string);
-	}
-
-	/*
-	 * Pad the specified string without validating the parms.
-	 */
-	private static void frontPadOn_(String string, int length, char c, StringBuilder sb) {
-		fill_(string, length, c, sb);
-		sb.append(string);
-	}
-
-	/*
-	 * Pad the specified string without validating the parms.
-	 */
-	private static void frontPadOn_(char[] string, int length, char c, StringBuilder sb) {
-		fill_(string, length, c, sb);
-		sb.append(string);
-	}
-
-
-	// ********** delimiting/quoting **********
-
-	/**
-	 * Delimit the specified string with double quotes.
-	 * Escape any occurrences of a double quote in the string with another
-	 * double quote.
-	 */
-	public static String quote(String string) {
-		return delimit(string, QUOTE);
-	}
-
-	/**
-	 * Delimit the specified string with double quotes.
-	 * Escape any occurrences of a double quote in the string with another
-	 * double quote.
-	 */
-	public static void quoteOn(String string, Writer writer) {
-		delimitOn(string, QUOTE, writer);
-	}
-
-	/**
-	 * Delimit the specified string with double quotes.
-	 * Escape any occurrences of a double quote in the string with another
-	 * double quote.
-	 */
-	public static void quoteOn(String string, StringBuffer sb) {
-		delimitOn(string, QUOTE, sb);
-	}
-
-	/**
-	 * Delimit the specified string with double quotes.
-	 * Escape any occurrences of a double quote in the string with another
-	 * double quote.
-	 */
-	public static void quoteOn(String string, StringBuilder sb) {
-		delimitOn(string, QUOTE, sb);
-	}
-
-	/**
-	 * Delimit each of the specified strings with double quotes.
-	 * Escape any occurrences of a double quote in a string with another
-	 * double quote.
-	 */
-	public static Iterator<String> quote(Iterator<String> strings) {
-		return delimit(strings, QUOTE);
-	}
-
-	/**
-	 * Delimit the specified string with the specified delimiter; i.e. put a copy of
-	 * the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of the delimiter in the string with another delimiter.
-	 */
-	public static String delimit(String string, char delimiter) {
-		return new String(delimit(string.toCharArray(), delimiter));
-	}
-
-	/**
-	 * Delimit the specified string with the specified delimiter; i.e. put a copy of
-	 * the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of the delimiter in the string with another delimiter.
-	 */
-	public static void delimitOn(String string, char delimiter, Writer writer) {
-		delimitOn(string.toCharArray(), delimiter, writer);
-	}
-
-	/**
-	 * Delimit the specified string with the specified delimiter; i.e. put a copy of
-	 * the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of the delimiter in the string with another delimiter.
-	 */
-	public static void delimitOn(String string, char delimiter, StringBuffer sb) {
-		delimitOn(string.toCharArray(), delimiter, sb);
-	}
-
-	/**
-	 * Delimit the specified string with the specified delimiter; i.e. put a copy of
-	 * the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of the delimiter in the string with another delimiter.
-	 */
-	public static void delimitOn(String string, char delimiter, StringBuilder sb) {
-		delimitOn(string.toCharArray(), delimiter, sb);
-	}
-
-	/**
-	 * Delimit each of the specified strings with the specified delimiter; i.e. put a
-	 * copy of the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of the delimiter in a string with another delimiter.
-	 */
-	public static Iterator<String> delimit(Iterator<String> strings, final char delimiter) {
-		return new TransformationIterator<String, String>(strings) {
-			@Override
-			protected String transform(String string) {
-				return StringTools.delimit(string, delimiter);
-			}
-		};
-	}
-
-	/**
-	 * Delimit the specified string with the specified delimiter; i.e. put a copy of
-	 * the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of a single-character delimiter in the string with
-	 * another delimiter.
-	 */
-	public static String delimit(String string, String delimiter) {
-		if (delimiter.length() == 1) {
-			return delimit(string, delimiter.charAt(0));
-		}
-		return new String(delimit(string.toCharArray(), delimiter.toCharArray()));
-	}
-
-	/**
-	 * Delimit the specified string with the specified delimiter; i.e. put a copy of
-	 * the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of a single-character delimiter in the string with
-	 * another delimiter.
-	 */
-	public static void delimitOn(String string, String delimiter, Writer writer) {
-		if (delimiter.length() == 1) {
-			delimitOn(string, delimiter.charAt(0), writer);
-		} else {
-			delimitOn(string.toCharArray(), delimiter.toCharArray(), writer);
-		}
-	}
-
-	/**
-	 * Delimit the specified string with the specified delimiter; i.e. put a copy of
-	 * the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of a single-character delimiter in the string with
-	 * another delimiter.
-	 */
-	public static void delimitOn(String string, String delimiter, StringBuffer sb) {
-		if (delimiter.length() == 1) {
-			delimitOn(string, delimiter.charAt(0), sb);
-		} else {
-			delimitOn(string.toCharArray(), delimiter.toCharArray(), sb);
-		}
-	}
-
-	/**
-	 * Delimit the specified string with the specified delimiter; i.e. put a copy of
-	 * the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of a single-character delimiter in the string with
-	 * another delimiter.
-	 */
-	public static void delimitOn(String string, String delimiter, StringBuilder sb) {
-		if (delimiter.length() == 1) {
-			delimitOn(string, delimiter.charAt(0), sb);
-		} else {
-			delimitOn(string.toCharArray(), delimiter.toCharArray(), sb);
-		}
-	}
-
-	/**
-	 * Delimit each of the specified strings with the specified delimiter; i.e. put a
-	 * copy of the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of a single-character delimiter in a string with
-	 * another delimiter.
-	 */
-	public static Iterator<String> delimit(Iterator<String> strings, final String delimiter) {
-		if (delimiter.length() == 1) {
-			return delimit(strings, delimiter.charAt(0));
-		}
-		return new TransformationIterator<String, String>(strings) {
-			@Override
-			protected String transform(String string) {
-				return StringTools.delimit(string, delimiter);
-			}
-		};
-	}
-
-	/**
-	 * Delimit the specified string with double quotes.
-	 * Escape any occurrences of a double quote in the string with another
-	 * double quote.
-	 */
-	public static char[] quote(char[] string) {
-		return delimit(string, QUOTE);
-	}
-
-	/**
-	 * Delimit the specified string with double quotes.
-	 * Escape any occurrences of a double quote in the string with another
-	 * double quote.
-	 */
-	public static void quoteOn(char[] string, Writer writer) {
-		delimitOn(string, QUOTE, writer);
-	}
-
-	/**
-	 * Delimit the specified string with double quotes.
-	 * Escape any occurrences of a double quote in the string with another
-	 * double quote.
-	 */
-	public static void quoteOn(char[] string, StringBuffer sb) {
-		delimitOn(string, QUOTE, sb);
-	}
-
-	/**
-	 * Delimit the specified string with double quotes.
-	 * Escape any occurrences of a double quote in the string with another
-	 * double quote.
-	 */
-	public static void quoteOn(char[] string, StringBuilder sb) {
-		delimitOn(string, QUOTE, sb);
-	}
-
-	/**
-	 * Delimit each of the specified strings with double quotes.
-	 * Escape any occurrences of a double quote in a string with another
-	 * double quote.
-	 */
-	// cannot name method simply 'quote' because of type-erasure...
-	public static Iterator<char[]> quoteCharArrays(Iterator<char[]> strings) {
-		return delimitCharArrays(strings, QUOTE);
-	}
-
-	/**
-	 * Delimit the specified string with the specified delimiter; i.e. put a copy of
-	 * the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of the delimiter in the string with another delimiter.
-	 */
-	public static char[] delimit(char[] string, char delimiter) {
-		StringBuilder sb = new StringBuilder(string.length + 2);
-		delimitOn(string, delimiter, sb);
-		return convertToCharArray(sb);
-	}
-
-	/**
-	 * Delimit the specified string with the specified delimiter; i.e. put a copy of
-	 * the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of the delimiter in the string with another delimiter.
-	 */
-	public static void delimitOn(char[] string, char delimiter, Writer writer) {
-		writeCharOn(delimiter, writer);
-		writeStringOn(string, delimiter, writer);
-		writeCharOn(delimiter, writer);
-	}
-
-	/**
-	 * Delimit the specified string with the specified delimiter; i.e. put a copy of
-	 * the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of the delimiter in the string with another delimiter.
-	 */
-	public static void delimitOn(char[] string, char delimiter, StringBuffer sb) {
-		sb.append(delimiter);
-		for (char c : string) {
-			if (c == delimiter) {
-				sb.append(c);
-			}
-			sb.append(c);
-		}
-		sb.append(delimiter);
-	}
-
-	/**
-	 * Delimit the specified string with the specified delimiter; i.e. put a copy of
-	 * the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of the delimiter in the string with another delimiter.
-	 */
-	public static void delimitOn(char[] string, char delimiter, StringBuilder sb) {
-		sb.append(delimiter);
-		for (char c : string) {
-			if (c == delimiter) {
-				sb.append(c);
-			}
-			sb.append(c);
-		}
-		sb.append(delimiter);
-	}
-
-	/**
-	 * Delimit each of the specified strings with the specified delimiter; i.e. put a
-	 * copy of the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of the delimiter in a string with another delimiter.
-	 */
-	// cannot name method simply 'delimit' because of type-erasure...
-	public static Iterator<char[]> delimitCharArrays(Iterator<char[]> strings, final char delimiter) {
-		return new TransformationIterator<char[], char[]>(strings) {
-			@Override
-			protected char[] transform(char[] string) {
-				return StringTools.delimit(string, delimiter);
-			}
-		};
-	}
-
-	/**
-	 * Delimit the specified string with the specified delimiter; i.e. put a copy of
-	 * the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of a single-character delimiter in the string with
-	 * another delimiter.
-	 */
-	public static char[] delimit(char[] string, char[] delimiter) {
-		int delimiterLength = delimiter.length;
-		if (delimiterLength == 1) {
-			return delimit(string, delimiter[0]);
-		}
-		int stringLength = string.length;
-		char[] result = new char[stringLength+(2*delimiterLength)];
-		System.arraycopy(delimiter, 0, result, 0, delimiterLength);
-		System.arraycopy(string, 0, result, delimiterLength, stringLength);
-		System.arraycopy(delimiter, 0, result, stringLength+delimiterLength, delimiterLength);
-		return result;
-	}
-
-	/**
-	 * Delimit the specified string with the specified delimiter; i.e. put a copy of
-	 * the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of a single-character delimiter in the string with
-	 * another delimiter.
-	 */
-	public static void delimitOn(char[] string, char[] delimiter, Writer writer) {
-		if (delimiter.length == 1) {
-			delimitOn(string, delimiter[0], writer);
-		} else {
-			writeStringOn(delimiter, writer);
-			writeStringOn(string, writer);
-			writeStringOn(delimiter, writer);
-		}
-	}
-
-	/**
-	 * Delimit the specified string with the specified delimiter; i.e. put a copy of
-	 * the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of a single-character delimiter in the string with
-	 * another delimiter.
-	 */
-	public static void delimitOn(char[] string, char[] delimiter, StringBuffer sb) {
-		if (delimiter.length == 1) {
-			delimitOn(string, delimiter[0], sb);
-		} else {
-			sb.append(delimiter);
-			sb.append(string);
-			sb.append(delimiter);
-		}
-	}
-
-	/**
-	 * Delimit the specified string with the specified delimiter; i.e. put a copy of
-	 * the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of a single-character delimiter in the string with
-	 * another delimiter.
-	 */
-	public static void delimitOn(char[] string, char[] delimiter, StringBuilder sb) {
-		if (delimiter.length == 1) {
-			delimitOn(string, delimiter[0], sb);
-		} else {
-			sb.append(delimiter);
-			sb.append(string);
-			sb.append(delimiter);
-		}
-	}
-
-	/**
-	 * Delimit each of the specified strings with the specified delimiter; i.e. put a
-	 * copy of the delimiter at the front and back of the resulting string.
-	 * Escape any occurrences of a single-character delimiter in a string with
-	 * another delimiter.
-	 */
-	// cannot name method simply 'delimit' because of type-erasure...
-	public static Iterator<char[]> delimitCharArrays(Iterator<char[]> strings, final char[] delimiter) {
-		return new TransformationIterator<char[], char[]>(strings) {
-			@Override
-			protected char[] transform(char[] string) {
-				return StringTools.delimit(string, delimiter);
-			}
-		};
-	}
-
-
-	// ********** delimiting queries **********
-
-	/**
-	 * Return whether the specified string is quoted: "\"foo\"".
-	 */
-	public static boolean stringIsQuoted(String string) {
-		return stringIsDelimited(string, QUOTE);
-	}
-
-	/**
-	 * Return whether the specified string is parenthetical: "(foo)".
-	 */
-	public static boolean stringIsParenthetical(String string) {
-		return stringIsDelimited(string, OPEN_PARENTHESIS, CLOSE_PARENTHESIS);
-	}
-
-	/**
-	 * Return whether the specified string is bracketed: "[foo]".
-	 */
-	public static boolean stringIsBracketed(String string) {
-		return stringIsDelimited(string, OPEN_BRACKET, CLOSE_BRACKET);
-	}
-
-	/**
-	 * Return whether the specified string is braced: "{foo}".
-	 */
-	public static boolean stringIsBraced(String string) {
-		return stringIsDelimited(string, OPEN_BRACE, CLOSE_BRACE);
-	}
-
-	/**
-	 * Return whether the specified string is chevroned: "<foo>".
-	 */
-	public static boolean stringIsChevroned(String string) {
-		return stringIsDelimited(string, OPEN_CHEVRON, CLOSE_CHEVRON);
-	}
-
-	/**
-	 * Return whether the specified string is delimited by the specified
-	 * character.
-	 */
-	public static boolean stringIsDelimited(String string, char c) {
-		return stringIsDelimited(string, c, c);
-	}
-
-	/**
-	 * Return whether the specified string is delimited by the specified
-	 * characters.
-	 */
-	public static boolean stringIsDelimited(String string, char start, char end) {
-		int len = string.length();
-		if (len < 2) {
-			return false;
-		}
-		return stringIsDelimited(string.toCharArray(), start, end, len);
-	}
-
-	/**
-	 * Return whether the specified string is quoted: "\"foo\"".
-	 */
-	public static boolean stringIsQuoted(char[] string) {
-		return stringIsDelimited(string, QUOTE);
-	}
-
-	/**
-	 * Return whether the specified string is parenthetical: "(foo)".
-	 */
-	public static boolean stringIsParenthetical(char[] string) {
-		return stringIsDelimited(string, OPEN_PARENTHESIS, CLOSE_PARENTHESIS);
-	}
-
-	/**
-	 * Return whether the specified string is bracketed: "[foo]".
-	 */
-	public static boolean stringIsBracketed(char[] string) {
-		return stringIsDelimited(string, OPEN_BRACKET, CLOSE_BRACKET);
-	}
-
-	/**
-	 * Return whether the specified string is braced: "{foo}".
-	 */
-	public static boolean stringIsBraced(char[] string) {
-		return stringIsDelimited(string, OPEN_BRACE, CLOSE_BRACE);
-	}
-
-	/**
-	 * Return whether the specified string is chevroned: "<foo>".
-	 */
-	public static boolean stringIsChevroned(char[] string) {
-		return stringIsDelimited(string, OPEN_CHEVRON, CLOSE_CHEVRON);
-	}
-
-	/**
-	 * Return whether the specified string is delimited by the specified
-	 * character.
-	 */
-	public static boolean stringIsDelimited(char[] string, char c) {
-		return stringIsDelimited(string, c, c);
-	}
-
-	/**
-	 * Return whether the specified string is delimited by the specified
-	 * characters.
-	 */
-	public static boolean stringIsDelimited(char[] string, char start, char end) {
-		int len = string.length;
-		if (len < 2) {
-			return false;
-		}
-		return stringIsDelimited(string, start, end, len);
-	}
-
-	private static boolean stringIsDelimited(char[] s, char start, char end, int len) {
-		return (s[0] == start) && (s[len - 1] == end);
-	}
-
-
-	// ********** undelimiting **********
-
-	/**
-	 * Remove the delimiters from the specified string, removing any escape
-	 * characters. Throw an IllegalArgumentException if the string is too short
-	 * to undelimit (i.e. length < 2).
-	 */
-	public static String undelimit(String string) {
-		int len = string.length() - 2;
-		if (len < 0) {
-			throw new IllegalArgumentException("invalid string: \"" + string + '"'); //$NON-NLS-1$
-		}
-		if (len == 0) {
-			return EMPTY_STRING;
-		}
-		return new String(undelimit_(string.toCharArray(), len));
-	}
-
-	/**
-	 * Remove the first and last count characters from the specified string.
-	 * If the string is too short to be undelimited, throw an
-	 * IllegalArgumentException.
-	 * Use this method to undelimit strings that do not escape embedded
-	 * delimiters.
-	 */
-	public static String undelimit(String string, int count) {
-		int len = string.length() - (2 * count);
-		if (len < 0) {
-			throw new IllegalArgumentException("invalid string: \"" + string + '"'); //$NON-NLS-1$
-		}
-		if (len == 0) {
-			return EMPTY_STRING;
-		}
-		return new String(undelimit(string.toCharArray(), len, count));
-	}
-
-	/**
-	 * Remove the delimiters from the specified string, removing any escape
-	 * characters. Throw an IllegalArgumentException if the string is too short
-	 * to undelimit (i.e. length < 2).
-	 */
-	public static char[] undelimit(char[] string) {
-		int len = string.length - 2;
-		if (len < 0) {
-			throw new IllegalArgumentException("invalid string: \"" + new String(string) + '"'); //$NON-NLS-1$
-		}
-		if (len == 0) {
-			return EMPTY_CHAR_ARRAY;
-		}
-		return undelimit_(string, len);
-	}
-
-	private static char[] undelimit_(char[] string, int length) {
-		StringBuilder sb = new StringBuilder(length);
-		undelimitOn_(string, sb);
-		return convertToCharArray(sb);
-	}
-
-	/**
-	 * Remove the first and last count characters from the specified string.
-	 * If the string is too short to be undelimited, throw an
-	 * IllegalArgumentException.
-	 * Use this method to undelimit strings that do not escape embedded
-	 * delimiters.
-	 */
-	public static char[] undelimit(char[] string, int count) {
-		int len = string.length - (2 * count);
-		if (len < 0) {
-			throw new IllegalArgumentException("invalid string: \"" + new String(string) + '"'); //$NON-NLS-1$
-		}
-		if (len == 0) {
-			return EMPTY_CHAR_ARRAY;
-		}
-		return undelimit(string, len, count);
-	}
-
-	private static char[] undelimit(char[] string, int len, int count) {
-		char[] result = new char[len];
-		System.arraycopy(string, count, result, 0, len);
-		return result;
-	}
-
-	/**
-	 * Remove the delimiters from the specified string, removing any escape
-	 * characters. Throw an IllegalArgumentException if the string is too short
-	 * to undelimit (i.e. length < 2).
-	 */
-	public static void undelimitOn(String string, Writer writer) {
-		undelimitOn(string.toCharArray(), writer);
-	}
-
-	/**
-	 * Remove the first and last count characters from the specified string.
-	 * If the string is too short to be undelimited, throw an
-	 * IllegalArgumentException.
-	 * Use this method to undelimit strings that do not escape embedded
-	 * delimiters.
-	 */
-	public static void undelimitOn(String string, int count, Writer writer) {
-		int len = string.length() - (2 * count);
-		if (len < 0) {
-			throw new IllegalArgumentException("invalid string: \"" + string + '"'); //$NON-NLS-1$
-		}
-		if (len == 0) {
-			return;
-		}
-		writeStringOn(string, count, len, writer);
-	}
-
-	/**
-	 * Remove the delimiters from the specified string, removing any escape
-	 * characters. Throw an IllegalArgumentException if the string is too short
-	 * to undelimit (i.e. length < 2).
-	 */
-	public static void undelimitOn(String string, StringBuffer sb) {
-		undelimitOn(string.toCharArray(), sb);
-	}
-
-	/**
-	 * Remove the first and last count characters from the specified string.
-	 * If the string is too short to be undelimited, throw an
-	 * IllegalArgumentException.
-	 * Use this method to undelimit strings that do not escape embedded
-	 * delimiters.
-	 */
-	public static void undelimitOn(String string, int count, StringBuffer sb) {
-		int len = string.length() - (2 * count);
-		if (len < 0) {
-			throw new IllegalArgumentException("invalid string: \"" + string + '"'); //$NON-NLS-1$
-		}
-		if (len == 0) {
-			return;
-		}
-		sb.append(string, count, count + len);
-	}
-
-	/**
-	 * Remove the delimiters from the specified string, removing any escape
-	 * characters. Throw an IllegalArgumentException if the string is too short
-	 * to undelimit (i.e. length < 2).
-	 */
-	public static void undelimitOn(String string, StringBuilder sb) {
-		undelimitOn(string.toCharArray(), sb);
-	}
-
-	/**
-	 * Remove the first and last count characters from the specified string.
-	 * If the string is too short to be undelimited, throw an
-	 * IllegalArgumentException.
-	 * Use this method to undelimit strings that do not escape embedded
-	 * delimiters.
-	 */
-	public static void undelimitOn(String string, int count, StringBuilder sb) {
-		int len = string.length() - (2 * count);
-		if (len < 0) {
-			throw new IllegalArgumentException("invalid string: \"" + string + '"'); //$NON-NLS-1$
-		}
-		if (len == 0) {
-			return;
-		}
-		sb.append(string, count, count + len);
-	}
-
-	/**
-	 * Remove the delimiters from the specified string, removing any escape
-	 * characters. Throw an IllegalArgumentException if the string is too short
-	 * to undelimit (i.e. length < 2).
-	 */
-	public static void undelimitOn(char[] string, Writer writer) {
-		int len = string.length - 2;
-		if (len < 0) {
-			throw new IllegalArgumentException("invalid string: \"" + new String(string) + '"'); //$NON-NLS-1$
-		}
-		if (len == 0) {
-			return;
-		}
-		undelimitOn_(string, writer);
-	}
-
-	/**
-	 * pre-condition: string is at least 3 characters long
-	 */
-	private static void undelimitOn_(char[] string, Writer writer) {
-		char delimiter = string[0];  // the first char is the delimiter
-		char c = string[0];
-		char next = string[1];
-		int i = 1;
-		int last = string.length - 1;
-		do {
-			c = next;
-			writeCharOn(c, writer);
-			i++;
-			next = string[i];
-			if (c == delimiter) {
-				if ((next != delimiter) || (i == last)) {
-					// an embedded delimiter must be followed by another delimiter
-					return;
-				}
-				i++;
-				next = string[i];
-			}
-		} while (i != last);
-	}
-
-	/**
-	 * Remove the first and last count characters from the specified string.
-	 * If the string is too short to be undelimited, throw an
-	 * IllegalArgumentException.
-	 * Use this method to undelimit strings that do not escape embedded
-	 * delimiters.
-	 */
-	public static void undelimitOn(char[] string, int count, Writer writer) {
-		int len = string.length - (2 * count);
-		if (len < 0) {
-			throw new IllegalArgumentException("invalid string: \"" + new String(string) + '"'); //$NON-NLS-1$
-		}
-		if (len == 0) {
-			return;
-		}
-		writeStringOn(string, count, len, writer);
-	}
-
-	/**
-	 * Remove the delimiters from the specified string, removing any escape
-	 * characters. Throw an IllegalArgumentException if the string is too short
-	 * to undelimit (i.e. length < 2).
-	 */
-	public static void undelimitOn(char[] string, StringBuffer sb) {
-		int len = string.length - 2;
-		if (len < 0) {
-			throw new IllegalArgumentException("invalid string: \"" + new String(string) + '"'); //$NON-NLS-1$
-		}
-		if (len == 0) {
-			return;
-		}
-		undelimitOn_(string, sb);
-	}
-
-	/**
-	 * pre-condition: string is at least 3 characters long
-	 */
-	private static void undelimitOn_(char[] string, StringBuffer sb) {
-		char delimiter = string[0];  // the first char is the delimiter
-		char c = string[0];
-		char next = string[1];
-		int i = 1;
-		int last = string.length - 1;
-		do {
-			c = next;
-			sb.append(c);
-			i++;
-			next = string[i];
-			if (c == delimiter) {
-				if ((next != delimiter) || (i == last)) {
-					// an embedded delimiter must be followed by another delimiter
-					return;
-				}
-				i++;
-				next = string[i];
-			}
-		} while (i != last);
-	}
-
-	/**
-	 * Remove the first and last count characters from the specified string.
-	 * If the string is too short to be undelimited, throw an
-	 * IllegalArgumentException.
-	 * Use this method to undelimit strings that do not escape embedded
-	 * delimiters.
-	 */
-	public static void undelimitOn(char[] string, int count, StringBuffer sb) {
-		int len = string.length - (2 * count);
-		if (len < 0) {
-			throw new IllegalArgumentException("invalid string: \"" + new String(string) + '"'); //$NON-NLS-1$
-		}
-		if (len == 0) {
-			return;
-		}
-		sb.append(string, count, len);
-	}
-
-	/**
-	 * Remove the delimiters from the specified string, removing any escape
-	 * characters. Throw an IllegalArgumentException if the string is too short
-	 * to undelimit (i.e. length < 2).
-	 */
-	public static void undelimitOn(char[] string, StringBuilder sb) {
-		int len = string.length - 2;
-		if (len < 0) {
-			throw new IllegalArgumentException("invalid string: \"" + new String(string) + '"'); //$NON-NLS-1$
-		}
-		if (len == 0) {
-			return;
-		}
-		undelimitOn_(string, sb);
-	}
-
-	/**
-	 * pre-condition: string is at least 3 characters long
-	 */
-	private static void undelimitOn_(char[] string, StringBuilder sb) {
-		char delimiter = string[0];  // the first char is the delimiter
-		char c = string[0];
-		char next = string[1];
-		int i = 1;
-		int last = string.length - 1;
-		do {
-			c = next;
-			sb.append(c);
-			i++;
-			next = string[i];
-			if (c == delimiter) {
-				if ((next != delimiter) || (i == last)) {
-					// an embedded delimiter must be followed by another delimiter
-					return;
-				}
-				i++;
-				next = string[i];
-			}
-		} while (i != last);
-	}
-
-	/**
-	 * Remove the first and last count characters from the specified string.
-	 * If the string is too short to be undelimited, throw an
-	 * IllegalArgumentException.
-	 * Use this method to undelimit strings that do not escape embedded
-	 * delimiters.
-	 */
-	public static void undelimitOn(char[] string, int count, StringBuilder sb) {
-		int len = string.length - (2 * count);
-		if (len < 0) {
-			throw new IllegalArgumentException("invalid string: \"" + new String(string) + '"'); //$NON-NLS-1$
-		}
-		if (len == 0) {
-			return;
-		}
-		sb.append(string, count, len);
-	}
-
-
-	// ********** removing characters **********
-
-	/**
-	 * Remove the first occurrence of the specified character
-	 * from the specified string and return the result.
-	 * String#removeFirstOccurrence(char)
-	 */
-	public static String removeFirstOccurrence(String string, char c) {
-		int index = string.indexOf(c);
-		if (index == -1) {
-			// character not found
-			return string;
-		}
-		if (index == 0) {
-			// character found at the front of string
-			return string.substring(1);
-		}
-		int last = string.length() - 1;
-		if (index == last) {
-			// character found at the end of string
-			return string.substring(0, last);
-		}
-		// character found somewhere in the middle of the string
-		return string.substring(0, index).concat(string.substring(index + 1));
-	}
-
-	/**
-	 * Remove the first occurrence of the specified character
-	 * from the specified string and print the result on the specified stream.
-	 * String#removeFirstOccurrenceOn(char, Writer)
-	 */
-	public static void removeFirstOccurrenceOn(String string, char c, Writer writer) {
-		int index = string.indexOf(c);
-		if (index == -1) {
-			writeStringOn(string, writer);
-		} else {
-			removeCharAtIndexOn(string.toCharArray(), index, writer);
-		}
-	}
-
-	/**
-	 * Remove the first occurrence of the specified character
-	 * from the specified string and print the result on the specified stream.
-	 * String#removeFirstOccurrenceOn(char, StringBuffer)
-	 */
-	public static void removeFirstOccurrenceOn(String string, char c, StringBuffer sb) {
-		int index = string.indexOf(c);
-		if (index == -1) {
-			sb.append(string);
-		} else {
-			removeCharAtIndexOn(string.toCharArray(), index, sb);
-		}
-	}
-
-	/**
-	 * Remove the first occurrence of the specified character
-	 * from the specified string and print the result on the specified stream.
-	 * String#removeFirstOccurrenceOn(char, StringBuilder)
-	 */
-	public static void removeFirstOccurrenceOn(String string, char c, StringBuilder sb) {
-		int index = string.indexOf(c);
-		if (index == -1) {
-			sb.append(string);
-		} else {
-			removeCharAtIndexOn(string.toCharArray(), index, sb);
-		}
-	}
-
-	/**
-	 * Remove the first occurrence of the specified character
-	 * from the specified string and return the result.
-	 * String#removeFirstOccurrence(char)
-	 */
-	public static char[] removeFirstOccurrence(char[] string, char c) {
-		int index = CollectionTools.indexOf(string, c);
-		if (index == -1) {
-			// character not found
-			return string;
-		}
-		int last = string.length - 1;
-		char[] result = new char[last];
-		if (index == 0) {
-			// character found at the front of string
-			System.arraycopy(string, 1, result, 0, last);
-		} else if (index == last) {
-			// character found at the end of string
-			System.arraycopy(string, 0, result, 0, last);
-		} else {
-			// character found somewhere in the middle of the string
-			System.arraycopy(string, 0, result, 0, index);
-			System.arraycopy(string, index + 1, result, index, last - index);
-		}
-		return result;
-	}
-
-	/**
-	 * Remove the first occurrence of the specified character
-	 * from the specified string and print the result on the specified stream.
-	 * String#removeFirstOccurrenceOn(char, Writer)
-	 */
-	public static void removeFirstOccurrenceOn(char[] string, char c, Writer writer) {
-		int index = CollectionTools.indexOf(string, c);
-		if (index == -1) {
-			writeStringOn(string, writer);
-		} else {
-			removeCharAtIndexOn(string, index, writer);
-		}
-	}
-
-	private static void removeCharAtIndexOn(char[] string, int index, Writer writer) {
-		int last = string.length - 1;
-		if (index == 0) {
-			// character found at the front of string
-			writeStringOn(string, 1, last, writer);
-		} else if (index == last) {
-			// character found at the end of string
-			writeStringOn(string, 0, last, writer);
-		} else {
-			// character found somewhere in the middle of the string
-			writeStringOn(string, 0, index, writer);
-			writeStringOn(string, index + 1, last - index, writer);
-		}
-	}
-
-	/**
-	 * Remove the first occurrence of the specified character
-	 * from the specified string and print the result on the specified stream.
-	 * String#removeFirstOccurrenceOn(char, StringBuffer)
-	 */
-	public static void removeFirstOccurrenceOn(char[] string, char c, StringBuffer sb) {
-		int index = CollectionTools.indexOf(string, c);
-		if (index == -1) {
-			sb.append(string);
-		} else {
-			removeCharAtIndexOn(string, index, sb);
-		}
-	}
-
-	private static void removeCharAtIndexOn(char[] string, int index, StringBuffer sb) {
-		int last = string.length - 1;
-		if (index == 0) {
-			// character found at the front of string
-			sb.append(string, 1, last);
-		} else if (index == last) {
-			// character found at the end of string
-			sb.append(string, 0, last);
-		} else {
-			// character found somewhere in the middle of the string
-			sb.append(string, 0, index);
-			sb.append(string, index + 1, last - index);
-		}
-	}
-
-	/**
-	 * Remove the first occurrence of the specified character
-	 * from the specified string and print the result on the specified stream.
-	 * String#removeFirstOccurrenceOn(char, StringBuilder)
-	 */
-	public static void removeFirstOccurrenceOn(char[] string, char c, StringBuilder sb) {
-		int index = CollectionTools.indexOf(string, c);
-		if (index == -1) {
-			sb.append(string);
-		} else {
-			removeCharAtIndexOn(string, index, sb);
-		}
-	}
-
-	private static void removeCharAtIndexOn(char[] string, int index, StringBuilder sb) {
-		int last = string.length - 1;
-		if (index == 0) {
-			// character found at the front of string
-			sb.append(string, 1, last);
-		} else if (index == last) {
-			// character found at the end of string
-			sb.append(string, 0, last);
-		} else {
-			// character found somewhere in the middle of the string
-			sb.append(string, 0, index);
-			sb.append(string, index + 1, last - index);
-		}
-	}
-
-	/**
-	 * Remove all occurrences of the specified character
-	 * from the specified string and return the result.
-	 * String#removeAllOccurrences(char)
-	 */
-	public static String removeAllOccurrences(String string, char c) {
-		int first = string.indexOf(c);
-		return (first == -1) ? string : new String(removeAllOccurrences_(string.toCharArray(), c, first));
-	}
-
-	/**
-	 * Remove all occurrences of the specified character
-	 * from the specified string and write the result to the specified stream.
-	 * String#removeAllOccurrencesOn(char, Writer)
-	 */
-	public static void removeAllOccurrencesOn(String string, char c, Writer writer) {
-		int first = string.indexOf(c);
-		if (first == -1) {
-			writeStringOn(string, writer);
-		} else {
-			removeAllOccurrencesOn_(string.toCharArray(), c, first, writer);
-		}
-	}
-
-	/**
-	 * Remove all occurrences of the specified character
-	 * from the specified string and write the result to the specified stream.
-	 * String#removeAllOccurrencesOn(char, StringBuffer)
-	 */
-	public static void removeAllOccurrencesOn(String string, char c, StringBuffer sb) {
-		int first = string.indexOf(c);
-		if (first == -1) {
-			sb.append(string);
-		} else {
-			removeAllOccurrencesOn_(string.toCharArray(), c, first, sb);
-		}
-	}
-
-	/**
-	 * Remove all occurrences of the specified character
-	 * from the specified string and write the result to the specified stream.
-	 * String#removeAllOccurrencesOn(char, StringBuilder)
-	 */
-	public static void removeAllOccurrencesOn(String string, char c, StringBuilder sb) {
-		int first = string.indexOf(c);
-		if (first == -1) {
-			sb.append(string);
-		} else {
-			removeAllOccurrencesOn_(string.toCharArray(), c, first, sb);
-		}
-	}
-
-	/**
-	 * Remove all occurrences of the specified character
-	 * from the specified string and return the result.
-	 * String#removeAllOccurrences(char)
-	 */
-	public static char[] removeAllOccurrences(char[] string, char c) {
-		int first = CollectionTools.indexOf(string, c);
-		return (first == -1) ? string : removeAllOccurrences_(string, c, first);
-	}
-
-	/*
-	 * The index of the first matching character is passed in.
-	 */
-	private static char[] removeAllOccurrences_(char[] string, char c, int first) {
-		StringBuilder sb = new StringBuilder(string.length);
-		removeAllOccurrencesOn_(string, c, first, sb);
-		return convertToCharArray(sb);
-	}
-
-	/**
-	 * Remove all occurrences of the specified character
-	 * from the specified string and write the result to the
-	 * specified writer.
-	 * String#removeAllOccurrencesOn(char, Writer)
-	 */
-	public static void removeAllOccurrencesOn(char[] string, char c, Writer writer) {
-		int first = CollectionTools.indexOf(string, c);
-		if (first == -1) {
-			writeStringOn(string, writer);
-		} else {
-			removeAllOccurrencesOn_(string, c, first, writer);
-		}
-	}
-
-	/*
-	 * The index of the first matching character is passed in.
-	 */
-	private static void removeAllOccurrencesOn_(char[] string, char c, int first, Writer writer) {
-		writeStringOn(string, 0, first, writer);
-		int len = string.length;
-		for (int i = first; i < len; i++) {
-			char d = string[i];
-			if (d != c) {
-				writeCharOn(d, writer);
-			}
-		}
-	}
-
-	/**
-	 * Remove all occurrences of the specified character
-	 * from the specified string and append the result to the
-	 * specified string buffer.
-	 * String#removeAllOccurrencesOn(char, StringBuffer)
-	 */
-	public static void removeAllOccurrencesOn(char[] string, char c, StringBuffer sb) {
-		int first = CollectionTools.indexOf(string, c);
-		if (first == -1) {
-			sb.append(string);
-		} else {
-			removeAllOccurrencesOn_(string, c, first, sb);
-		}
-	}
-
-	/*
-	 * The index of the first matching character is passed in.
-	 */
-	private static void removeAllOccurrencesOn_(char[] string, char c, int first, StringBuffer sb) {
-		sb.append(string, 0, first);
-		int len = string.length;
-		for (int i = first; i < len; i++) {
-			char d = string[i];
-			if (d != c) {
-				sb.append(d);
-			}
-		}
-	}
-
-	/**
-	 * Remove all occurrences of the specified character
-	 * from the specified string and append the result to the
-	 * specified string builder.
-	 * String#removeAllOccurrencesOn(char, StringBuilder)
-	 */
-	public static void removeAllOccurrencesOn(char[] string, char c, StringBuilder sb) {
-		int first = CollectionTools.indexOf(string, c);
-		if (first == -1) {
-			sb.append(string);
-		} else {
-			removeAllOccurrencesOn_(string, c, first, sb);
-		}
-	}
-
-	/*
-	 * The index of the first matching character is passed in.
-	 */
-	private static void removeAllOccurrencesOn_(char[] string, char c, int first, StringBuilder sb) {
-		sb.append(string, 0, first);
-		int len = string.length;
-		for (int i = first; i < len; i++) {
-			char d = string[i];
-			if (d != c) {
-				sb.append(d);
-			}
-		}
-	}
-
-	/**
-	 * Remove all the spaces from the specified string and return the result.
-	 * String#removeAllSpaces()
-	 */
-	public static String removeAllSpaces(String string) {
-		return removeAllOccurrences(string, ' ');
-	}
-
-	/**
-	 * Remove all the spaces
-	 * from the specified string and write the result to the specified writer.
-	 * String#removeAllSpacesOn(Writer)
-	 */
-	public static void removeAllSpacesOn(String string, Writer writer) {
-		removeAllOccurrencesOn(string, ' ', writer);
-	}
-
-	/**
-	 * Remove all the spaces
-	 * from the specified string and write the result to the specified
-	 * string buffer.
-	 * String#removeAllSpacesOn(StringBuffer)
-	 */
-	public static void removeAllSpacesOn(String string, StringBuffer sb) {
-		removeAllOccurrencesOn(string, ' ', sb);
-	}
-
-	/**
-	 * Remove all the spaces
-	 * from the specified string and write the result to the specified
-	 * string builder.
-	 * String#removeAllSpacesOn(StringBuilder)
-	 */
-	public static void removeAllSpacesOn(String string, StringBuilder sb) {
-		removeAllOccurrencesOn(string, ' ', sb);
-	}
-
-	/**
-	 * Remove all the spaces from the specified string and return the result.
-	 * String#removeAllSpaces()
-	 */
-	public static char[] removeAllSpaces(char[] string) {
-		return removeAllOccurrences(string, ' ');
-	}
-
-	/**
-	 * Remove all the spaces
-	 * from the specified string and write the result to the
-	 * specified writer.
-	 * String#removeAllSpacesOn(Writer)
-	 */
-	public static void removeAllSpacesOn(char[] string, Writer writer) {
-		removeAllOccurrencesOn(string, ' ', writer);
-	}
-
-	/**
-	 * Remove all the spaces
-	 * from the specified string and append the result to the
-	 * specified string buffer.
-	 * String#removeAllSpacesOn(StringBuffer)
-	 */
-	public static void removeAllSpacesOn(char[] string, StringBuffer sb) {
-		removeAllOccurrencesOn(string, ' ', sb);
-	}
-
-	/**
-	 * Remove all the spaces
-	 * from the specified string and append the result to the
-	 * specified string builder.
-	 * String#removeAllSpacesOn(StringBuilder)
-	 */
-	public static void removeAllSpacesOn(char[] string, StringBuilder sb) {
-		removeAllOccurrencesOn(string, ' ', sb);
-	}
-
-	/**
-	 * Remove all the whitespace from the specified string and return the result.
-	 * String#removeAllWhitespace()
-	 */
-	public static String removeAllWhitespace(String string) {
-		char[] string2 = string.toCharArray();
-		int first = indexOfWhitespace_(string2);
-		return (first == -1) ? string : new String(removeAllWhitespace_(string2, first));
-	}
-
-	/**
-	 * Remove all the whitespace
-	 * from the specified string and append the result to the
-	 * specified writer.
-	 * String#removeAllWhitespaceOn(Writer)
-	 */
-	public static void removeAllWhitespaceOn(String string, Writer writer) {
-		char[] string2 = string.toCharArray();
-		int first = indexOfWhitespace_(string2);
-		if (first == -1) {
-			writeStringOn(string, writer);
-		} else {
-			removeAllWhitespaceOn_(string2, first, writer);
-		}
-	}
-
-	/**
-	 * Remove all the whitespace
-	 * from the specified string and append the result to the
-	 * specified string buffer.
-	 * String#removeAllWhitespaceOn(StringBuffer)
-	 */
-	public static void removeAllWhitespaceOn(String string, StringBuffer sb) {
-		char[] string2 = string.toCharArray();
-		int first = indexOfWhitespace_(string2);
-		if (first == -1) {
-			sb.append(string);
-		} else {
-			removeAllWhitespaceOn_(string2, first, sb);
-		}
-	}
-
-	/**
-	 * Remove all the whitespace
-	 * from the specified string and append the result to the
-	 * specified string builder.
-	 * String#removeAllWhitespaceOn(StringBuilder)
-	 */
-	public static void removeAllWhitespaceOn(String string, StringBuilder sb) {
-		char[] string2 = string.toCharArray();
-		int first = indexOfWhitespace_(string2);
-		if (first == -1) {
-			sb.append(string);
-		} else {
-			removeAllWhitespaceOn_(string2, first, sb);
-		}
-	}
-
-	/**
-	 * Remove all the whitespace from the specified string and return the result.
-	 * String#removeAllWhitespace()
-	 */
-	public static char[] removeAllWhitespace(char[] string) {
-		int first = indexOfWhitespace_(string);
-		return (first == -1) ? string : removeAllWhitespace_(string, first);
-	}
-
-	private static int indexOfWhitespace_(char[] string) {
-		int len = string.length;
-		for (int i = 0; i < len; i++) {
-			if (Character.isWhitespace(string[i])) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-	/*
-	 * The index of the first non-whitespace character is passed in.
-	 */
-	private static char[] removeAllWhitespace_(char[] string, int first) {
-		StringBuilder sb = new StringBuilder(string.length);
-		removeAllWhitespaceOn_(string, first, sb);
-		return convertToCharArray(sb);
-	}
-
-	/**
-	 * Remove all the whitespace
-	 * from the specified string and append the result to the
-	 * specified writer.
-	 * String#removeAllWhitespaceOn(Writer)
-	 */
-	public static void removeAllWhitespaceOn(char[] string, Writer writer) {
-		int first = indexOfWhitespace_(string);
-		if (first == -1) {
-			writeStringOn(string, writer);
-		} else {
-			removeAllWhitespaceOn_(string, first, writer);
-		}
-	}
-
-	/*
-	 * The index of the first non-whitespace character is passed in.
-	 */
-	private static void removeAllWhitespaceOn_(char[] string, int first, Writer writer) {
-		writeStringOn(string, 0, first, writer);
-		int len = string.length;
-		for (int i = first; i < len; i++) {
-			char c = string[i];
-			if ( ! Character.isWhitespace(c)) {
-				writeCharOn(c, writer);
-			}
-		}
-	}
-
-	/**
-	 * Remove all the whitespace
-	 * from the specified string and append the result to the
-	 * specified string buffer.
-	 * String#removeAllWhitespaceOn(StringBuffer)
-	 */
-	public static void removeAllWhitespaceOn(char[] string, StringBuffer sb) {
-		int first = indexOfWhitespace_(string);
-		if (first == -1) {
-			sb.append(string);
-		} else {
-			removeAllWhitespaceOn_(string, first, sb);
-		}
-	}
-
-	/*
-	 * The index of the first non-whitespace character is passed in.
-	 */
-	private static void removeAllWhitespaceOn_(char[] string, int first, StringBuffer sb) {
-		sb.append(string, 0, first);
-		int len = string.length;
-		for (int i = first; i < len; i++) {
-			char c = string[i];
-			if ( ! Character.isWhitespace(c)) {
-				sb.append(c);
-			}
-		}
-	}
-
-	/**
-	 * Remove all the whitespace
-	 * from the specified string and append the result to the
-	 * specified string builder.
-	 * String#removeAllWhitespaceOn(StringBuilder)
-	 */
-	public static void removeAllWhitespaceOn(char[] string, StringBuilder sb) {
-		int first = indexOfWhitespace_(string);
-		if (first == -1) {
-			sb.append(string);
-		} else {
-			removeAllWhitespaceOn_(string, first, sb);
-		}
-	}
-
-	/*
-	 * The index of the first non-whitespace character is passed in.
-	 */
-	private static void removeAllWhitespaceOn_(char[] string, int first, StringBuilder sb) {
-		sb.append(string, 0, first);
-		int len = string.length;
-		for (int i = first; i < len; i++) {
-			char c = string[i];
-			if ( ! Character.isWhitespace(c)) {
-				sb.append(c);
-			}
-		}
-	}
-
-
-	// ********** common prefix **********
-
-	/**
-	 * Return the length of the common prefix shared by the specified strings.
-	 * String#commonPrefixLength(String)
-	 */
-	public static int commonPrefixLength(String s1, String s2) {
-		return commonPrefixLength(s1.toCharArray(), s2.toCharArray());
-	}
-
-	/**
-	 * Return the length of the common prefix shared by the specified strings.
-	 */
-	public static int commonPrefixLength(char[] s1, char[] s2) {
-		return commonPrefixLength_(s1, s2, Math.min(s1.length, s2.length));
-	}
-
-	/**
-	 * Return the length of the common prefix shared by the specified strings;
-	 * but limit the length to the specified maximum.
-	 * String#commonPrefixLength(String, int)
-	 */
-	public static int commonPrefixLength(String s1, String s2, int max) {
-		return commonPrefixLength(s1.toCharArray(), s2.toCharArray(), max);
-	}
-
-	/**
-	 * Return the length of the common prefix shared by the specified strings;
-	 * but limit the length to the specified maximum.
-	 */
-	public static int commonPrefixLength(char[] s1, char[] s2, int max) {
-		return commonPrefixLength_(s1, s2, Math.min(max, Math.min(s1.length, s2.length)));
-	}
-
-	/*
-	 * Return the length of the common prefix shared by the specified strings;
-	 * but limit the length to the specified maximum. Assume the specified
-	 * maximum is less than the lengths of the specified strings.
-	 */
-	private static int commonPrefixLength_(char[] s1, char[] s2, int max) {
-		for (int i = 0; i < max; i++) {
-			if (s1[i] != s2[i]) {
-				return i;
-			}
-		}
-		return max;	// all the characters up to 'max' are the same
-	}
-
-
-	// ********** capitalization **********
-
-	/*
-	 * no zero-length check or lower case check
-	 */
-	private static char[] capitalize_(char[] string) {
-		string[0] = Character.toUpperCase(string[0]);
-		return string;
-	}
-
-	/**
-	 * Modify and return the specified string with
-	 * its first letter capitalized.
-	 */
-	public static char[] capitalize(char[] string) {
-		if ((string.length == 0) || Character.isUpperCase(string[0])) {
-			return string;
-		}
-		return capitalize_(string);
-	}
-
-	/**
-	 * Return the specified string with its first letter capitalized.
-	 * String#capitalize()
-	 */
-	public static String capitalize(String string) {
-		if ((string.length() == 0) || Character.isUpperCase(string.charAt(0))) {
-			return string;
-		}
-		return new String(capitalize_(string.toCharArray()));
-	}
-
-	/**
-	 * Modify each of the specified strings, capitalizing the first letter of
-	 * each.
-	 */
-	public static Iterator<String> capitalize(Iterator<String> strings) {
-		return new TransformationIterator<String, String>(strings) {
-			@Override
-			protected String transform(String string) {
-				return StringTools.capitalize(string);
-			}
-		};
-	}
-
-	/**
-	 * Modify each of the specified strings, capitalizing the first letter of
-	 * each.
-	 */
-	// cannot name method simply 'capitalize' because of type-erasure...
-	public static Iterator<char[]> capitalizeCharArrays(Iterator<char[]> strings) {
-		return new TransformationIterator<char[], char[]>(strings) {
-			@Override
-			protected char[] transform(char[] string) {
-				return StringTools.capitalize(string);
-			}
-		};
-	}
-
-	/*
-	 * no zero-length check or upper case check
-	 */
-	private static void capitalizeOn_(char[] string, StringBuffer sb) {
-		sb.append(Character.toUpperCase(string[0]));
-		sb.append(string, 1, string.length - 1);
-	}
-
-	/**
-	 * Append the specified string to the specified string buffer
-	 * with its first letter capitalized.
-	 */
-	public static void capitalizeOn(char[] string, StringBuffer sb) {
-		if (string.length == 0) {
-			return;
-		}
-		if (Character.isUpperCase(string[0])) {
-			sb.append(string);
-		} else {
-			capitalizeOn_(string, sb);
-		}
-	}
-
-	/**
-	 * Append the specified string to the specified string buffer
-	 * with its first letter capitalized.
-	 * String#capitalizeOn(StringBuffer)
-	 */
-	public static void capitalizeOn(String string, StringBuffer sb) {
-		if (string.length() == 0) {
-			return;
-		}
-		if (Character.isUpperCase(string.charAt(0))) {
-			sb.append(string);
-		} else {
-			capitalizeOn_(string.toCharArray(), sb);
-		}
-	}
-
-	/*
-	 * no zero-length check or upper case check
-	 */
-	private static void capitalizeOn_(char[] string, StringBuilder sb) {
-		sb.append(Character.toUpperCase(string[0]));
-		sb.append(string, 1, string.length - 1);
-	}
-
-	/**
-	 * Append the specified string to the specified string builder
-	 * with its first letter capitalized.
-	 */
-	public static void capitalizeOn(char[] string, StringBuilder sb) {
-		if (string.length == 0) {
-			return;
-		}
-		if (Character.isUpperCase(string[0])) {
-			sb.append(string);
-		} else {
-			capitalizeOn_(string, sb);
-		}
-	}
-
-	/**
-	 * Append the specified string to the specified string builder
-	 * with its first letter capitalized.
-	 * String#capitalizeOn(StringBuffer)
-	 */
-	public static void capitalizeOn(String string, StringBuilder sb) {
-		if (string.length() == 0) {
-			return;
-		}
-		if (Character.isUpperCase(string.charAt(0))) {
-			sb.append(string);
-		} else {
-			capitalizeOn_(string.toCharArray(), sb);
-		}
-	}
-
-	/*
-	 * no zero-length check or upper case check
-	 */
-	private static void capitalizeOn_(char[] string, Writer writer) {
-		writeCharOn(Character.toUpperCase(string[0]), writer);
-		writeStringOn(string, 1, string.length - 1, writer);
-	}
-
-	/**
-	 * Append the specified string to the specified string buffer
-	 * with its first letter capitalized.
-	 */
-	public static void capitalizeOn(char[] string, Writer writer) {
-		if (string.length == 0) {
-			return;
-		}
-		if (Character.isUpperCase(string[0])) {
-			writeStringOn(string, writer);
-		} else {
-			capitalizeOn_(string, writer);
-		}
-	}
-
-	/**
-	 * Append the specified string to the specified string buffer
-	 * with its first letter capitalized.
-	 * String#capitalizeOn(Writer)
-	 */
-	public static void capitalizeOn(String string, Writer writer) {
-		if (string.length() == 0) {
-			return;
-		}
-		if (Character.isUpperCase(string.charAt(0))) {
-			writeStringOn(string, writer);
-		} else {
-			capitalizeOn_(string.toCharArray(), writer);
-		}
-	}
-
-	/*
-	 * no zero-length check or lower case check
-	 */
-	private static char[] uncapitalize_(char[] string) {
-		string[0] = Character.toLowerCase(string[0]);
-		return string;
-	}
-
-	private static boolean stringNeedNotBeUncapitalized_(char[] string) {
-		if (string.length == 0) {
-			return true;
-		}
-		if (Character.isLowerCase(string[0])) {
-			return true;
-		}
-		// if both the first and second characters are capitalized,
-		// return the string unchanged
-		if ((string.length > 1)
-				&& Character.isUpperCase(string[1])
-				&& Character.isUpperCase(string[0])){
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Modify and return the specified string with its
-	 * first letter converted to lower case.
-	 * (Unless both the first and second letters are upper case,
-	 * in which case the string is returned unchanged.)
-	 */
-	public static char[] uncapitalize(char[] string) {
-		if (stringNeedNotBeUncapitalized_(string)) {
-			return string;
-		}
-		return uncapitalize_(string);
-	}
-
-	private static boolean stringNeedNotBeUncapitalized_(String string) {
-		if (string.length() == 0) {
-			return true;
-		}
-		if (Character.isLowerCase(string.charAt(0))) {
-			return true;
-		}
-		// if both the first and second characters are capitalized,
-		// return the string unchanged
-		if ((string.length() > 1)
-				&& Character.isUpperCase(string.charAt(1))
-				&& Character.isUpperCase(string.charAt(0))){
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Return the specified string with its first letter converted to lower case.
-	 * (Unless both the first and second letters are upper case,
-	 * in which case the string is returned unchanged.)
-	 * String#uncapitalize()
-	 */
-	public static String uncapitalize(String string) {
-		if (stringNeedNotBeUncapitalized_(string)) {
-			return string;
-		}
-		return new String(uncapitalize_(string.toCharArray()));
-	}
-
-	/*
-	 * no zero-length check or lower case check
-	 */
-	private static void uncapitalizeOn_(char[] string, StringBuffer sb) {
-		sb.append(Character.toLowerCase(string[0]));
-		sb.append(string, 1, string.length - 1);
-	}
-
-	/**
-	 * Append the specified string to the specified string buffer
-	 * with its first letter converted to lower case.
-	 * (Unless both the first and second letters are upper case,
-	 * in which case the string is returned unchanged.)
-	 */
-	public static void uncapitalizeOn(char[] string, StringBuffer sb) {
-		if (stringNeedNotBeUncapitalized_(string)) {
-			sb.append(string);
-		} else {
-			uncapitalizeOn_(string, sb);
-		}
-	}
-
-	/**
-	 * Append the specified string to the specified string buffer
-	 * with its first letter converted to lower case.
-	 * (Unless both the first and second letters are upper case,
-	 * in which case the string is returned unchanged.)
-	 * String#uncapitalizeOn(StringBuffer)
-	 */
-	public static void uncapitalizeOn(String string, StringBuffer sb) {
-		if (stringNeedNotBeUncapitalized_(string)) {
-			sb.append(string);
-		} else {
-			uncapitalizeOn_(string.toCharArray(), sb);
-		}
-	}
-
-	/*
-	 * no zero-length check or lower case check
-	 */
-	private static void uncapitalizeOn_(char[] string, StringBuilder sb) {
-		sb.append(Character.toLowerCase(string[0]));
-		sb.append(string, 1, string.length - 1);
-	}
-
-	/**
-	 * Append the specified string to the specified string builder
-	 * with its first letter converted to lower case.
-	 * (Unless both the first and second letters are upper case,
-	 * in which case the string is returned unchanged.)
-	 */
-	public static void uncapitalizeOn(char[] string, StringBuilder sb) {
-		if (stringNeedNotBeUncapitalized_(string)) {
-			sb.append(string);
-		} else {
-			uncapitalizeOn_(string, sb);
-		}
-	}
-
-	/**
-	 * Append the specified string to the specified string builder
-	 * with its first letter converted to lower case.
-	 * (Unless both the first and second letters are upper case,
-	 * in which case the string is returned unchanged.)
-	 * String#uncapitalizeOn(StringBuffer)
-	 */
-	public static void uncapitalizeOn(String string, StringBuilder sb) {
-		if (stringNeedNotBeUncapitalized_(string)) {
-			sb.append(string);
-		} else {
-			uncapitalizeOn_(string.toCharArray(), sb);
-		}
-	}
-
-	/*
-	 * no zero-length check or upper case check
-	 */
-	private static void uncapitalizeOn_(char[] string, Writer writer) {
-		writeCharOn(Character.toLowerCase(string[0]), writer);
-		writeStringOn(string, 1, string.length - 1, writer);
-	}
-
-	/**
-	 * Append the specified string to the specified string buffer
-	 * with its first letter converted to lower case.
-	 * (Unless both the first and second letters are upper case,
-	 * in which case the string is returned unchanged.)
-	 */
-	public static void uncapitalizeOn(char[] string, Writer writer) {
-		if (stringNeedNotBeUncapitalized_(string)) {
-			writeStringOn(string, writer);
-		} else {
-			uncapitalizeOn_(string, writer);
-		}
-	}
-
-	/**
-	 * Append the specified string to the specified string buffer
-	 * with its first letter converted to lower case.
-	 * (Unless both the first and second letters are upper case,
-	 * in which case the string is returned unchanged.)
-	 * String#uncapitalizeOn(Writer)
-	 */
-	public static void uncapitalizeOn(String string, Writer writer) {
-		if (stringNeedNotBeUncapitalized_(string)) {
-			writeStringOn(string, writer);
-		} else {
-			uncapitalizeOn_(string.toCharArray(), writer);
-		}
-	}
-
-
-	// ********** #toString() helper methods **********
-
-	/**
-	 * Build a "standard" #toString() result for the specified object
-	 * and additional information:
-	 * 	ClassName[00F3EE42] (add'l info)
-	 */
-	public static String buildToStringFor(Object o, Object additionalInfo) {
-		StringBuilder sb = new StringBuilder();
-		buildSimpleToStringOn(o, sb);
-		sb.append(" (");  //$NON-NLS-1$
-		sb.append(additionalInfo);
-		sb.append(')');
-		return sb.toString();
-	}
-
-	/**
-	 * Build a "standard" simple #toString() result for the specified object:
-	 * 	ClassName[00F3EE42]
-	 */
-	public static String buildToStringFor(Object o) {
-		StringBuilder sb = new StringBuilder();
-		buildSimpleToStringOn(o, sb);
-		return sb.toString();
-	}
-
-	/**
-	 * Append a "standard" simple #toString() for the specified object to
-	 * the specified string buffer:
-	 * 	ClassName[00F3EE42]
-	 */
-	public static void buildSimpleToStringOn(Object o, StringBuffer sb) {
-		sb.append(ClassTools.toStringClassNameForObject(o));
-		sb.append('[');
-		// use System#identityHashCode(Object), since Object#hashCode() may be overridden
-		sb.append(zeroPad(Integer.toHexString(System.identityHashCode(o)).toUpperCase(), 8));
-		sb.append(']');
-	}
-
-	/**
-	 * Append a "standard" simple #toString() for the specified object to
-	 * the specified string builder:
-	 * 	ClassName[00F3EE42]
-	 */
-	public static void buildSimpleToStringOn(Object o, StringBuilder sb) {
-		sb.append(ClassTools.toStringClassNameForObject(o));
-		sb.append('[');
-		// use System#identityHashCode(Object), since Object#hashCode() may be overridden
-		sb.append(zeroPad(Integer.toHexString(System.identityHashCode(o)).toUpperCase(), 8));
-		sb.append(']');
-	}
-
-
-	// ********** queries **********
-
-	/**
-	 * Return whether the specified string is null, empty, or contains
-	 * only whitespace characters.
-	 */
-	public static boolean stringIsEmpty(String string) {
-		if (string == null) {
-			return true;
-		}
-		int len = string.length();
-		if (len == 0) {
-			return true;
-		}
-		return stringIsEmpty_(string.toCharArray(), len);
-	}
-
-	/**
-	 * Return whether the specified string is null, empty, or contains
-	 * only whitespace characters.
-	 */
-	public static boolean stringIsEmpty(char[] string) {
-		if (string == null) {
-			return true;
-		}
-		int len = string.length;
-		if (len == 0) {
-			return true;
-		}
-		return stringIsEmpty_(string, len);
-	}
-
-	private static boolean stringIsEmpty_(char[] s, int len) {
-		for (int i = len; i-- > 0; ) {
-			if ( ! Character.isWhitespace(s[i])) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Return whether the specified string is non-null, non-empty, and does
-	 * not contain only whitespace characters.
-	 */
-	public static boolean stringIsNotEmpty(String string) {
-		return ! stringIsEmpty(string);
-	}
-
-	/**
-	 * Return whether the specified string is non-null, non-empty, and does
-	 * not contain only whitespace characters.
-	 */
-	public static boolean stringIsNotEmpty(char[] string) {
-		return ! stringIsEmpty(string);
-	}
-	
-	/**
-	 * Return whether the specified strings are equal.
-	 * Check for nulls.
-	 */
-	public static boolean stringsAreEqual(String s1, String s2) {
-		if ((s1 == null) && (s2 == null)) {
-			return true;  // both are null
-		}
-		if ((s1 == null) || (s2 == null)) {
-			return false;  // one is null but the other is not
-		}
-		return s1.equals(s2);
-	}
-	
-	/**
-	 * Return whether the specified strings are equal.
-	 * Check for nulls.
-	 */
-	public static boolean stringsAreEqual(char[] s1, char[] s2) {
-		if ((s1 == null) && (s2 == null)) {
-			return true;  // both are null
-		}
-		if ((s1 == null) || (s2 == null)) {
-			return false;  // one is null but the other is not
-		}
-		int len = s1.length;
-		if (len != s2.length) {
-			return false;
-		}
-		for (int i = len; i-- > 0; ) {
-			if (s1[i] != s2[i]) {
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	/**
-	 * Return whether the specified strings are equal, ignoring case.
-	 * Check for nulls.
-	 */
-	public static boolean stringsAreEqualIgnoreCase(String s1, String s2) {
-		if ((s1 == null) && (s2 == null)) {
-			return true;  // both are null
-		}
-		if ((s1 == null) || (s2 == null)) {
-			return false;  // one is null but the other is not
-		}
-		return s1.equalsIgnoreCase(s2);
-	}
-	
-	/**
-	 * Return whether the specified strings are equal, ignoring case.
-	 * Check for nulls.
-	 */
-	public static boolean stringsAreEqualIgnoreCase(char[] s1, char[] s2) {
-		if ((s1 == null) && (s2 == null)) {
-			return true;  // both are null
-		}
-		if ((s1 == null) || (s2 == null)) {
-			return false;  // one is null but the other is not
-		}
-		int len = s1.length;
-		if (len != s2.length) {
-			return false;
-		}
-		for (int i = len; i-- > 0; ) {
-			if ( ! charactersAreEqualIgnoreCase(s1[i], s2[i])) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Return whether the specified string starts with the specified prefix,
-	 * ignoring case.
-	 */
-	public static boolean stringStartsWithIgnoreCase(char[] string, char[] prefix) {
-		int prefixLength = prefix.length;
-		if (string.length < prefixLength) {
-			return false;
-		}
-		for (int i = prefixLength; i-- > 0; ) {
-			if ( ! charactersAreEqualIgnoreCase(string[i], prefix[i])) {
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	/**
-	 * Return whether the specified string starts with the specified prefix,
-	 * ignoring case.
-	 */
-	public static boolean stringStartsWithIgnoreCase(String string, String prefix) {
-		return string.regionMatches(true, 0, prefix, 0, prefix.length());
-	}
-
-	/**
-	 * Return whether the specified characters are are equal, ignoring case.
-	 * @see java.lang.String#regionMatches(boolean, int, String, int, int)
-	 */
-	public static boolean charactersAreEqualIgnoreCase(char c1, char c2) {
-		//  something about the Georgian alphabet requires us to check lower case also
-		return (c1 == c2)
-				|| (Character.toUpperCase(c1) == Character.toUpperCase(c2))
-				|| (Character.toLowerCase(c1) == Character.toLowerCase(c2));
-	}
-
-	/**
-	 * Return whether the specified string is uppercase.
-	 */
-	public static boolean stringIsUppercase(String string) {
-		return (string.length() == 0) ? false : stringIsUppercase_(string);
-	}
-
-	/**
-	 * Return whether the specified string is uppercase.
-	 */
-	public static boolean stringIsUppercase(char[] string) {
-		return (string.length == 0) ? false : stringIsUppercase_(new String(string));
-	}
-
-	private static boolean stringIsUppercase_(String string) {
-		return string.equals(string.toUpperCase());
-	}
-
-	/**
-	 * Return whether the specified string is lowercase.
-	 */
-	public static boolean stringIsLowercase(String string) {
-		return (string.length() == 0) ? false : stringIsLowercase_(string);
-	}
-
-	/**
-	 * Return whether the specified string is lowercase.
-	 */
-	public static boolean stringIsLowercase(char[] string) {
-		return (string.length == 0) ? false : stringIsLowercase_(new String(string));
-	}
-
-	private static boolean stringIsLowercase_(String string) {
-		return string.equals(string.toLowerCase());
-	}
-
-
-	// ********** convert camel case to all caps **********
-
-	/**
-	 * Convert the specified "camel case" string to an "all caps" string:
-	 * "largeProject" -> "LARGE_PROJECT"
-	 */
-	public static String convertCamelCaseToAllCaps(String camelCaseString) {
-		int len = camelCaseString.length();
-		if (len == 0) {
-			return camelCaseString;
-		}
-		return new String(convertCamelCaseToAllCaps_(camelCaseString.toCharArray(), len));
-	}
-
-	/**
-	 * Convert the specified "camel case" string to an "all caps" string:
-	 * "largeProject" -> "LARGE_PROJECT"
-	 */
-	public static char[] convertCamelCaseToAllCaps(char[] camelCaseString) {
-		int len = camelCaseString.length;
-		if (len == 0) {
-			return camelCaseString;
-		}
-		return convertCamelCaseToAllCaps_(camelCaseString, len);
-	}
-
-	private static char[] convertCamelCaseToAllCaps_(char[] camelCaseString, int len) {
-		StringBuilder sb = new StringBuilder(len * 2);
-		convertCamelCaseToAllCapsOn_(camelCaseString, len, sb);
-		return convertToCharArray(sb);
-	}
-
-	/**
-	 * Convert the specified "camel case" string to an "all caps" string:
-	 * "largeProject" -> "LARGE_PROJECT"
-	 */
-	public static void convertCamelCaseToAllCapsOn(String camelCaseString, StringBuffer sb) {
-		int len = camelCaseString.length();
-		if (len != 0) {
-			convertCamelCaseToAllCapsOn_(camelCaseString.toCharArray(), len, sb);
-		}
-	}
-
-	/**
-	 * Convert the specified "camel case" string to an "all caps" string:
-	 * "largeProject" -> "LARGE_PROJECT"
-	 */
-	public static void convertCamelCaseToAllCapsOn(char[] camelCaseString, StringBuffer sb) {
-		int len = camelCaseString.length;
-		if (len != 0) {
-			convertCamelCaseToAllCapsOn_(camelCaseString, len, sb);
-		}
-	}
-
-	private static void convertCamelCaseToAllCapsOn_(char[] camelCaseString, int len, StringBuffer sb) {
-		char prev = 0;	// assume 0 is not a valid char
-		char c = 0;
-		char next = camelCaseString[0];
-		for (int i = 1; i <= len; i++) {	// NB: start at 1 and end at len!
-			c = next;
-			next = ((i == len) ? 0 : camelCaseString[i]);
-			if (camelCaseWordBreak_(prev, c, next)) {
-				sb.append('_');
-			}
-			sb.append(Character.toUpperCase(c));
-			prev = c;
-		}
-	}
-
-	/**
-	 * Convert the specified "camel case" string to an "all caps" string:
-	 * "largeProject" -> "LARGE_PROJECT"
-	 */
-	public static void convertCamelCaseToAllCapsOn(String camelCaseString, StringBuilder sb) {
-		int len = camelCaseString.length();
-		if (len != 0) {
-			convertCamelCaseToAllCapsOn_(camelCaseString.toCharArray(), len, sb);
-		}
-	}
-
-	/**
-	 * Convert the specified "camel case" string to an "all caps" string:
-	 * "largeProject" -> "LARGE_PROJECT"
-	 */
-	public static void convertCamelCaseToAllCapsOn(char[] camelCaseString, StringBuilder sb) {
-		int len = camelCaseString.length;
-		if (len != 0) {
-			convertCamelCaseToAllCapsOn_(camelCaseString, len, sb);
-		}
-	}
-
-	private static void convertCamelCaseToAllCapsOn_(char[] camelCaseString, int len, StringBuilder sb) {
-		char prev = 0;	// assume 0 is not a valid char
-		char c = 0;
-		char next = camelCaseString[0];
-		for (int i = 1; i <= len; i++) {	// NB: start at 1 and end at len!
-			c = next;
-			next = ((i == len) ? 0 : camelCaseString[i]);
-			if (camelCaseWordBreak_(prev, c, next)) {
-				sb.append('_');
-			}
-			sb.append(Character.toUpperCase(c));
-			prev = c;
-		}
-	}
-
-	/**
-	 * Convert the specified "camel case" string to an "all caps" string:
-	 * "largeProject" -> "LARGE_PROJECT"
-	 */
-	public static void convertCamelCaseToAllCapsOn(String camelCaseString, Writer writer) {
-		int len = camelCaseString.length();
-		if (len != 0) {
-			convertCamelCaseToAllCapsOn_(camelCaseString.toCharArray(), len, writer);
-		}
-	}
-
-	/**
-	 * Convert the specified "camel case" string to an "all caps" string:
-	 * "largeProject" -> "LARGE_PROJECT"
-	 */
-	public static void convertCamelCaseToAllCapsOn(char[] camelCaseString, Writer writer) {
-		int len = camelCaseString.length;
-		if (len != 0) {
-			convertCamelCaseToAllCapsOn_(camelCaseString, len, writer);
-		}
-	}
-
-	private static void convertCamelCaseToAllCapsOn_(char[] camelCaseString, int len, Writer writer) {
-		char prev = 0;	// assume 0 is not a valid char
-		char c = 0;
-		char next = camelCaseString[0];
-		for (int i = 1; i <= len; i++) {	// NB: start at 1 and end at len!
-			c = next;
-			next = ((i == len) ? 0 : camelCaseString[i]);
-			if (camelCaseWordBreak_(prev, c, next)) {
-				writeCharOn('_', writer);
-			}
-			writeCharOn(Character.toUpperCase(c), writer);
-			prev = c;
-		}
-	}
-
-	/**
-	 * Convert the specified "camel case" string to an "all caps" string:
-	 * "largeProject" -> "LARGE_PROJECT"
-	 * Limit the resulting string to the specified maximum length.
-	 */
-	public static String convertCamelCaseToAllCaps(String camelCaseString, int maxLength) {
-		int len = camelCaseString.length();
-		if ((len == 0) || (maxLength == 0)) {
-			return camelCaseString;
-		}
-		return new String(convertCamelCaseToAllCaps_(camelCaseString.toCharArray(), maxLength, len));
-	}
-
-	/**
-	 * Convert the specified "camel case" string to an "all caps" string:
-	 * "largeProject" -> "LARGE_PROJECT"
-	 * Limit the resulting string to the specified maximum length.
-	 */
-	public static char[] convertCamelCaseToAllCaps(char[] camelCaseString, int maxLength) {
-		int len = camelCaseString.length;
-		if ((len == 0) || (maxLength == 0)) {
-			return camelCaseString;
-		}
-		return convertCamelCaseToAllCaps_(camelCaseString, maxLength, len);
-	}
-
-	private static char[] convertCamelCaseToAllCaps_(char[] camelCaseString, int maxLength, int len) {
-		StringBuilder sb = new StringBuilder(maxLength);
-		convertCamelCaseToAllCapsOn_(camelCaseString, maxLength, len, sb);
-		return convertToCharArray(sb);
-	}
-
-	/**
-	 * Convert the specified "camel case" string to an "all caps" string:
-	 * "largeProject" -> "LARGE_PROJECT"
-	 * Limit the resulting string to the specified maximum length.
-	 */
-	public static void convertCamelCaseToAllCapsOn(String camelCaseString, int maxLength, StringBuffer sb) {
-		int len = camelCaseString.length();
-		if ((len != 0) && (maxLength != 0)) {
-			convertCamelCaseToAllCapsOn_(camelCaseString.toCharArray(), maxLength, len, sb);
-		}
-	}
-
-	/**
-	 * Convert the specified "camel case" string to an "all caps" string:
-	 * "largeProject" -> "LARGE_PROJECT"
-	 * Limit the resulting string to the specified maximum length.
-	 */
-	public static void convertCamelCaseToAllCapsOn(char[] camelCaseString, int maxLength, StringBuffer sb) {
-		int len = camelCaseString.length;
-		if ((len != 0) && (maxLength != 0)) {
-			convertCamelCaseToAllCapsOn_(camelCaseString, maxLength, len, sb);
-		}
-	}
-
-	private static void convertCamelCaseToAllCapsOn_(char[] camelCaseString, int maxLength, int len, StringBuffer sb) {
-		char prev = 0;	// assume 0 is not a valid char
-		char c = 0;
-		char next = camelCaseString[0];
-		for (int i = 1; i <= len; i++) {	// NB: start at 1 and end at len!
-			c = next;
-			next = ((i == len) ? 0 : camelCaseString[i]);
-			if (camelCaseWordBreak_(prev, c, next)) {
-				sb.append('_');
-				if (sb.length() == maxLength) {
-					return;
-				}
-			}
-			sb.append(Character.toUpperCase(c));
-			if (sb.length() == maxLength) {
-				return;
-			}
-			prev = c;
-		}
-	}
-
-	/**
-	 * Convert the specified "camel case" string to an "all caps" string:
-	 * "largeProject" -> "LARGE_PROJECT"
-	 * Limit the resulting string to the specified maximum length.
-	 */
-	public static void convertCamelCaseToAllCapsOn(String camelCaseString, int maxLength, StringBuilder sb) {
-		int len = camelCaseString.length();
-		if ((len != 0) && (maxLength != 0)) {
-			convertCamelCaseToAllCapsOn_(camelCaseString.toCharArray(), maxLength, len, sb);
-		}
-	}
-
-	/**
-	 * Convert the specified "camel case" string to an "all caps" string:
-	 * "largeProject" -> "LARGE_PROJECT"
-	 * Limit the resulting string to the specified maximum length.
-	 */
-	public static void convertCamelCaseToAllCapsOn(char[] camelCaseString, int maxLength, StringBuilder sb) {
-		int len = camelCaseString.length;
-		if ((len != 0) && (maxLength != 0)) {
-			convertCamelCaseToAllCapsOn_(camelCaseString, maxLength, len, sb);
-		}
-	}
-
-	private static void convertCamelCaseToAllCapsOn_(char[] camelCaseString, int maxLength, int len, StringBuilder sb) {
-		char prev = 0;	// assume 0 is not a valid char
-		char c = 0;
-		char next = camelCaseString[0];
-		for (int i = 1; i <= len; i++) {	// NB: start at 1 and end at len!
-			c = next;
-			next = ((i == len) ? 0 : camelCaseString[i]);
-			if (camelCaseWordBreak_(prev, c, next)) {
-				sb.append('_');
-				if (sb.length() == maxLength) {
-					return;
-				}
-			}
-			sb.append(Character.toUpperCase(c));
-			if (sb.length() == maxLength) {
-				return;
-			}
-			prev = c;
-		}
-	}
-
-	/**
-	 * Convert the specified "camel case" string to an "all caps" string:
-	 * "largeProject" -> "LARGE_PROJECT"
-	 * Limit the resulting string to the specified maximum length.
-	 */
-	public static void convertCamelCaseToAllCapsOn(String camelCaseString, int maxLength, Writer writer) {
-		int len = camelCaseString.length();
-		if ((len != 0) && (maxLength != 0)) {
-			convertCamelCaseToAllCapsOn_(camelCaseString.toCharArray(), maxLength, len, writer);
-		}
-	}
-
-	/**
-	 * Convert the specified "camel case" string to an "all caps" string:
-	 * "largeProject" -> "LARGE_PROJECT"
-	 * Limit the resulting string to the specified maximum length.
-	 */
-	public static void convertCamelCaseToAllCapsOn(char[] camelCaseString, int maxLength, Writer writer) {
-		int len = camelCaseString.length;
-		if ((len != 0) && (maxLength != 0)) {
-			convertCamelCaseToAllCapsOn_(camelCaseString, maxLength, len, writer);
-		}
-	}
-
-	private static void convertCamelCaseToAllCapsOn_(char[] camelCaseString, int maxLength, int len, Writer writer) {
-		char prev = 0;	// assume 0 is not a valid char
-		char c = 0;
-		char next = camelCaseString[0];
-		int writerLength = 0;
-		for (int i = 1; i <= len; i++) {	// NB: start at 1 and end at len!
-			c = next;
-			next = ((i == len) ? 0 : camelCaseString[i]);
-			if (camelCaseWordBreak_(prev, c, next)) {
-				writeCharOn('_', writer);
-				if (++writerLength == maxLength) {
-					return;
-				}
-			}
-			writeCharOn(Character.toUpperCase(c), writer);
-			if (++writerLength == maxLength) {
-				return;
-			}
-			prev = c;
-		}
-	}
-
-	/*
-	 * Return whether the specified series of characters occur at
-	 * a "camel case" work break:
-	 *     "*aa" -> false
-	 *     "*AA" -> false
-	 *     "*Aa" -> false
-	 *     "AaA" -> false
-	 *     "AAA" -> false
-	 *     "aa*" -> false
-	 *     "AaA" -> false
-	 *     "aAa" -> true
-	 *     "AA*" -> false
-	 *     "AAa" -> true
-	 * where '*' == any char
-	 */
-	private static boolean camelCaseWordBreak_(char prev, char c, char next) {
-		if (prev == 0) {	// start of string
-			return false;
-		}
-		if (Character.isLowerCase(c)) {
-			return false;
-		}
-		if (Character.isLowerCase(prev)) {
-			return true;
-		}
-		if (next == 0) {	// end of string
-			return false;
-		}
-		return Character.isLowerCase(next);
-	}
-
-
-	// ********** convert underscores to camel case **********
-
-	/**
-	 * Convert the specified "underscore" string to a "camel case" string:
-	 * "LARGE_PROJECT" -> "LargeProject"
-	 * Capitalize the first letter.
-	 */
-	public static String convertUnderscoresToCamelCase(String underscoreString) {
-		return convertUnderscoresToCamelCase(underscoreString, true);
-	}
-
-	/**
-	 * Convert the specified "underscore" string to a "camel case" string:
-	 * "LARGE_PROJECT" -> "LargeProject"
-	 * Capitalize the first letter.
-	 */
-	public static char[] convertUnderscoresToCamelCase(char[] underscoreString) {
-		return convertUnderscoresToCamelCase(underscoreString, true);
-	}
-
-	/**
-	 * Convert the specified "underscore" string to a "camel case" string:
-	 * "LARGE_PROJECT" -> "largeProject"
-	 * Optionally capitalize the first letter.
-	 */
-	public static String convertUnderscoresToCamelCase(String underscoreString, boolean capitalizeFirstLetter) {
-		int len = underscoreString.length();
-		if (len == 0) {
-			return underscoreString;
-		}
-		return new String(convertUnderscoresToCamelCase_(underscoreString.toCharArray(), capitalizeFirstLetter, len));
-	}
-
-	/**
-	 * Convert the specified "underscore" string to a "camel case" string:
-	 * "LARGE_PROJECT" -> "largeProject"
-	 * Optionally capitalize the first letter.
-	 */
-	public static char[] convertUnderscoresToCamelCase(char[] underscoreString, boolean capitalizeFirstLetter) {
-		int len = underscoreString.length;
-		if (len == 0) {
-			return underscoreString;
-		}
-		return convertUnderscoresToCamelCase_(underscoreString, capitalizeFirstLetter, len);
-	}
-
-	private static char[] convertUnderscoresToCamelCase_(char[] underscoreString, boolean capitalizeFirstLetter, int len) {
-		StringBuilder sb = new StringBuilder(len);
-		convertUnderscoresToCamelCaseOn_(underscoreString, capitalizeFirstLetter, len, sb);
-		return convertToCharArray(sb);
-	}
-
-	/**
-	 * Convert the specified "underscore" string to a "camel case" string:
-	 * "LARGE_PROJECT" -> "largeProject"
-	 * Optionally capitalize the first letter.
-	 */
-	public static void convertUnderscoresToCamelCaseOn(String underscoreString, boolean capitalizeFirstLetter, StringBuffer sb) {
-		int len = underscoreString.length();
-		if (len != 0) {
-			convertUnderscoresToCamelCaseOn_(underscoreString.toCharArray(), capitalizeFirstLetter, len, sb);
-		}
-	}
-
-	/**
-	 * Convert the specified "underscore" string to a "camel case" string:
-	 * "LARGE_PROJECT" -> "largeProject"
-	 * Optionally capitalize the first letter.
-	 */
-	public static void convertUnderscoresToCamelCaseOn(char[] underscoreString, boolean capitalizeFirstLetter, StringBuffer sb) {
-		int len = underscoreString.length;
-		if (len != 0) {
-			convertUnderscoresToCamelCaseOn_(underscoreString, capitalizeFirstLetter, len, sb);
-		}
-	}
-
-	private static void convertUnderscoresToCamelCaseOn_(char[] underscoreString, boolean capitalizeFirstLetter, int len, StringBuffer sb) {
-		char prev = 0;
-		char c = 0;
-		boolean first = true;
-		for (int i = 0; i < len; i++) {
-			prev = c;
-			c = underscoreString[i];
-			if (c == '_') {
-				continue;
-			}
-			if (first) {
-				first = false;
-				sb.append(capitalizeFirstLetter ? Character.toUpperCase(c) : Character.toLowerCase(c));
-			} else {
-				sb.append((prev == '_') ? Character.toUpperCase(c) : Character.toLowerCase(c));
-			}
-		}
-	}
-
-	/**
-	 * Convert the specified "underscore" string to a "camel case" string:
-	 * "LARGE_PROJECT" -> "largeProject"
-	 * Optionally capitalize the first letter.
-	 */
-	public static void convertUnderscoresToCamelCaseOn(String underscoreString, boolean capitalizeFirstLetter, StringBuilder sb) {
-		int len = underscoreString.length();
-		if (len != 0) {
-			convertUnderscoresToCamelCaseOn_(underscoreString.toCharArray(), capitalizeFirstLetter, len, sb);
-		}
-	}
-
-	/**
-	 * Convert the specified "underscore" string to a "camel case" string:
-	 * "LARGE_PROJECT" -> "largeProject"
-	 * Optionally capitalize the first letter.
-	 */
-	public static void convertUnderscoresToCamelCaseOn(char[] underscoreString, boolean capitalizeFirstLetter, StringBuilder sb) {
-		int len = underscoreString.length;
-		if (len != 0) {
-			convertUnderscoresToCamelCaseOn_(underscoreString, capitalizeFirstLetter, len, sb);
-		}
-	}
-
-	private static void convertUnderscoresToCamelCaseOn_(char[] underscoreString, boolean capitalizeFirstLetter, int len, StringBuilder sb) {
-		char prev = 0;
-		char c = 0;
-		boolean first = true;
-		for (int i = 0; i < len; i++) {
-			prev = c;
-			c = underscoreString[i];
-			if (c == '_') {
-				continue;
-			}
-			if (first) {
-				first = false;
-				sb.append(capitalizeFirstLetter ? Character.toUpperCase(c) : Character.toLowerCase(c));
-			} else {
-				sb.append((prev == '_') ? Character.toUpperCase(c) : Character.toLowerCase(c));
-			}
-		}
-	}
-
-	/**
-	 * Convert the specified "underscore" string to a "camel case" string:
-	 * "LARGE_PROJECT" -> "largeProject"
-	 * Optionally capitalize the first letter.
-	 */
-	public static void convertUnderscoresToCamelCaseOn(String underscoreString, boolean capitalizeFirstLetter, Writer writer) {
-		int len = underscoreString.length();
-		if (len != 0) {
-			convertUnderscoresToCamelCaseOn_(underscoreString.toCharArray(), capitalizeFirstLetter, len, writer);
-		}
-	}
-
-	/**
-	 * Convert the specified "underscore" string to a "camel case" string:
-	 * "LARGE_PROJECT" -> "largeProject"
-	 * Optionally capitalize the first letter.
-	 */
-	public static void convertUnderscoresToCamelCaseOn(char[] underscoreString, boolean capitalizeFirstLetter, Writer writer) {
-		int len = underscoreString.length;
-		if (len != 0) {
-			convertUnderscoresToCamelCaseOn_(underscoreString, capitalizeFirstLetter, len, writer);
-		}
-	}
-
-	private static void convertUnderscoresToCamelCaseOn_(char[] underscoreString, boolean capitalizeFirstLetter, int len, Writer writer) {
-		char prev = 0;
-		char c = 0;
-		boolean first = true;
-		for (int i = 0; i < len; i++) {
-			prev = c;
-			c = underscoreString[i];
-			if (c == '_') {
-				continue;
-			}
-			if (first) {
-				first = false;
-				writeCharOn(capitalizeFirstLetter ? Character.toUpperCase(c) : Character.toLowerCase(c), writer);
-			} else {
-				writeCharOn((prev == '_') ? Character.toUpperCase(c) : Character.toLowerCase(c), writer);
-			}
-		}
-	}
-
-
-	// ********** convert to Java string literal **********
-
-	public static final String EMPTY_JAVA_STRING_LITERAL = "\"\"";  //$NON-NLS-1$
-	public static final char[] EMPTY_JAVA_STRING_LITERAL_CHAR_ARRAY = EMPTY_JAVA_STRING_LITERAL.toCharArray();
-
-	public static String convertToJavaStringLiteral(String string) {
-		int len = string.length();
-		if (len == 0) {
-			return EMPTY_JAVA_STRING_LITERAL;
-		}
-		StringBuilder sb = new StringBuilder(len + 5);
-		convertToJavaStringLiteralOn_(string.toCharArray(), sb, len);
-		return sb.toString();
-	}
-
-	public static char[] convertToJavaStringLiteral(char[] string) {
-		int len = string.length;
-		if (len == 0) {
-			return EMPTY_JAVA_STRING_LITERAL_CHAR_ARRAY;
-		}
-		StringBuilder sb = new StringBuilder(len + 5);
-		convertToJavaStringLiteralOn_(string, sb, len);
-		len = sb.length();
-		char[] result = new char[len];
-		sb.getChars(0, len, result, 0);
-		return result;
-	}
-
-	public static Iterator<String> convertToJavaStringLiterals(Iterator<String> strings) {
-		return new TransformationIterator<String, String>(strings) {
-			@Override
-			protected String transform(String string) {
-				return StringTools.convertToJavaStringLiteral(string);
-			}
-		};
-	}
-
-	// cannot name method simply 'convertToJavaStringLiterals' because of type-erasure...
-	public static Iterator<char[]> convertToJavaCharArrayLiterals(Iterator<char[]> strings) {
-		return new TransformationIterator<char[], char[]>(strings) {
-			@Override
-			protected char[] transform(char[] string) {
-				return StringTools.convertToJavaStringLiteral(string);
-			}
-		};
-	}
-
-	public static void convertToJavaStringLiteralOn(String string, StringBuffer sb) {
-		int len = string.length();
-		if (len == 0) {
-			sb.append(EMPTY_JAVA_STRING_LITERAL);
-		} else {
-			convertToJavaStringLiteralOn_(string.toCharArray(), sb, len);
-		}
-	}
-
-	public static void convertToJavaStringLiteralOn(char[] string, StringBuffer sb) {
-		int len = string.length;
-		if (len == 0) {
-			sb.append(EMPTY_JAVA_STRING_LITERAL);
-		} else {
-			convertToJavaStringLiteralOn_(string, sb, len);
-		}
-	}
-
-	/*
-	 * no length checks
-	 */
-	private static void convertToJavaStringLiteralOn_(char[] string, StringBuffer sb, int len) {
-		sb.ensureCapacity(sb.length() + len + 5);
-		sb.append(QUOTE);
-		for (char c : string) {
-			switch (c) {
-				case '\b':  // backspace
-					sb.append("\\b");  //$NON-NLS-1$
-					break;
-				case '\t':  // horizontal tab
-					sb.append("\\t");  //$NON-NLS-1$
-					break;
-				case '\n':  // line-feed LF
-					sb.append("\\n");  //$NON-NLS-1$
-					break;
-				case '\f':  // form-feed FF
-					sb.append("\\f");  //$NON-NLS-1$
-					break;
-				case '\r':  // carriage-return CR
-					sb.append("\\r");  //$NON-NLS-1$
-					break;
-				case '"':  // double-quote
-					sb.append("\\\"");  //$NON-NLS-1$
-					break;
-//				case '\'':  // single-quote
-//					sb.append("\\'");  //$NON-NLS-1$
-//					break;
-				case '\\':  // backslash
-					sb.append("\\\\");  //$NON-NLS-1$
-					break;
-				default:
-					sb.append(c);
-					break;
-			}
-		}
-		sb.append(QUOTE);
-	}
-
-	public static void convertToJavaStringLiteralOn(String string, StringBuilder sb) {
-		int len = string.length();
-		if (len == 0) {
-			sb.append(EMPTY_JAVA_STRING_LITERAL);
-		} else {
-			convertToJavaStringLiteralOn_(string.toCharArray(), sb, len);
-		}
-	}
-
-	public static void convertToJavaStringLiteralOn(char[] string, StringBuilder sb) {
-		int len = string.length;
-		if (len == 0) {
-			sb.append(EMPTY_JAVA_STRING_LITERAL);
-		} else {
-			convertToJavaStringLiteralOn_(string, sb, len);
-		}
-	}
-
-	/*
-	 * no length checks
-	 */
-	private static void convertToJavaStringLiteralOn_(char[] string, StringBuilder sb, int len) {
-		sb.ensureCapacity(sb.length() + len + 5);
-		sb.append(QUOTE);
-		for (char c : string) {
-			switch (c) {
-				case '\b':  // backspace
-					sb.append("\\b");  //$NON-NLS-1$
-					break;
-				case '\t':  // horizontal tab
-					sb.append("\\t");  //$NON-NLS-1$
-					break;
-				case '\n':  // line-feed LF
-					sb.append("\\n");  //$NON-NLS-1$
-					break;
-				case '\f':  // form-feed FF
-					sb.append("\\f");  //$NON-NLS-1$
-					break;
-				case '\r':  // carriage-return CR
-					sb.append("\\r");  //$NON-NLS-1$
-					break;
-				case '"':  // double-quote
-					sb.append("\\\"");  //$NON-NLS-1$
-					break;
-//				case '\'':  // single-quote
-//					sb.append("\\'");  //$NON-NLS-1$
-//					break;
-				case '\\':  // backslash
-					sb.append("\\\\");  //$NON-NLS-1$
-					break;
-				default:
-					sb.append(c);
-					break;
-			}
-		}
-		sb.append(QUOTE);
-	}
-
-	public static void convertToJavaStringLiteralOn(String string, Writer writer) {
-		if (string.length() == 0) {
-			writeStringOn(EMPTY_JAVA_STRING_LITERAL, writer);
-		} else {
-			convertToJavaStringLiteralOn_(string.toCharArray(), writer);
-		}
-	}
-
-	public static void convertToJavaStringLiteralOn(char[] string, Writer writer) {
-		if (string.length == 0) {
-			writeStringOn(EMPTY_JAVA_STRING_LITERAL, writer);
-		} else {
-			convertToJavaStringLiteralOn_(string, writer);
-		}
-	}
-
-	/*
-	 * no length checks
-	 */
-	private static void convertToJavaStringLiteralOn_(char[] string, Writer writer) {
-		writeCharOn(QUOTE, writer);
-		for (char c : string) {
-			switch (c) {
-				case '\b':  // backspace
-					writeStringOn("\\b", writer);  //$NON-NLS-1$
-					break;
-				case '\t':  // horizontal tab
-					writeStringOn("\\t", writer);  //$NON-NLS-1$
-					break;
-				case '\n':  // line-feed LF
-					writeStringOn("\\n", writer);  //$NON-NLS-1$
-					break;
-				case '\f':  // form-feed FF
-					writeStringOn("\\f", writer);  //$NON-NLS-1$
-					break;
-				case '\r':  // carriage-return CR
-					writeStringOn("\\r", writer);  //$NON-NLS-1$
-					break;
-				case '"':  // double-quote
-					writeStringOn("\\\"", writer);  //$NON-NLS-1$
-					break;
-//				case '\'':  // single-quote
-//					writeStringOn("\\'", writer);  //$NON-NLS-1$
-//					break;
-				case '\\':  // backslash
-					writeStringOn("\\\\", writer);  //$NON-NLS-1$
-					break;
-				default:
-					writeCharOn(c, writer);
-					break;
-			}
-		}
-		writeCharOn(QUOTE, writer);
-	}
-
-
-	// ********** convenience **********
-
-	public static char[] convertToCharArray(StringBuffer sb) {
-		int len = sb.length();
-		char[] result = new char[len];
-		sb.getChars(0, len, result, 0);
-		return result;
-	}
-
-	public static char[] convertToCharArray(StringBuilder sb) {
-		int len = sb.length();
-		char[] result = new char[len];
-		sb.getChars(0, len, result, 0);
-		return result;
-	}
-
-	private static void writeStringOn(char[] string, Writer writer) {
-		try {
-			writer.write(string);
-		} catch (IOException ex) {
-			throw new RuntimeException(ex);
-		}
-	}
-
-	private static void writeStringOn(char[] string, char escape, Writer writer) {
-		try {
-			for (char c : string) {
-				if (c == escape) {
-					writer.write(c);
-				}
-				writer.write(c);
-			}
-		} catch (IOException ex) {
-			throw new RuntimeException(ex);
-		}
-	}
-
-	private static void writeStringOn(char[] string, int off, int len, Writer writer) {
-		try {
-			writer.write(string, off, len);
-		} catch (IOException ex) {
-			throw new RuntimeException(ex);
-		}
-	}
-
-	private static void writeStringOn(String string, int off, int len, Writer writer) {
-		try {
-			writer.write(string, off, len);
-		} catch (IOException ex) {
-			throw new RuntimeException(ex);
-		}
-	}
-
-	private static void writeStringOn(String string, Writer writer) {
-		try {
-			writer.write(string);
-		} catch (IOException ex) {
-			throw new RuntimeException(ex);
-		}
-	}
-
-	private static void writeCharOn(char c, Writer writer) {
-		try {
-			writer.write(c);
-		} catch (IOException ex) {
-			throw new RuntimeException(ex);
-		}
-	}
-
-
-	// ********** constructor **********
-
-	/*
-	 * Suppress default constructor, ensuring non-instantiability.
-	 */
-	private StringTools() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SynchronizedBoolean.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SynchronizedBoolean.java
deleted file mode 100644
index 001aa64bd6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SynchronizedBoolean.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import java.io.Serializable;
-import org.eclipse.jpt.utility.Command;
-
-/**
- * This class provides synchronized access to a boolean value.
- * It also provides protocol for suspending a thread until the
- * boolean value is set to true or false, with optional time-outs.
- * @see BooleanHolder
- */
-public class SynchronizedBoolean
-	implements Cloneable, Serializable
-{
-	/** Backing boolean. */
-	private boolean value;
-
-	/** Object to synchronize on. */
-	private final Object mutex;
-
-	private static final long serialVersionUID = 1L;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Create a synchronized boolean with the specified initial value
-	 * and mutex.
-	 */
-	public SynchronizedBoolean(boolean value, Object mutex) {
-		super();
-		this.value = value;
-		this.mutex = mutex;
-	}
-
-	/**
-	 * Create a synchronized boolean with the specified initial value.
-	 */
-	public SynchronizedBoolean(boolean value) {
-		super();
-		this.value = value;
-		this.mutex = this;
-	}
-
-	/**
-	 * Create a synchronized boolean with an initial value of false
-	 * and specified mutex.
-	 */
-	public SynchronizedBoolean(Object mutex) {
-		this(false, mutex);
-	}
-
-	/**
-	 * Create a synchronized boolean with an initial value of false.
-	 */
-	public SynchronizedBoolean() {
-		this(false);
-	}
-
-
-	// ********** accessors **********
-
-	/**
-	 * Return the current boolean value.
-	 */
-	public boolean value() {
-		synchronized (this.mutex) {
-			return this.value;
-		}
-	}
-
-	/**
-	 * Return whether the current boolean value is true.
-	 */
-	public boolean isTrue() {
-		synchronized (this.mutex) {
-			return this.value;
-		}
-	}
-
-	/**
-	 * Return whether the current boolean value is false.
-	 */
-	public boolean isFalse() {
-		synchronized (this.mutex) {
-			return ! this.value;
-		}
-	}
-
-	/**
-	 * Return whether the current boolean value is the specified value.
-	 */
-	public boolean is(boolean v) {
-		synchronized (this.mutex) {
-			return this.value == v;
-		}
-	}
-
-	/**
-	 * Set the boolean value. If the value changes, all waiting
-	 * threads are notified.
-	 */
-	public void setValue(boolean value) {
-		synchronized (this.mutex) {
-			if (this.value != value) {
-				this.value = value;
-				this.mutex.notifyAll();
-			}
-		}
-	}
-
-	/**
-	 * Set the boolean value to true. If the value changes, all waiting
-	 * threads are notified.
-	 */
-	public void setTrue() {
-		synchronized (this.mutex) {
-			this.setValue(true);
-		}
-	}
-
-	/**
-	 * Set the boolean value to false. If the value changes, all waiting
-	 * threads are notified.
-	 */
-	public void setFalse() {
-		synchronized (this.mutex) {
-			this.setValue(false);
-		}
-	}
-
-	/**
-	 * Return the object this object locks on while performing
-	 * its operations.
-	 */
-	public Object mutex() {
-		return this.mutex;
-	}
-
-
-	// ********** indefinite waits **********
-
-	/**
-	 * Suspend the current thread until the boolean value changes
-	 * to the specified value. If the boolean value is already the
-	 * specified value, return immediately.
-	 */
-	public void waitUntilValueIs(boolean v) throws InterruptedException {
-		synchronized (this.mutex) {
-			while (this.value != v) {
-				this.mutex.wait();
-			}
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the boolean value changes to true.
-	 * If the boolean value is already true, return immediately.
-	 */
-	public void waitUntilTrue() throws InterruptedException {
-		synchronized (this.mutex) {
-			this.waitUntilValueIs(true);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the boolean value changes to false.
-	 * If the boolean value is already false, return immediately.
-	 */
-	public void waitUntilFalse() throws InterruptedException {
-		synchronized (this.mutex) {
-			this.waitUntilValueIs(false);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the boolean value changes to
-	 * NOT the specified value, then change it back to the specified
-	 * value and continue executing. If the boolean value is already
-	 * NOT the specified value, set the value to the specified value
-	 * immediately.
-	 */
-	public void waitToSetValue(boolean v) throws InterruptedException {
-		synchronized (this.mutex) {
-			this.waitUntilValueIs( ! v);
-			this.setValue(v);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the boolean value changes to false,
-	 * then change it back to true and continue executing. If the boolean
-	 * value is already false, set the value to true immediately.
-	 */
-	public void waitToSetTrue() throws InterruptedException {
-		synchronized (this.mutex) {
-			this.waitToSetValue(true);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the boolean value changes to true,
-	 * then change it back to false and continue executing. If the boolean
-	 * value is already true, set the value to false immediately.
-	 */
-	public void waitToSetFalse() throws InterruptedException {
-		synchronized (this.mutex) {
-			this.waitToSetValue(false);
-		}
-	}
-
-
-	// ********** timed waits **********
-
-	/**
-	 * Suspend the current thread until the boolean value changes
-	 * to the specified value or the specified time-out occurs.
-	 * The time-out is specified in milliseconds. Return true if the specified
-	 * value was achieved; return false if a time-out occurred.
-	 * If the boolean value is already the specified value, return true
-	 * immediately.
-	 */
-	public boolean waitUntilValueIs(boolean v, long timeout) throws InterruptedException {
-		synchronized (this.mutex) {
-			if (timeout == 0L) {
-				this.waitUntilValueIs(v);	// wait indefinitely until notified
-				return true;	// if it ever comes back, the condition was met
-			}
-	
-			long stop = System.currentTimeMillis() + timeout;
-			long remaining = timeout;
-			while ((this.value != v) && (remaining > 0L)) {
-				this.mutex.wait(remaining);
-				remaining = stop - System.currentTimeMillis();
-			}
-			return (this.value == v);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the boolean value changes
-	 * to true or the specified time-out occurs.
-	 * The time-out is specified in milliseconds. Return true if the specified
-	 * value was achieved; return false if a time-out occurred.
-	 * If the boolean value is already true, return true immediately.
-	 */
-	public boolean waitUntilTrue(long timeout) throws InterruptedException {
-		synchronized (this.mutex) {
-			return this.waitUntilValueIs(true, timeout);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the boolean value changes
-	 * to false or the specified time-out occurs.
-	 * The time-out is specified in milliseconds. Return true if the specified
-	 * value was achieved; return false if a time-out occurred.
-	 * If the boolean value is already true, return true immediately.
-	 */
-	public boolean waitUntilFalse(long timeout) throws InterruptedException {
-		synchronized (this.mutex) {
-			return this.waitUntilValueIs(false, timeout);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the boolean value changes to NOT the
-	 * specified value, then change it back to the specified value and continue
-	 * executing. If the boolean value does not change to false before the
-	 * time-out, simply continue executing without changing the value.
-	 * The time-out is specified in milliseconds. Return true if the value was
-	 * set to the specified value; return false if a time-out occurred.
-	 * If the boolean value is already NOT the specified value, set the value
-	 * to the specified value immediately and return true.
-	 */
-	public boolean waitToSetValue(boolean v, long timeout) throws InterruptedException {
-		synchronized (this.mutex) {
-			boolean success = this.waitUntilValueIs( ! v, timeout);
-			if (success) {
-				this.setValue(v);
-			}
-			return success;
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the boolean value changes to false,
-	 * then change it back to true and continue executing. If the boolean
-	 * value does not change to false before the time-out, simply continue
-	 * executing without changing the value. The time-out is specified in
-	 * milliseconds. Return true if the value was set to true; return false
-	 * if a time-out occurred. If the boolean value is already false, set the
-	 * value to true immediately and return true.
-	 */
-	public boolean waitToSetTrue(long timeout) throws InterruptedException {
-		synchronized (this.mutex) {
-			return this.waitToSetValue(true, timeout);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the boolean value changes to true,
-	 * then change it back to false and continue executing. If the boolean
-	 * value does not change to true before the time-out, simply continue
-	 * executing without changing the value. The time-out is specified in
-	 * milliseconds. Return true if the value was set to false; return false
-	 * if a time-out occurred. If the boolean value is already true, set the
-	 * value to false immediately and return true.
-	 */
-	public boolean waitToSetFalse(long timeout) throws InterruptedException {
-		synchronized (this.mutex) {
-			return this.waitToSetValue(false, timeout);
-		}
-	}
-
-
-	// ********** synchronized behavior **********
-
-	/**
-	 * If the current thread is not interrupted, execute the specified command 
-	 * with the mutex locked. This is useful for initializing the value in another
-	 * thread.
-	 */
-	public void execute(Command command) throws InterruptedException {
-		if (Thread.interrupted()) {
-			throw new InterruptedException();
-		}
-		synchronized (this.mutex) {
-			command.execute();
-		}
-	}
-
-
-	// ********** standard methods **********
-
-	@Override
-	public Object clone() {
-		try {
-			synchronized (this.mutex) {
-				return super.clone();
-			}
-		} catch (CloneNotSupportedException ex) {
-			throw new InternalError();
-		}
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (o instanceof SynchronizedBoolean) {
-			return this.value() == ((SynchronizedBoolean) o).value();
-		}
-		return false;
-	}
-
-	@Override
-	public int hashCode() {
-		return this.value() ? 1 : 0;
-	}
-
-	@Override
-	public String toString() {
-		return String.valueOf(this.value());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SynchronizedObject.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SynchronizedObject.java
deleted file mode 100644
index bcf83dbfa9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SynchronizedObject.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import java.io.Serializable;
-import org.eclipse.jpt.utility.Command;
-
-/**
- * This class provides synchronized access to an object of type T.
- * It also provides protocol for suspending a thread until the
- * value is set to null or a non-null value, with optional time-outs.
- */
-public class SynchronizedObject<T>
-	implements Cloneable, Serializable
-{
-	/** Backing value. */
-	private T value;
-
-	/** Object to synchronize on. */
-	private final Object mutex;
-
-	private static final long serialVersionUID = 1L;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Create a synchronized object with the specified initial value
-	 * and mutex.
-	 */
-	public SynchronizedObject(T value, Object mutex) {
-		super();
-		this.value = value;
-		this.mutex = mutex;
-	}
-
-	/**
-	 * Create a synchronized object with the specified initial value.
-	 */
-	public SynchronizedObject(T value) {
-		super();
-		this.value = value;
-		this.mutex = this;
-	}
-
-	/**
-	 * Create a synchronized object with an initial value of null.
-	 */
-	public SynchronizedObject() {
-		this(null);
-	}
-
-
-	// ********** accessors **********
-
-	/**
-	 * Return the current value.
-	 */
-	public T value() {
-		synchronized (this.mutex) {
-			return this.value;
-		}
-	}
-
-	/**
-	 * Return whether the current value is null.
-	 */
-	public boolean isNull() {
-		synchronized (this.mutex) {
-			return this.value == null;
-		}
-	}
-
-	/**
-	 * Return whether the current value is not null.
-	 */
-	public boolean isNotNull() {
-		synchronized (this.mutex) {
-			return this.value != null;
-		}
-	}
-
-	/**
-	 * Set the value. If the value changes, all waiting
-	 * threads are notified.
-	 */
-	public void setValue(T value) {
-		synchronized (this.mutex) {
-			if (this.value != value) {
-				this.value = value;
-				this.mutex.notifyAll();
-			}
-		}
-	}
-
-	/**
-	 * Set the value to null. If the value changes, all waiting
-	 * threads are notified.
-	 */
-	public void setNull() {
-		synchronized (this.mutex) {
-			this.setValue(null);
-		}
-	}
-
-	/**
-	 * Return the object this object locks on while performing
-	 * its operations.
-	 */
-	public Object mutex() {
-		return this.mutex;
-	}
-
-
-	// ********** indefinite waits **********
-
-	/**
-	 * Suspend the current thread until the value changes
-	 * to the specified value. If the value is already the
-	 * specified value, return immediately.
-	 */
-	public void waitUntilValueIs(T v) throws InterruptedException {
-		synchronized (this.mutex) {
-			while (this.value != v) {
-				this.mutex.wait();
-			}
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the value changes
-	 * to something other than the specified value. If the
-	 * value is already NOT the specified value, return immediately.
-	 */
-	public void waitUntilValueIsNot(T v) throws InterruptedException {
-		synchronized (this.mutex) {
-			while (this.value == v) {
-				this.mutex.wait();
-			}
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the value changes to null.
-	 * If the value is already null, return immediately.
-	 */
-	public void waitUntilNull() throws InterruptedException {
-		synchronized (this.mutex) {
-			this.waitUntilValueIs(null);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the value changes
-	 * to something other than null.
-	 * If the value is already NOT null, return immediately.
-	 */
-	public void waitUntilNotNull() throws InterruptedException {
-		synchronized (this.mutex) {
-			this.waitUntilValueIsNot(null);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the value changes to
-	 * something other than the specified value, then change
-	 * it back to the specified value and continue executing.
-	 * If the value is already NOT the specified value, set
-	 * the value immediately.
-	 */
-	public void waitToSetValue(T v) throws InterruptedException {
-		synchronized (this.mutex) {
-			this.waitUntilValueIsNot(v);
-			this.setValue(v);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the value changes to
-	 * something other than null, then change it back to null
-	 * and continue executing. If the value is already NOT null,
-	 * set the value to null immediately.
-	 */
-	public void waitToSetNull() throws InterruptedException {
-		synchronized (this.mutex) {
-			this.waitUntilNotNull();
-			this.setValue(null);
-		}
-	}
-
-
-	// ********** timed waits **********
-
-	/**
-	 * Suspend the current thread until the value changes
-	 * to the specified value or the specified time-out occurs.
-	 * The time-out is specified in milliseconds. Return true if the specified
-	 * value was achieved; return false if a time-out occurred.
-	 * If the value is already the specified value, return true immediately.
-	 */
-	public boolean waitUntilValueIs(T v, long timeout) throws InterruptedException {
-		synchronized (this.mutex) {
-			if (timeout == 0L) {
-				this.waitUntilValueIs(v);	// wait indefinitely until notified
-				return true;	// if it ever comes back, the condition was met
-			}
-
-			long stop = System.currentTimeMillis() + timeout;
-			long remaining = timeout;
-			while ((this.value != v) && (remaining > 0L)) {
-				this.mutex.wait(remaining);
-				remaining = stop - System.currentTimeMillis();
-			}
-			return (this.value == v);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the value changes to something
-	 * other than the specified value or the specified time-out occurs.
-	 * The time-out is specified in milliseconds. Return true if the specified
-	 * value was removed; return false if a time-out occurred.
-	 * If the value is already NOT the specified value, return true immediately.
-	 */
-	public boolean waitUntilValueIsNot(T v, long timeout) throws InterruptedException {
-		synchronized (this.mutex) {
-			if (timeout == 0L) {
-				this.waitUntilValueIsNot(v);	// wait indefinitely until notified
-				return true;	// if it ever comes back, the condition was met
-			}
-
-			long stop = System.currentTimeMillis() + timeout;
-			long remaining = timeout;
-			while ((this.value == v) && (remaining > 0L)) {
-				this.mutex.wait(remaining);
-				remaining = stop - System.currentTimeMillis();
-			}
-			return (this.value != v);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the value changes
-	 * to null or the specified time-out occurs.
-	 * The time-out is specified in milliseconds. Return true if the specified
-	 * value was achieved; return false if a time-out occurred.
-	 * If the value is already null, return true immediately.
-	 */
-	public boolean waitUntilNull(long timeout) throws InterruptedException {
-		synchronized (this.mutex) {
-			return this.waitUntilValueIs(null, timeout);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the value changes
-	 * to something other than null or the specified time-out occurs.
-	 * The time-out is specified in milliseconds. Return true if the specified
-	 * value was achieved; return false if a time-out occurred.
-	 * If the value is already NOT null, return true immediately.
-	 */
-	public boolean waitUntilNotNull(long timeout) throws InterruptedException {
-		synchronized (this.mutex) {
-			return this.waitUntilValueIsNot(null, timeout);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the value changes to
-	 * something other than the specified value, then change
-	 * it back to the specified value and continue executing.
-	 * If the value does not change to something other than the
-	 * specified before the time-out, simply continue executing
-	 * without changing the value.
-	 * The time-out is specified in milliseconds. Return true if the value was
-	 * set to true; return false if a time-out occurred.
-	 * If the value is already something other than the specified value, set
-	 * the value immediately and return true.
-	 */
-	public boolean waitToSetValue(T v, long timeout) throws InterruptedException {
-		synchronized (this.mutex) {
-			boolean success = this.waitUntilValueIsNot(v, timeout);
-			if (success) {
-				this.setValue(v);
-			}
-			return success;
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the value changes to something
-	 * other than null, then change it back to null and continue executing.
-	 * If the value does not change to something other than null before
-	 * the time-out, simply continue executing without changing the value.
-	 * The time-out is specified in milliseconds. Return true if the value was
-	 * set to false; return false if a time-out occurred.
-	 * If the value is already something other than null, set
-	 * the value to null immediately and return true.
-	 */
-	public boolean waitToSetNull(long timeout) throws InterruptedException {
-		synchronized (this.mutex) {
-			boolean success = this.waitUntilNotNull(timeout);
-			if (success) {
-				this.setValue(null);
-			}
-			return success;
-		}
-	}
-
-
-	// ********** synchronized behavior **********
-
-	/**
-	 * If current thread is not interrupted, execute the specified command 
-	 * with the mutex locked. This is useful for initializing the value in another
-	 * thread.
-	 */
-	public void execute(Command command) throws InterruptedException {
-		if (Thread.interrupted()) {
-			throw new InterruptedException();
-		}
-		synchronized (this.mutex) {
-			command.execute();
-		}
-	}
-
-
-	// ********** standard methods **********
-
-	@Override
-	public SynchronizedObject<T> clone() {
-		try {
-			synchronized (this.mutex) {
-				@SuppressWarnings("unchecked")
-				SynchronizedObject<T> clone = (SynchronizedObject<T>) super.clone();
-				return clone;
-			}
-		} catch (CloneNotSupportedException ex) {
-			throw new InternalError();
-		}
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if ( ! (obj instanceof SynchronizedObject)) {
-			return false;
-		}
-		Object v1 = this.value();
-		Object v2 = ((SynchronizedObject<?>) obj).value();
-		return (v1 == null) ?
-			(v2 == null) : v1.equals(v2);
-	}
-
-	@Override
-	public int hashCode() {
-		Object v = this.value();
-		return (v == null) ? 0 : v.hashCode();
-	}
-
-	@Override
-	public String toString() {
-		return String.valueOf(this.value());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SynchronizedStack.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SynchronizedStack.java
deleted file mode 100644
index e232c402ff..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SynchronizedStack.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import java.io.Serializable;
-import java.util.EmptyStackException;
-import org.eclipse.jpt.utility.Command;
-
-/**
- * Thread-safe implementation of the Stack interface.
- * This also provides protocol for suspending a thread until the
- * stack is empty or not empty, with optional time-outs.
- */
-public class SynchronizedStack<E>
-	implements Stack<E>, Serializable
-{
-	/** Backing stack. */
-	private Stack<E> stack;
-
-	/** Object to synchronize on. */
-	private final Object mutex;
-
-	private static final long serialVersionUID = 1L;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a synchronized stack that wraps the
-	 * specified stack and locks on the specified mutex.
-	 */
-	public SynchronizedStack(Stack<E> stack, Object mutex) {
-		super();
-		this.stack = stack;
-		this.mutex = mutex;
-	}
-
-	/**
-	 * Construct a synchronized stack that wraps the
-	 * specified stack and locks on itself.
-	 */
-	public SynchronizedStack(Stack<E> stack) {
-		super();
-		this.stack = stack;
-		this.mutex = this;
-	}
-
-	/**
-	 * Construct a synchronized stack that locks on the specified mutex.
-	 */
-	public SynchronizedStack(Object mutex) {
-		this(new SimpleStack<E>(), mutex);
-	}
-
-	/**
-	 * Construct a synchronized stack that locks on itself.
-	 */
-	public SynchronizedStack() {
-		this(new SimpleStack<E>());
-	}
-
-
-	// ********** Stack implementation **********
-
-	public void push(E o) {
-		synchronized (this.mutex) {
-			this.stack.push(o);
-			this.mutex.notifyAll();
-		}
-	}
-
-	public E pop() {
-		synchronized (this.mutex) {
-			E o = this.stack.pop();
-			this.mutex.notifyAll();
-			return o;
-		}
-	}
-
-	public E peek() {
-		synchronized (this.mutex) {
-			return this.stack.peek();
-		}
-	}
-
-	public boolean isEmpty() {
-		synchronized (this.mutex) {
-			return this.stack.isEmpty();
-		}
-	}
-
-
-	// ********** indefinite waits **********
-
-	/**
-	 * Suspend the current thread until the stack's empty status changes
-	 * to the specified value.
-	 */
-	public void waitUntilEmptyIs(boolean empty) throws InterruptedException {
-		synchronized (this.mutex) {
-			while (this.isEmpty() != empty) {
-				this.mutex.wait();
-			}
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the stack is empty.
-	 */
-	public void waitUntilEmpty() throws InterruptedException {
-		synchronized (this.mutex) {
-			this.waitUntilEmptyIs(true);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the stack has something on it.
-	 */
-	public void waitUntilNotEmpty() throws InterruptedException {
-		synchronized (this.mutex) {
-			this.waitUntilEmptyIs(false);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the stack is empty,
-	 * then "push" the specified item on to the top of the stack
-	 * and continue executing.
-	 */
-	public void waitToPush(E o) throws InterruptedException {
-		synchronized (this.mutex) {
-			this.waitUntilEmpty();
-			this.push(o);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the stack has something on it,
-	 * then "pop" an item from the top of the stack and return it.
-	 */
-	public Object waitToPop() throws InterruptedException {
-		synchronized (this.mutex) {
-			this.waitUntilNotEmpty();
-			return this.pop();
-		}
-	}
-
-
-	// ********** timed waits **********
-
-	/**
-	 * Suspend the current thread until the stack's empty status changes
-	 * to the specified value or the specified time-out occurs.
-	 * The time-out is specified in milliseconds. Return true if the specified
-	 * value was achieved; return false if a time-out occurred.
-	 */
-	public boolean waitUntilEmptyIs(boolean empty, long timeout) throws InterruptedException {
-		synchronized (this.mutex) {
-			if (timeout == 0L) {
-				this.waitUntilEmptyIs(empty);	// wait indefinitely until notified
-				return true;	// if it ever comes back, the condition was met
-			}
-
-			long stop = System.currentTimeMillis() + timeout;
-			long remaining = timeout;
-			while ((this.isEmpty() != empty) && (remaining > 0L)) {
-				this.mutex.wait(remaining);
-				remaining = stop - System.currentTimeMillis();
-			}
-			return (this.isEmpty() == empty);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the stack is empty
-	 * or the specified time-out occurs.
-	 * The time-out is specified in milliseconds. Return true if
-	 * the stack is empty; return false if a time-out occurred.
-	 */
-	public boolean waitUntilEmpty(long timeout) throws InterruptedException {
-		synchronized (this.mutex) {
-			return this.waitUntilEmptyIs(true, timeout);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the stack has something on it.
-	 * or the specified time-out occurs.
-	 * The time-out is specified in milliseconds. Return true if
-	 * the stack has something on it; return false if a time-out occurred.
-	 */
-	public boolean waitUntilNotEmpty(long timeout) throws InterruptedException {
-		synchronized (this.mutex) {
-			return this.waitUntilEmptyIs(false, timeout);
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the stack is empty,
-	 * then "push" the specified item on to the top of the stack
-	 * and continue executing. If the stack is not emptied out
-	 * before the time-out, simply continue executing without
-	 * "pushing" the item.
-	 * The time-out is specified in milliseconds. Return true if the
-	 * item was pushed; return false if a time-out occurred.
-	 */
-	public boolean waitToPush(E o, long timeout) throws InterruptedException {
-		synchronized (this.mutex) {
-			boolean success = this.waitUntilEmpty(timeout);
-			if (success) {
-				this.push(o);
-			}
-			return success;
-		}
-	}
-
-	/**
-	 * Suspend the current thread until the stack has something on it,
-	 * then "pop" an item from the top of the stack and return it.
-	 * If the stack is empty and nothing is "pushed" on to it before the
-	 * time-out, throw an empty stack exception.
-	 * The time-out is specified in milliseconds.
-	 */
-	public Object waitToPop(long timeout) throws InterruptedException {
-		synchronized (this.mutex) {
-			boolean success = this.waitUntilNotEmpty(timeout);
-			if (success) {
-				return this.pop();
-			}
-			throw new EmptyStackException();
-		}
-	}
-
-
-	// ********** synchronized behavior **********
-
-	/**
-	 * If the current thread is not interrupted, execute the specified command 
-	 * with the mutex locked. This is useful for initializing the stack in another
-	 * thread.
-	 */
-	public void execute(Command command) throws InterruptedException {
-		if (Thread.interrupted()) {
-			throw new InterruptedException();
-		}
-		synchronized (this.mutex) {
-			command.execute();
-		}
-	}
-
-
-	// ********** additional public protocol **********
-
-	/**
-	 * Return the object this object locks on while performing
-	 * its operations.
-	 */
-	public Object mutex() {
-		return this.mutex;
-	}
-
-
-	// ********** Object overrides **********
-
-	@Override
-	public String toString() {
-		synchronized (this.mutex) {
-			return this.stack.toString();
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/ThreadLocalCommand.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/ThreadLocalCommand.java
deleted file mode 100644
index c12038e502..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/ThreadLocalCommand.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import org.eclipse.jpt.utility.Command;
-
-/**
- * This implementation of the Command interface allows the client to
- * specify a different Command for each thread.
- */
-public class ThreadLocalCommand implements Command {
-	protected final ThreadLocal<Command> threadLocal;
-	protected final Command defaultCommand;
-
-	/**
-	 * The default command does nothing.
-	 */
-	public ThreadLocalCommand() {
-		this(Command.Null.instance());
-	}
-
-	public ThreadLocalCommand(Command defaultCommand) {
-		super();
-		this.defaultCommand = defaultCommand;
-		this.threadLocal = this.buildThreadLocal();
-	}
-
-	protected ThreadLocal<Command> buildThreadLocal() {
-		return new ThreadLocal<Command>();
-	}
-
-	public void execute() {
-		this.get().execute();
-	}
-
-	protected Command get() {
-		Command command = this.threadLocal.get();
-		return (command != null) ? command : this.defaultCommand;
-	}
-
-	/**
-	 * Set the current thread's command to the specified value.
-	 */
-	public void set(Command command) {
-		this.threadLocal.set(command);
-	}
-
-	/**
-	 * Return the string representation of the current thread's command.
-	 */
-	@Override
-	public String toString() {
-		return this.get().toString();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/ThreadLocalCommandExecutor.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/ThreadLocalCommandExecutor.java
deleted file mode 100644
index 7cb49b4e93..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/ThreadLocalCommandExecutor.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-import org.eclipse.jpt.utility.Command;
-import org.eclipse.jpt.utility.CommandExecutor;
-
-/**
- * This implementation of the CommandExecutor interface allows the client to
- * specify a different Command Executor for each thread.
- */
-public class ThreadLocalCommandExecutor implements CommandExecutor {
-	protected final ThreadLocal<CommandExecutor> threadLocal;
-	protected final CommandExecutor defaultCommandExecutor;
-
-	/**
-	 * The default command executor simply executes the command directly.
-	 */
-	public ThreadLocalCommandExecutor() {
-		this(CommandExecutor.Default.instance());
-	}
-
-	public ThreadLocalCommandExecutor(CommandExecutor defaultCommandExecutor) {
-		super();
-		this.defaultCommandExecutor = defaultCommandExecutor;
-		this.threadLocal = this.buildThreadLocal();
-	}
-
-	protected ThreadLocal<CommandExecutor> buildThreadLocal() {
-		return new ThreadLocal<CommandExecutor>();
-	}
-
-	public void execute(Command command) {
-		this.get().execute(command);
-	}
-
-	protected CommandExecutor get() {
-		CommandExecutor ce = this.threadLocal.get();
-		return (ce != null) ? ce : this.defaultCommandExecutor;
-	}
-
-	/**
-	 * Set the current thread's command executor to the specified value.
-	 */
-	public void set(CommandExecutor commandExecutor) {
-		this.threadLocal.set(commandExecutor);
-	}
-
-	/**
-	 * Return the string representation of the current thread's command
-	 * executor.
-	 */
-	@Override
-	public String toString() {
-		return this.get().toString();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Transformer.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Transformer.java
deleted file mode 100644
index 946e69783f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/Transformer.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal;
-
-/**
- * Used by various "pluggable" classes to transform objects.
- * Transform an object of type T1 to an object of type T2.
- */
-public interface Transformer<T1, T2> {
-
-	/**
-	 * Return the transformed object.
-	 * The semantics of "transform" is determined by the
-	 * contract between the client and the server.
-	 */
-	T2 transform(T1 o);
-
-
-	final class Null<S1, S2> implements Transformer<S1, S2> {
-		@SuppressWarnings("unchecked")
-		public static final Transformer INSTANCE = new Null();
-		@SuppressWarnings("unchecked")
-		public static <R1, R2> Transformer<R1, R2> instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Null() {
-			super();
-		}
-		// simply return the object, unchanged
-		@SuppressWarnings("unchecked")
-		public S2 transform(S1 o) {
-			return (S2) o;
-		}
-		@Override
-		public String toString() {
-			return "Transformer.Null"; //$NON-NLS-1$
-		}
-	}
-
-	final class Disabled<S1, S2> implements Transformer<S1, S2> {
-		@SuppressWarnings("unchecked")
-		public static final Transformer INSTANCE = new Disabled();
-		@SuppressWarnings("unchecked")
-		public static <R1, R2> Transformer<R1, R2> instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Disabled() {
-			super();
-		}
-		// throw an exception
-		public S2 transform(S1 o) {
-			throw new UnsupportedOperationException();
-		}
-		@Override
-		public String toString() {
-			return "Transformer.Disabled"; //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/XMLStringEncoder.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/XMLStringEncoder.java
deleted file mode 100644
index cd9ab18c61..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/XMLStringEncoder.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.utility.internal;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-
-/**
- * This encoder will replace any of a specified set of characters with an XML
- * "character reference": '/' => "&#x2f;"
- */
-public final class XMLStringEncoder {
-
-	/** The set of characters to be converted into XML character references. */
-	private final char[] chars;
-
-	/** Cache the value of the highest character in the set above. */
-	private final char maxChar;
-
-
-	// ********** constructors/initialization **********
-
-	/**
-	 * Construct an encoder that converts the specified set of characters
-	 * into XML character references.
-	 */
-	public XMLStringEncoder(char[] chars) {
-		super();
-		if (chars == null) {
-			throw new NullPointerException();
-		}
-		// the ampersand must be included since it is the escape character
-		if (CollectionTools.contains(chars, '&')) {
-			this.chars = chars;
-		} else {
-			this.chars = CollectionTools.add(chars, '&');
-		}
-		this.maxChar = this.calculateMaxInvalidFileNameChar();
-	}
-
-	/**
-	 * Calculate the maximum value of the set of characters to be converted
-	 * into XML character references. This will be used to short-circuit the
-	 * search for a character in the set.
-	 * @see #charIsToBeEncoded(char)
-	 */
-	private char calculateMaxInvalidFileNameChar() {
-		char[] localChars = this.chars;
-		char max = 0;
-		for (int i = localChars.length; i-- > 0; ) {
-			char c = localChars[i];
-			if (max < c) {
-				max = c;
-			}
-		}
-		return max;
-	}
-
-
-	// ********** API **********
-
-	/**
-	 * Return the specified string with any characters in the set
-	 * replaced with XML character references.
-	 */
-	public String encode(String s) {
-		int len = s.length();
-		// allow for a few encoded characters
-		StringBuilder sb = new StringBuilder(len + 20);
-		for (int i = 0; i < len; i++) {
-			this.appendCharacterTo(s.charAt(i), sb);
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * Return the specified string with any XML character references
-	 * replaced by the characters themselves.
-	 */
-	public String decode(String s) {
-		StringBuilder sb = new StringBuilder(s.length());
-		StringBuilder temp = new StringBuilder();	// performance tweak
-		this.decodeTo(new StringReader(s), sb, temp);
-		return sb.toString();
-	}
-
-
-	// ********** internal methods **********
-
-	/**
-	 * Append the specified character to the string buffer,
-	 * converting it to an XML character reference if necessary.
-	 */
-	private void appendCharacterTo(char c, StringBuilder sb) {
-		if (this.charIsToBeEncoded(c)) {
-			this.appendCharacterReferenceTo(c, sb);
-		} else {
-			sb.append(c);
-		}
-	}
-
-	/**
-	 * Return whether the specified character is one of the characters
-	 * to be converted to XML character references.
-	 */
-	private boolean charIsToBeEncoded(char c) {
-		return (c <= this.maxChar) && CollectionTools.contains(this.chars, c);
-	}
-
-	/**
-	 * Append the specified character's XML character reference to the
-	 * specified string buffer (e.g. '/' => "&#x2f;").
-	 */
-	private void appendCharacterReferenceTo(char c, StringBuilder sb) {
-		sb.append("&#x"); //$NON-NLS-1$
-		sb.append(Integer.toString(c, 16));
-		sb.append(';');
-	}
-
-	private void decodeTo(Reader reader, StringBuilder sb, StringBuilder temp) {
-		try {
-			this.decodeTo_(reader, sb, temp);
-		} catch (IOException ex) {
-			throw new RuntimeException(ex);
-		}
-	}
-
-	private void decodeTo_(Reader reader, StringBuilder sb, StringBuilder temp) throws IOException {
-		int c = reader.read();
-		while (c != -1) {
-			if (c == '&') {
-				this.decodeCharacterReferenceTo(reader, sb, temp);
-			} else {
-				sb.append((char) c);
-			}
-			c = reader.read();
-		}
-		reader.close();
-	}
-
-	private void decodeCharacterReferenceTo(Reader reader, StringBuilder sb, StringBuilder temp) throws IOException {
-		int c = reader.read();
-		this.checkChar(c, '#');
-		c = reader.read();
-		this.checkChar(c, 'x');
-
-		temp.setLength(0);  // re-use temp
-		c = reader.read();
-		while (c != ';') {
-			this.checkEndOfStream(c);
-			temp.append((char) c);
-			c = reader.read();
-		}
-		String charValue = temp.toString();
-		if (charValue.length() == 0) {
-			throw new IllegalStateException("missing numeric string"); //$NON-NLS-1$
-		}
-		sb.append((char) Integer.parseInt(charValue, 16));
-	}
-
-	private void checkChar(int c, int expected) {
-		this.checkEndOfStream(c);
-		if (c != expected) {
-			throw new IllegalStateException("expected '" + (char) expected + "', but encountered '" + (char) c + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-	}
-
-	private void checkEndOfStream(int c) {
-		if (c == -1) {
-			throw new IllegalStateException("unexpected end of string"); //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ArrayIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ArrayIterator.java
deleted file mode 100644
index d0dd0f64e1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ArrayIterator.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.utility.internal.iterators;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * An <code>ArrayIterator</code> provides an <code>Iterator</code>
- * for an array of objects of type E.
- */
-public class ArrayIterator<E>
-	implements Iterator<E>
-{
-	final E[] array;	// private-protected
-	int nextIndex;		// private-protected
-	private final int maxIndex;
-
-	/**
-	 * Construct an iterator for the specified array.
-	 */
-	public ArrayIterator(E... array) {
-		this(array, 0, array.length);
-	}
-	
-	/**
-	 * Construct an iterator for the specified array,
-	 * starting at the specified start index and continuing for
-	 * the specified length.
-	 */
-	public ArrayIterator(E[] array, int start, int length) {
-		if ((start < 0) || (start > array.length)) {
-			throw new IllegalArgumentException("start: " + start); //$NON-NLS-1$
-		}
-		if ((length < 0) || (length > array.length - start)) {
-			throw new IllegalArgumentException("length: " + length); //$NON-NLS-1$
-		}
-		this.array = array;
-		this.nextIndex = start;
-		this.maxIndex = start + length;
-	}
-	
-	public boolean hasNext() {
-		return this.nextIndex < this.maxIndex;
-	}
-	
-	public E next() {
-		if (this.hasNext()) {
-			return this.array[this.nextIndex++];
-		}
-		throw new NoSuchElementException();
-	}
-	
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-	
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, Arrays.toString(this.array));
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ArrayListIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ArrayListIterator.java
deleted file mode 100644
index 5b70ed4721..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ArrayListIterator.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.ListIterator;
-import java.util.NoSuchElementException;
-
-/**
- * An <code>ArrayListIterator</code> provides a <code>ListIterator</code>
- * for an array of objects.
- * 
- * The name might be a bit confusing:
- * This is a <code>ListIterator</code> for an <code>Array</code>;
- * <em>not</em> an <code>Iterator</code> for an <code>ArrayList</code>.
- */
-public class ArrayListIterator<E>
-	extends ArrayIterator<E>
-	implements ListIterator<E>
-{
-	private final int minIndex;
-
-	/**
-	 * Construct a list iterator for the specified array.
-	 */
-	public ArrayListIterator(E... array) {
-		this(array, 0, array.length);
-	}
-	
-	/**
-	 * Construct a list iterator for the specified array,
-	 * starting at the specified start index and continuing for
-	 * the specified length.
-	 */
-	public ArrayListIterator(E[] array, int start, int length) {
-		super(array, start, length);
-		this.minIndex = start;
-	}
-	
-	public int nextIndex() {
-		return this.nextIndex;
-	}
-	
-	public int previousIndex() {
-		return this.nextIndex - 1;
-	}
-	
-	public boolean hasPrevious() {
-		return this.nextIndex > this.minIndex;
-	}
-	
-	public E previous() {
-		if (this.hasPrevious()) {
-			return this.array[--this.nextIndex];
-		}
-		throw new NoSuchElementException();
-	}
-	
-	public void add(E e) {
-		throw new UnsupportedOperationException();
-	}
-	
-	public void set(E e) {
-		throw new UnsupportedOperationException();
-	}
-	
-	@Override
-	public String toString() {
-		return super.toString();
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ChainIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ChainIterator.java
deleted file mode 100644
index ba538d6329..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ChainIterator.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.utility.internal.iterators;
-
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * A <code>ChainIterator</code> provides a pluggable <code>Iterator</code>
- * that loops over a chain of arbitrarily linked objects. The chain
- * should be null-terminated (i.e. a call to the <code>nextLink(Object)</code>
- * method should return <code>null</code> when it is passed the last
- * link of the chain).
- * To use, supply a starting link and supply a <code>Linker</code> or 
- * subclass <code>ChainIterator</code> and override the
- * <code>nextLink(Object)</code> method.
- * The starting link will be the first object returned by the iterator.
- * If the starting link is <code>null</code>, the iterator will be empty.
- * Note that the iterator does not support <code>null</code> elements.
- */
-public class ChainIterator<E>
-	implements Iterator<E>
-{
-	private E nextLink;
-	private final Linker<E> linker;
-
-
-	/**
-	 * Construct an iterator with the specified starting link
-	 * and a disabled linker.
-	 * Use this constructor if you want to override the
-	 * <code>nextLink(Object)</code> method instead of building
-	 * a <code>Linker</code>.
-	 */
-	public ChainIterator(E startLink) {
-		this(startLink, Linker.Disabled.<E>instance());
-	}
-	
-	/**
-	 * Construct an iterator with the specified starting link
-	 * and linker.
-	 */
-	public ChainIterator(E startLink, Linker<E> linker) {
-		super();
-		this.nextLink = startLink;
-		this.linker = linker;
-	}
-	
-	public boolean hasNext() {
-		return this.nextLink != null;
-	}
-	
-	public E next() {
-		if (this.nextLink == null) {
-			throw new NoSuchElementException();
-		}
-		E result = this.nextLink;
-		this.nextLink = this.nextLink(this.nextLink);
-		return result;
-	}
-	
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * Return the next link in the chain.
-	 */
-	protected E nextLink(E currentLink) {
-		return this.linker.nextLink(currentLink);
-	}
-	
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.nextLink);
-	}
-	
-
-	//********** inner classes **********
-
-	/**
-	 * Used by <code>ChainIterator</code> to link
-	 * the elements in the chain.
-	 */
-	public interface Linker<T> {
-
-		/**
-		 * Return the next link in the chain.
-		 */
-		T nextLink(T currentLink);
-
-
-		final class Null<S> implements Linker<S> {
-			@SuppressWarnings("unchecked")
-			public static final Linker INSTANCE = new Null();
-			@SuppressWarnings("unchecked")
-			public static <R> Linker<R> instance() {
-				return INSTANCE;
-			}
-			// ensure single instance
-			private Null() {
-				super();
-			}
-			// simply return null, indicating the chain is ended
-			public S nextLink(S currentLink) {
-				return null;
-			}
-			@Override
-			public String toString() {
-				return "ChainIterator.Linker.Null"; //$NON-NLS-1$
-			}
-		}
-
-		final class Disabled<S> implements Linker<S> {
-			@SuppressWarnings("unchecked")
-			public static final Linker INSTANCE = new Disabled();
-			@SuppressWarnings("unchecked")
-			public static <R> Linker<R> instance() {
-				return INSTANCE;
-			}
-			// ensure single instance
-			private Disabled() {
-				super();
-			}
-			// throw an exception
-			public S nextLink(S currentLink) {
-				throw new UnsupportedOperationException();  // ChainIterator.nextLink(Object) was not implemented
-			}
-			@Override
-			public String toString() {
-				return "ChainIterator.Linker.Disabled"; //$NON-NLS-1$
-			}
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/CloneIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/CloneIterator.java
deleted file mode 100644
index 7976439a03..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/CloneIterator.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.Collection;
-import java.util.Iterator;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * A <code>CloneIterator</code> iterates over a copy of a collection,
- * allowing for concurrent access to the original collection.
- * <p>
- * The original collection passed to the <code>CloneIterator</code>'s
- * constructor should be synchronized; otherwise you run the risk of
- * a corrupted collection.
- * <p>
- * By default, a <code>CloneIterator</code> does not support the
- * <code>#remove()</code> operation; this is because it does not have
- * access to the original collection. But if the <code>CloneIterator</code>
- * is supplied with an <code>Mutator</code> it will delegate the
- * <code>#remove()</code> operation to the <code>Mutator</code>.
- * Alternatively, a subclass can override the <code>#remove(Object)</code>
- * method.
- */
-public class CloneIterator<E>
-	implements Iterator<E>
-{
-	private final Iterator<Object> nestedIterator;
-	private E current;
-	private final Mutator<E> mutator;
-	private boolean removeAllowed;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct an iterator on a copy of the specified collection.
-	 * The <code>#remove()</code> method will not be supported,
-	 * unless a subclass overrides the <code>#remove(Object)</code>.
-	 */
-	public CloneIterator(Collection<? extends E> c) {
-		this(c, Mutator.ReadOnly.<E>instance());
-	}
-
-	/**
-	 * Construct an iterator on a copy of the specified collection.
-	 * Use the specified mutator to remove objects from the
-	 * original collection.
-	 */
-	public CloneIterator(Collection<? extends E> c, Mutator<E> mutator) {
-		super();
-		this.nestedIterator = new ArrayIterator<Object>(c.toArray());
-		this.current = null;
-		this.mutator = mutator;
-		this.removeAllowed = false;
-	}
-
-
-	// ********** Iterator implementation **********
-
-	public boolean hasNext() {
-		return this.nestedIterator.hasNext();
-	}
-
-	public E next() {
-		this.current = this.nestedNext();
-		this.removeAllowed = true;
-		return this.current;
-	}
-
-	public void remove() {
-		if ( ! this.removeAllowed) {
-			throw new IllegalStateException();
-		}
-		this.remove(this.current);
-		this.removeAllowed = false;
-	}
-
-
-	// ********** internal methods **********
-
-	/**
-	 * The collection passed in during construction held Es,
-	 * so this cast is not a problem. We need this cast because
-	 * all the elements of the original collection were copied into
-	 * an object array (Object[]).
-	 */
-	@SuppressWarnings("unchecked")
-	protected E nestedNext() {
-		return (E) this.nestedIterator.next();
-	}
-
-	/**
-	 * Remove the specified element from the original collection.
-	 * <p>
-	 * This method can be overridden by a subclass as an
-	 * alternative to building an <code>Mutator</code>.
-	 */
-	protected void remove(E e) {
-		this.mutator.remove(e);
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this);
-	}
-
-
-	//********** member interface **********
-
-	/**
-	 * Used by <code>CloneIterator</code> to remove
-	 * elements from the original collection; since the iterator
-	 * does not have direct access to the original collection.
-	 */
-	public interface Mutator<T> {
-
-		/**
-		 * Remove the specified object from the original collection.
-		 */
-		void remove(T current);
-
-
-		final class ReadOnly<S> implements Mutator<S> {
-			@SuppressWarnings("unchecked")
-			public static final Mutator INSTANCE = new ReadOnly();
-			@SuppressWarnings("unchecked")
-			public static <R> Mutator<R> instance() {
-				return INSTANCE;
-			}
-			// ensure single instance
-			private ReadOnly() {
-				super();
-			}
-			// remove is not supported
-			public void remove(Object current) {
-				throw new UnsupportedOperationException();
-			}
-			@Override
-			public String toString() {
-				return "CloneIterator.Mutator.ReadOnly"; //$NON-NLS-1$
-			}
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/CloneListIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/CloneListIterator.java
deleted file mode 100644
index 86de5a0b4d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/CloneListIterator.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.utility.internal.iterators;
-
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * A <code>CloneListIterator</code> iterates over a copy of a list,
- * allowing for concurrent access to the original list.
- * <p>
- * The original list passed to the <code>CloneListIterator</code>'s
- * constructor should be synchronized; otherwise you run the risk of
- * a corrupted list.
- * <p>
- * By default, a <code>CloneListIterator</code> does not support the
- * modification operations; this is because it does not have
- * access to the original list. But if the <code>CloneListIterator</code>
- * is supplied with a <code>Mutator</code> it will delegate the
- * modification operations to the <code>Mutator</code>.
- * Alternatively, a subclass can override the modification methods.
- */
-public class CloneListIterator<E>
-	implements ListIterator<E>
-{
-	private final ListIterator<Object> nestedListIterator;
-	private int cursor;
-	private State state;
-	private final Mutator<E> mutator;
-
-	private enum State {
-		UNKNOWN,
-		PREVIOUS,
-		NEXT
-	}
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a list iterator on a copy of the specified list.
-	 * The modification methods will not be supported,
-	 * unless a subclass overrides them.
-	 */
-	public CloneListIterator(List<? extends E> list) {
-		this(list, Mutator.ReadOnly.<E>instance());
-	}
-
-	/**
-	 * Construct a list iterator on a copy of the specified list.
-	 * Use the specified list mutator to modify the original list.
-	 */
-	public CloneListIterator(List<? extends E> list, Mutator<E> mutator) {
-		super();
-		// build a copy of the list and keep it in synch with original (if the mutator allows changes)
-		// that way the nested list iterator will maintain some of our state
-		this.nestedListIterator = CollectionTools.list(list.toArray()).listIterator();
-		this.mutator = mutator;
-		this.cursor = 0;
-		this.state = State.UNKNOWN;
-	}
-
-
-	// ********** ListIterator implementation **********
-
-	public boolean hasNext() {
-		return this.nestedListIterator.hasNext();
-	}
-
-	public E next() {
-		// allow the nested iterator to throw an exception before we modify the index
-		E next = this.nestedNext();
-		this.cursor++;
-		this.state = State.NEXT;
-		return next;
-	}
-
-	public void remove() {
-		// allow the nested iterator to throw an exception before we modify the original list
-		this.nestedListIterator.remove();
-		if (this.state == State.PREVIOUS) {
-			this.remove(this.cursor);
-		} else {
-			this.cursor--;
-			this.remove(this.cursor);
-		}
-	}
-
-	public int nextIndex() {
-		return this.nestedListIterator.nextIndex();
-	}
-
-	public int previousIndex() {
-		return this.nestedListIterator.previousIndex();
-	}
-
-	public boolean hasPrevious() {
-		return this.nestedListIterator.hasPrevious();
-	}
-
-	public E previous() {
-		// allow the nested iterator to throw an exception before we modify the index
-		E previous = this.nestedPrevious();
-		this.cursor--;
-		this.state = State.PREVIOUS;
-		return previous;
-	}
-
-	public void add(E o) {
-		// allow the nested iterator to throw an exception before we modify the original list
-		this.nestedListIterator.add(o);
-		this.add(this.cursor, o);
-		this.cursor++;
-	}
-
-	public void set(E o) {
-		// allow the nested iterator to throw an exception before we modify the original list
-		this.nestedListIterator.set(o);
-		if (this.state == State.PREVIOUS) {
-			this.set(this.cursor, o);
-		} else {
-			this.set(this.cursor - 1, o);
-		}
-	}
-
-
-	// ********** internal methods **********
-
-	/**
-	 * The list passed in during construction held Es,
-	 * so this cast is not a problem. We need this cast because
-	 * all the elements of the original collection were copied into
-	 * an object array (Object[]).
-	 */
-	@SuppressWarnings("unchecked")
-	protected E nestedNext() {
-		return (E) this.nestedListIterator.next();
-	}
-
-	/**
-	 * The list passed in during construction held Es,
-	 * so this cast is not a problem. We need this cast because
-	 * all the elements of the original collection were copied into
-	 * an object array (Object[]).
-	 */
-	@SuppressWarnings("unchecked")
-	protected E nestedPrevious() {
-		return (E) this.nestedListIterator.previous();
-	}
-
-	/**
-	 * Add the specified element to the original list.
-	 * <p>
-	 * This method can be overridden by a subclass as an
-	 * alternative to building a <code>Mutator</code>.
-	 */
-	protected void add(int index, E o) {
-		this.mutator.add(index, o);
-	}
-
-	/**
-	 * Remove the specified element from the original list.
-	 * <p>
-	 * This method can be overridden by a subclass as an
-	 * alternative to building a <code>Mutator</code>.
-	 */
-	protected void remove(int index) {
-		this.mutator.remove(index);
-	}
-
-	/**
-	 * Set the specified element in the original list.
-	 * <p>
-	 * This method can be overridden by a subclass as an
-	 * alternative to building a <code>Mutator</code>.
-	 */
-	protected void set(int index, E o) {
-		this.mutator.set(index, o);
-	}
-
-
-	// ********** overrides **********
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this);
-	}
-
-
-	//********** member interface **********
-
-	/**
-	 * Used by <code>CloneListIterator</code> to remove
-	 * elements from the original list; since the list iterator
-	 * does not have direct access to the original list.
-	 */
-	public interface Mutator<T> {
-
-		/**
-		 * Add the specified object to the original list.
-		 */
-		void add(int index, T o);
-
-		/**
-		 * Remove the specified object from the original list.
-		 */
-		void remove(int index);
-
-		/**
-		 * Set the specified object in the original list.
-		 */
-		void set(int index, T o);
-
-
-		final class ReadOnly<S> implements Mutator<S> {
-			@SuppressWarnings("unchecked")
-			public static final Mutator INSTANCE = new ReadOnly();
-			@SuppressWarnings("unchecked")
-			public static <R> Mutator<R> instance() {
-				return INSTANCE;
-			}
-			// ensure single instance
-			private ReadOnly() {
-				super();
-			}
-			// add is not supported
-			public void add(int index, Object o) {
-				throw new UnsupportedOperationException();
-			}
-			// remove is not supported
-			public void remove(int index) {
-				throw new UnsupportedOperationException();
-			}
-			// set is not supported
-			public void set(int index, Object o) {
-				throw new UnsupportedOperationException();
-			}
-			@Override
-			public String toString() {
-				return "CloneListIterator.Mutator.ReadOnly"; //$NON-NLS-1$
-			}
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/CompositeIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/CompositeIterator.java
deleted file mode 100644
index 083f535b4a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/CompositeIterator.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * A <code>CompositeIterator</code> wraps a collection
- * of <code>Iterator</code>s and makes them appear to be a single
- * <code>Iterator</code>.
- */
-public class CompositeIterator<E>
-	implements Iterator<E>
-{
-	private final Iterator<? extends Iterator<? extends E>> iterators;
-	private Iterator<? extends E> currentIterator;
-	private Iterator<? extends E> lastIteratorToReturnNext;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct an iterator with the specified collection of iterators.
-	 */
-	public CompositeIterator(Collection<? extends Iterator<? extends E>> iterators) {
-		this(iterators.iterator());
-	}
-
-	/**
-	 * Construct an iterator with the specified collection of iterators.
-	 */
-	public CompositeIterator(Iterator<? extends Iterator<? extends E>> iterators) {
-		super();
-		this.iterators = iterators;
-	}
-
-	/**
-	 * Construct an iterator with the specified object prepended
-	 * to the specified iterator.
-	 */
-	@SuppressWarnings("unchecked")
-	public CompositeIterator(E object, Iterator<? extends E> iterator) {
-		this(new SingleElementIterator<E>(object), iterator);
-	}
-
-	/**
-	 * Construct an iterator with the specified object appended
-	 * to the specified iterator.
-	 */
-	@SuppressWarnings("unchecked")
-	public CompositeIterator(Iterator<? extends E> iterator, E object) {
-		this(iterator, new SingleElementIterator<E>(object));
-	}
-
-	/**
-	 * Construct an iterator with the specified iterators.
-	 */
-	public CompositeIterator(Iterator<? extends E>... iterators) {
-		this(new ArrayIterator<Iterator<? extends E>>(iterators));
-	}
-
-
-	// ********** Iterator implementation **********
-
-	public boolean hasNext() {
-		try {
-			this.loadCurrentIterator();
-		} catch (NoSuchElementException ex) {
-			// this occurs if there are no iterators at all
-			return false;
-		}
-		return this.currentIterator.hasNext();
-	}
-
-	public E next() {
-		this.loadCurrentIterator();
-		E result = this.currentIterator.next();
-
-		// the statement above will throw a NoSuchElementException
-		// if the current iterator is at the end of the line;
-		// so if we get here, we can set 'lastIteratorToReturnNext'
-		this.lastIteratorToReturnNext = this.currentIterator;
-
-		return result;
-	}
-
-	public void remove() {
-		if (this.lastIteratorToReturnNext == null) {
-			// CompositeIterator#next() has never been called
-			throw new IllegalStateException();
-		}
-		this.lastIteratorToReturnNext.remove();
-	}
-
-	/**
-	 * Load currentIterator with the first iterator that <code>hasNext()</code>
-	 * or the final iterator if all the elements have already been retrieved.
-	 */
-	private void loadCurrentIterator() {
-		if (this.currentIterator == null) {
-			this.currentIterator = this.iterators.next();
-		}
-		while (( ! this.currentIterator.hasNext()) && this.iterators.hasNext()) {
-			this.currentIterator = this.iterators.next();
-		}
-	}
-
-
-	// ********** overrides **********
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.iterators);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/CompositeListIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/CompositeListIterator.java
deleted file mode 100644
index c2037f053d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/CompositeListIterator.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.List;
-import java.util.ListIterator;
-import java.util.NoSuchElementException;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * A <code>CompositeListIterator</code> wraps a list
- * of <code>ListIterator</code>s and makes them appear to be a single
- * <code>ListIterator</code>.
- */
-public class CompositeListIterator<E>
-	implements ListIterator<E>
-{
-	private final ListIterator<? extends ListIterator<E>> iterators;
-	private ListIterator<E> nextIterator;
-	private int nextIndex;
- 	/**
- 	 * true if "next" was last returned; false if "previous" was last returned;
- 	 * this determines the effect of remove(Object) on nextIndex
- 	 */
-	private boolean nextReturned;
-	private ListIterator<E> lastIteratorToReturnElement;
-
-
-	/**
-	 * Construct a list iterator with the specified list of list iterators.
-	 */
-	public CompositeListIterator(List<? extends ListIterator<E>> iterators) {
-		this(iterators.listIterator());
-	}
-
-	/**
-	 * Construct a list iterator with the specified list of list iterators.
-	 */
-	public CompositeListIterator(ListIterator<? extends ListIterator<E>> iterators) {
-		super();
-		this.iterators = iterators;
-		this.nextIndex = 0;
-		this.nextReturned = false;
-	}
-
-	/**
-	 * Construct a list iterator with the specified object prepended
-	 * to the specified iterator.
-	 */
-	@SuppressWarnings("unchecked")
-	public CompositeListIterator(E object, ListIterator<E> iterator) {
-		this(new SingleElementListIterator<E>(object), iterator);
-	}
-
-	/**
-	 * Construct a list iterator with the specified object appended
-	 * to the specified iterator.
-	 */
-	@SuppressWarnings("unchecked")
-	public CompositeListIterator(ListIterator<E> iterator, E object) {
-		this(iterator, new SingleElementListIterator<E>(object));
-	}
-
-	/**
-	 * Construct a list iterator with the specified list iterators.
-	 */
-	public CompositeListIterator(ListIterator<E>... iterators) {
-		this(new ArrayListIterator<ListIterator<E>>(iterators));
-	}
-
-	public void add(E o) {
-		this.checkNextIterator();
-		this.nextIterator.add(o);
-		this.nextIndex++;
-	}
-
-	public boolean hasNext() {
-		try {
-			this.loadNextIterator();
-		} catch (NoSuchElementException ex) {
-			// this occurs if there are no iterators at all
-			return false;
-		}
-		return this.nextIterator.hasNext();
-	}
-
-	public boolean hasPrevious() {
-		try {
-			this.loadPreviousIterator();
-		} catch (NoSuchElementException ex) {
-			// this occurs if there are no iterators at all
-			return false;
-		}
-		return this.nextIterator.hasPrevious();
-	}
-
-	public E next() {
-		this.loadNextIterator();
-		E result = this.nextIterator.next();
-
-		// the statement above will throw a NoSuchElementException
-		// if the current iterator is at the end of the line;
-		// so if we get here, we can set the 'lastIteratorToReturnElement'
-		this.lastIteratorToReturnElement = this.nextIterator;
-		this.nextIndex++;
-		this.nextReturned = true;
-
-		return result;
-	}
-
-	public int nextIndex() {
-		return this.nextIndex;
-	}
-
-	public E previous() {
-		this.loadPreviousIterator();
-		E result = this.nextIterator.previous();
-
-		// the statement above will throw a NoSuchElementException
-		// if the current iterator is at the end of the line;
-		// so if we get here, we can set the 'lastIteratorToReturnElement'
-		this.lastIteratorToReturnElement = this.nextIterator;
-		this.nextIndex--;
-		this.nextReturned = false;
-
-		return result;
-	}
-
-	public int previousIndex() {
-		return this.nextIndex  - 1;
-	}
-
-	public void remove() {
-		if (this.lastIteratorToReturnElement == null) {
-			throw new IllegalStateException();
-		}
-		this.lastIteratorToReturnElement.remove();
-		if (this.nextReturned) {
-			// decrement the index because the "next" element has moved forward in the list
-			this.nextIndex--;
-		}
-	}
-
-	public void set(E e) {
-		if (this.lastIteratorToReturnElement == null) {
-			throw new IllegalStateException();
-		}
-		this.lastIteratorToReturnElement.set(e);
-	}
-
-	/**
-	 * Load 'nextIterator' with the first iterator that <code>hasNext()</code>
-	 * or the final iterator if all the elements have already been retrieved.
-	 */
-	private void loadNextIterator() {
-		this.checkNextIterator();
-		while (( ! this.nextIterator.hasNext()) && this.iterators.hasNext()) {
-			this.nextIterator = this.iterators.next();
-		}
-	}
-
-	/**
-	 * Load 'nextIterator' with the first iterator that <code>hasPrevious()</code>
-	 * or the first iterator if all the elements have already been retrieved.
-	 */
-	private void loadPreviousIterator() {
-		this.checkNextIterator();
-		while (( ! this.nextIterator.hasPrevious()) && this.iterators.hasPrevious()) {
-			this.nextIterator = this.iterators.previous();
-		}
-	}
-
-	/**
-	 * If 'nextIterator' is null, load it with the first iterator.
-	 */
-	private void checkNextIterator() {
-		if (this.nextIterator == null) {
-			this.nextIterator = this.iterators.next();
-		}
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.iterators);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/EmptyEnumeration.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/EmptyEnumeration.java
deleted file mode 100644
index 1e7721a892..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/EmptyEnumeration.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * A <code>NullEnumeration</code> is just that.
- */
-public final class EmptyEnumeration<E>
-	implements Enumeration<E>
-{
-
-	// singleton
-	@SuppressWarnings("unchecked")
-	private static final EmptyEnumeration INSTANCE = new EmptyEnumeration();
-
-	/**
-	 * Return the singleton.
-	 */
-	@SuppressWarnings("unchecked")
-	public static <T> Enumeration<T> instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EmptyEnumeration() {
-		super();
-	}
-
-	public boolean hasMoreElements() {
-		return false;
-	}
-
-	public E nextElement() {
-		throw new NoSuchElementException();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/EmptyIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/EmptyIterator.java
deleted file mode 100644
index aacac33339..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/EmptyIterator.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * An <code>EmptyIterator</code> is just that.
- */
-public final class EmptyIterator<E>
-	implements Iterator<E>
-{
-
-	// singleton
-	@SuppressWarnings("unchecked")
-	private static final EmptyIterator INSTANCE = new EmptyIterator();
-
-	/**
-	 * Return the singleton.
-	 */
-	@SuppressWarnings("unchecked")
-	public static <T> Iterator<T> instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EmptyIterator() {
-		super();
-	}
-
-	public boolean hasNext() {
-		return false;
-	}
-
-	public E next() {
-		throw new NoSuchElementException();
-	}
-
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/EmptyListIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/EmptyListIterator.java
deleted file mode 100644
index f3ab4a464f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/EmptyListIterator.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.ListIterator;
-import java.util.NoSuchElementException;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * An <code>EmptyListIterator</code> is just that.
- */
-public final class EmptyListIterator<E>
-	implements ListIterator<E>
-{
-
-	// singleton
-	@SuppressWarnings("unchecked")
-	private static final EmptyListIterator INSTANCE = new EmptyListIterator();
-
-	/**
-	 * Return the singleton.
-	 */
-	@SuppressWarnings("unchecked")
-	public static <T> ListIterator<T> instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EmptyListIterator() {
-		super();
-	}
-	
-	public void add(E e) {
-		throw new UnsupportedOperationException();
-	}
-
-	public boolean hasNext() {
-		return false;
-	}
-
-	public boolean hasPrevious() {
-		return false;
-	}
-
-	public E next() {
-		throw new NoSuchElementException();
-	}
-
-	public int nextIndex() {
-		return 0;
-	}
-
-	public E previous() {
-		throw new NoSuchElementException();
-	}
-
-	public int previousIndex() {
-		return -1;
-	}
-
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-
-	public void set(E e) {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this);
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/EnumerationIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/EnumerationIterator.java
deleted file mode 100644
index a75710c4ef..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/EnumerationIterator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * An <code>EnumerationIterator</code> wraps an
- * <code>Enumeration</code> so that it can be treated like an
- * <code>Iterator</code>.
- */
-public class EnumerationIterator<E>
-	implements Iterator<E>
-{
-	private final Enumeration<? extends E> enumeration;
-
-	/**
-	 * Construct an iterator that wraps the specified enumeration.
-	 */
-	public EnumerationIterator(Enumeration<? extends E> enumeration) {
-		this.enumeration = enumeration;
-	}
-	
-	public boolean hasNext() {
-		return this.enumeration.hasMoreElements();
-	}
-	
-	public E next() {
-		return this.enumeration.nextElement();
-	}
-	
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-	
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.enumeration);
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/FilteringIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/FilteringIterator.java
deleted file mode 100644
index fa22c65476..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/FilteringIterator.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * A <code>FilteringIterator</code> wraps another <code>Iterator</code>
- * and uses a <code>Filter</code> to determine which elements in the
- * nested iterator are to be returned by calls to <code>next()</code>.
- * <p>
- * As an alternative to building a <code>Filter</code>, a subclass
- * of <code>FilteringIterator</code> can override the
- * <code>accept(Object)</code> method.
- * <p>
- * One, possibly undesirable, side-effect of using this iterator is that
- * the nested iterator's <code>next()</code> method will be invoked
- * <em>before</em> the filtered iterator's <code>next()</code>
- * method is invoked. This is because the "next" element must be
- * checked for whether it is to be accepted before the filtered iterator
- * can determine whether it has a "next" element (i.e. that the
- * <code>hasNext()</code> method should return <code>true</code>).
- * This also prevents a filtered iterator from supporting the optional
- * <code>remove()</code> method.
- */
-public class FilteringIterator<E1, E2>
-	implements Iterator<E2>
-{
-	private final Iterator<? extends E1> nestedIterator;
-	private final Filter<E1> filter;
-	private E2 next;
-	private boolean done;
-
-
-	/**
-	 * Construct an iterator with the specified nested
-	 * iterator and a disabled filter.
-	 * Use this constructor if you want to override the
-	 * <code>accept(Object)</code> method instead of building
-	 * a <code>Filter</code>.
-	 */
-	public FilteringIterator(Iterator<? extends E1> nestedIterator) {
-		this(nestedIterator, Filter.Disabled.<E1>instance());
-	}
-
-	/**
-	 * Construct an iterator with the specified nested
-	 * iterator and filter.
-	 */
-	public FilteringIterator(Iterator<? extends E1> nestedIterator, Filter<E1> filter) {
-		super();
-		this.nestedIterator = nestedIterator;
-		this.filter = filter;
-		this.loadNext();
-	}
-
-	public boolean hasNext() {
-		return ! this.done;
-	}
-
-	public E2 next() {
-		if (this.done) {
-			throw new NoSuchElementException();
-		}
-		E2 result = this.next;
-		this.loadNext();
-		return result;
-	}
-
-	/**
-	 * Because we need to pre-load the next element
-	 * to be returned, we cannot support the <code>remove()</code>
-	 * method.
-	 */
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Load next with the next valid entry from the nested
-	 * iterator. If there are none, next is set to <code>END</code>.
-	 */
-	private void loadNext() {
-		this.done = true;
-		while (this.nestedIterator.hasNext() && (this.done)) {
-			E1 temp = this.nestedIterator.next();
-			if (this.accept(temp)) {
-				// assume that if the object was accepted it is of type E
-				this.next = this.cast(temp);
-				this.done = false;
-			} else {
-				this.next = null;
-				this.done = true;
-			}
-		}
-	}
-
-	/**
-	 * We have to assume the filter will only "accept" objects that can
-	 * be cast to E2.
-	 */
-	@SuppressWarnings("unchecked")
-	private E2 cast(E1 o) {
-		return (E2) o;
-	}
-
-	/**
-	 * Return whether the <code>FilteringIterator</code>
-	 * should return the specified next element from a call to the
-	 * <code>next()</code> method.
-	 * <p>
-	 * This method can be overridden by a subclass as an
-	 * alternative to building a <code>Filter</code>.
-	 */
-	protected boolean accept(E1 o) {
-		return this.filter.accept(o);
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.nestedIterator);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/GenericIteratorWrapper.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/GenericIteratorWrapper.java
deleted file mode 100644
index 01e5e0a93b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/GenericIteratorWrapper.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.Iterator;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * Wrap an iterator on elements of any sub-type of E, converting it into an
- * iterator on elements of type E. This shouldn't be a problem since there
- * is no way to add elements to the iterator.
- */
-public class GenericIteratorWrapper<E>
-	implements Iterator<E>
-{
-	private final Iterator<? extends E> iterator;
-
-	public GenericIteratorWrapper(Iterator<? extends E> iterator) {
-		super();
-		this.iterator = iterator;
-	}
-
-	public boolean hasNext() {
-		return this.iterator.hasNext();
-	}
-
-	public E next() {
-		return this.iterator.next();
-	}
-
-	public void remove() {
-		this.iterator.remove();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.iterator);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/GraphIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/GraphIterator.java
deleted file mode 100644
index b18df73d52..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/GraphIterator.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.utility.internal.iterators;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * A <code>GraphIterator</code> is similar to a <code>TreeIterator</code>
- * except that it cannot be assumed that all nodes assume a strict tree
- * structure.  For instance, in a tree, a node cannot be a descendent of
- * itself, but a graph may have a cyclical structure.
- * 
- * A <code>GraphIterator</code> simplifies the traversal of a
- * graph of objects, where the objects' protocol(s) provides
- * a method for getting the next collection of nodes in the graph,
- * (or *neighbors*), but does not provide a method for getting *all* 
- * of the nodes in the graph.
- * (e.g. a neighbor can return his neighbors, and those neighbors
- * can return their neighbors, which might also include the original
- * neighbor, but you only want to visit the original neighbor once.)
- * <p>
- * If a neighbor has already been visited (determined by using 
- * <code>equals(Object)</code>), that neighbor is not visited again,
- * nor are the neighbors of that object.
- * <p>
- * It is up to the user of this class to ensure a *complete* graph.
- * <p>
- * To use, supply:<ul>
- * <li> either the initial node of the graph or an Iterator over an
- * initial collection of graph nodes
- * <li> a <code>MisterRogers</code> that tells who the neighbors are
- * of each node
- * (alternatively, subclass <code>GraphIterator</code>
- * and override the <code>neighbors(Object)</code> method)
- * </ul>
- * <p>
- * <code>remove()</code> is not supported.  This method, if 
- * desired, must be implemented by the user of this class.
- */
-public class GraphIterator<E>
-	implements Iterator<E>
-{
-	private final Collection<Iterator<? extends E>> iterators;
-	private final Set<E> visitedNeighbors;
-	private final MisterRogers<E> misterRogers;
-	
-	private Iterator<? extends E> currentIterator;
-	
-	private E nextNeighbor;
-	private boolean done;
-
-
-	/**
-	 * Construct an iterator with the specified collection of roots
-	 * and a disabled mister rogers.
-	 * Use this constructor if you want to override the
-	 * <code>children(Object)</code> method instead of building
-	 * a <code>MisterRogers</code>.
-	 */
-	public GraphIterator(E... roots) {
-		this(new ArrayIterator<E>(roots));
-	}
-
-	/**
-	 * Construct an iterator with the specified collection of roots
-	 * and a disabled mister rogers.
-	 * Use this constructor if you want to override the
-	 * <code>children(Object)</code> method instead of building
-	 * a <code>MisterRogers</code>.
-	 */
-	public GraphIterator(Iterator<? extends E> roots) {
-		this(roots, MisterRogers.Disabled.<E>instance());
-	}
-
-	/**
-	 * Construct an iterator with the specified root
-	 * and a disabled mister rogers.
-	 * Use this constructor if you want to override the
-	 * <code>children(Object)</code> method instead of building
-	 * a <code>MisterRogers</code>.
-	 */
-	public GraphIterator(E root) {
-		this(root, MisterRogers.Disabled.<E>instance());
-	}
-
-	/**
-	 * Construct an iterator with the specified root
-	 * and mister rogers.
-	 */
-	public GraphIterator(E root, MisterRogers<E> misterRogers) {
-		this(new SingleElementIterator<E>(root), misterRogers);
-	}
-
-	/**
-	 * Construct an iterator with the specified roots
-	 * and mister rogers.
-	 */
-	public GraphIterator(Iterator<? extends E> roots, MisterRogers<E> misterRogers) {
-		super();
-		this.currentIterator = roots;
-		// use a LinkedList since we will be pulling off the front and adding to the end
-		this.iterators = new LinkedList<Iterator<? extends E>>();
-		this.misterRogers = misterRogers;
-		this.visitedNeighbors = new HashSet<E>();
-		this.loadNextNeighbor();
-	}
-
-	/**
-	 * Load next neighbor with the next entry from the current iterator.
-	 * If the current iterator has none, load the next iterator.
-	 * If there are no more, the 'done' flag is set.
-	 */
-	private void loadNextNeighbor() {
-		if (this.currentIterator == EmptyIterator.instance()) {
-			this.done = true;
-		}
-		else if (this.currentIterator.hasNext()) {
-			E nextPossibleNeighbor = this.currentIterator.next();
-			if (this.visitedNeighbors.contains(nextPossibleNeighbor)) {
-				this.loadNextNeighbor();  // recurse
-			} else {
-				this.nextNeighbor = nextPossibleNeighbor;
-				this.visitedNeighbors.add(nextPossibleNeighbor);
-				this.iterators.add(this.neighbors(nextPossibleNeighbor));
-			}
-		} 
-		else {
-			for (Iterator<? extends Iterator<? extends E>> stream = this.iterators.iterator(); ! this.currentIterator.hasNext() && stream.hasNext(); ) {
-				this.currentIterator = stream.next();
-				stream.remove();
-			}
-			if ( ! this.currentIterator.hasNext()) {
-				this.currentIterator = EmptyIterator.instance();
-			}
-			this.loadNextNeighbor();  // recurse
-		}
-	}
-
-	public boolean hasNext() {
-		return ! this.done;
-	}
-
-	public E next() {
-		if (this.done) {
-			throw new NoSuchElementException();
-		}
-		E next = this.nextNeighbor;
-		this.loadNextNeighbor();
-		return next;
-	}
-
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return the immediate neighbors of the specified object.
-	 */
-	protected Iterator<? extends E> neighbors(E next) {
-		return this.misterRogers.neighbors(next);
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.currentIterator);
-	}
-	
-	
-	//********** inner classes **********
-	
-	/**
-	 * Used by <code>GraphIterator</code> to retrieve
-	 * the immediate neighbors of a node in the graph.
-	 * "These are the people in your neighborhood..."
-	 */
-	public interface MisterRogers<T> {
-
-		/**
-		 * Return the immediate neighbors of the specified object.
-		 */
-		Iterator<? extends T> neighbors(T next);
-		
-		
-		final class Null<S> implements MisterRogers<S> {
-			@SuppressWarnings("unchecked")
-			public static final MisterRogers INSTANCE = new Null();
-			@SuppressWarnings("unchecked")
-			public static <R> MisterRogers<R> instance() {
-				return INSTANCE;
-			}
-			// ensure single instance
-			private Null() {
-				super();
-			}
-			// return no neighbors
-			public Iterator<S> neighbors(S next) {
-				return EmptyIterator.instance();
-			}
-			@Override
-			public String toString() {
-				return "GraphIterator.MisterRogers.Null"; //$NON-NLS-1$
-			}
-		}
-
-		/** The mister rogers used when the #neighbors(Object) method is overridden. */
-		final class Disabled<S> implements MisterRogers<S> {
-			@SuppressWarnings("unchecked")
-			public static final MisterRogers INSTANCE = new Disabled();
-			@SuppressWarnings("unchecked")
-			public static <R> MisterRogers<R> instance() {
-				return INSTANCE;
-			}
-			// ensure single instance
-			private Disabled() {
-				super();
-			}
-			// throw an exception
-			public Iterator<S> neighbors(S next) {
-				throw new UnsupportedOperationException();  // GraphIterator.neighbors(Object) was not implemented
-			}
-			@Override
-			public String toString() {
-				return "GraphIterator.MisterRogers.Disabled"; //$NON-NLS-1$
-			}
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/IteratorEnumeration.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/IteratorEnumeration.java
deleted file mode 100644
index 55a4f08b70..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/IteratorEnumeration.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * An <code>IteratorEnumeration</code> wraps an
- * <code>Iterator</code> so that it can be treated like an
- * <code>Enumeration</code>.
- */
-public class IteratorEnumeration<E>
-	implements Enumeration<E>
-{
-	private final Iterator<? extends E> iterator;
-
-	/**
-	 * Construct an enumeration that wraps the specified iterator.
-	 */
-	public IteratorEnumeration(Iterator<? extends E> iterator) {
-		super();
-		this.iterator = iterator;
-	}
-
-	public boolean hasMoreElements() {
-		return this.iterator.hasNext();
-	}
-
-	public E nextElement() {
-		return this.iterator.next();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.iterator);
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/PeekableIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/PeekableIterator.java
deleted file mode 100644
index 316aedcf63..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/PeekableIterator.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * A <code>PeekableIterator</code> wraps another <code>Iterator</code>
- * and allows a <code>peek()</code> at the next element to be 
- * returned by <code>next()</code>.
- * <p>
- * One, possibly undesirable, side-effect of using this iterator is that
- * the nested iterator's <code>next()</code> method will be invoked
- * <em>before</em> the peekable iterator's <code>next()</code>
- * method is invoked. This is because the "next" element must be
- * pre-loaded for the <code>peek()</code> method.
- * This also prevents a peekable iterator from supporting the optional
- * <code>remove()</code> method.
- */
-
-public class PeekableIterator<E>
-	implements Iterator<E>
-{
-	private final Iterator<? extends E> nestedIterator;
-	private E next;
-	private boolean done;
-
-
-	/**
-	 * Construct a peekable iterator that wraps the specified nested
-	 * iterator.
-	 */
-	public PeekableIterator(Iterator<? extends E> nestedIterator) {
-		super();
-		this.nestedIterator = nestedIterator;
-		this.done = false;
-		this.loadNext();
-	}
-
-	public boolean hasNext() {
-		return ! this.done;
-	}
-
-	public E next() {
-		if (this.done) {
-			throw new NoSuchElementException();
-		}
-		E result = this.next;
-		this.loadNext();
-		return result;
-	}
-
-	/**
-	 * Return the element that will be returned by the next call to the
-	 * <code>next()</code> method, without advancing past it.
-	 */
-	public E peek() {
-		if (this.done) {
-			throw new NoSuchElementException();
-		}
-		return this.next;
-	}
-
-	/**
-	 * Because we need to pre-load the next element
-	 * to be returned, we cannot support the <code>remove()</code>
-	 * method.
-	 */
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Load next with the next entry from the nested
-	 * iterator. If there are none, next is set to <code>END</code>.
-	 */
-	private void loadNext() {
-		if (this.nestedIterator.hasNext()) {
-			this.next = this.nestedIterator.next();
-		} else {
-			this.next = null;
-			this.done = true;
-		}
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.nestedIterator);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ReadOnlyCompositeListIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ReadOnlyCompositeListIterator.java
deleted file mode 100644
index 118d6ebd07..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ReadOnlyCompositeListIterator.java
+++ /dev/null
@@ -1,178 +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.utility.internal.iterators;
-
-import java.util.List;
-import java.util.ListIterator;
-import java.util.NoSuchElementException;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * A <code>ReadOnlyCompositeListIterator</code> wraps a list
- * of <code>ListIterator</code>s and makes them appear to be a single
- * read-only <code>ListIterator</code>. A read-only composite list
- * iterator is more flexible than a normal composite list iterator when it
- * comes to the element types of the nested iterators.
- */
-public class ReadOnlyCompositeListIterator<E>
-	implements ListIterator<E>
-{
-	private final ListIterator<? extends ListIterator<? extends E>> iterators;
-	private ListIterator<? extends E> nextIterator;
-	private int nextIndex;
-
-
-	/**
-	 * Construct a read-only list iterator with the specified list of
-	 * list iterators.
-	 */
-	public ReadOnlyCompositeListIterator(List<? extends ListIterator<? extends E>> iterators) {
-		this(iterators.listIterator());
-	}
-
-	/**
-	 * Construct a read-only list iterator with the specified list of
-	 * list iterators.
-	 */
-	public ReadOnlyCompositeListIterator(ListIterator<? extends ListIterator<? extends E>> iterators) {
-		super();
-		this.iterators = iterators;
-		this.nextIndex = 0;
-	}
-
-	/**
-	 * Construct a read-only list iterator with the specified object prepended
-	 * to the specified iterator.
-	 */
-	@SuppressWarnings("unchecked")
-	public ReadOnlyCompositeListIterator(E object, ListIterator<? extends E> iterator) {
-		this(new SingleElementListIterator<E>(object), iterator);
-	}
-
-	/**
-	 * Construct a read-only list iterator with the specified object appended
-	 * to the specified iterator.
-	 */
-	@SuppressWarnings("unchecked")
-	public ReadOnlyCompositeListIterator(ListIterator<? extends E> iterator, E object) {
-		this(iterator, new SingleElementListIterator<E>(object));
-	}
-
-	/**
-	 * Construct a read-only list iterator with the specified list iterators.
-	 */
-	public ReadOnlyCompositeListIterator(ListIterator<? extends E>... iterators) {
-		this(new ArrayListIterator<ListIterator<? extends E>>(iterators));
-	}
-
-	public boolean hasNext() {
-		try {
-			this.loadNextIterator();
-		} catch (NoSuchElementException ex) {
-			// this occurs if there are no iterators at all
-			return false;
-		}
-		return this.nextIterator.hasNext();
-	}
-
-	public boolean hasPrevious() {
-		try {
-			this.loadPreviousIterator();
-		} catch (NoSuchElementException ex) {
-			// this occurs if there are no iterators at all
-			return false;
-		}
-		return this.nextIterator.hasPrevious();
-	}
-
-	public E next() {
-		this.loadNextIterator();
-		E result = this.nextIterator.next();
-	
-		// the statement above will throw a NoSuchElementException
-		// if the current iterator is at the end of the line;
-		// so if we get here, we can increment 'nextIndex'
-		this.nextIndex++;
-	
-		return result;
-	}
-
-	public int nextIndex() {
-		return this.nextIndex;
-	}
-
-	public E previous() {
-		this.loadPreviousIterator();
-		E result = this.nextIterator.previous();
-	
-		// the statement above will throw a NoSuchElementException
-		// if the current iterator is at the end of the line;
-		// so if we get here, we can decrement 'nextIndex'
-		this.nextIndex--;
-	
-		return result;
-	}
-
-	public int previousIndex() {
-		return this.nextIndex  - 1;
-	}
-
-	public void add(E o) {
-		// the list iterator is read-only
-		throw new UnsupportedOperationException();
-	}
-
-	public void remove() {
-		// the list iterator is read-only
-		throw new UnsupportedOperationException();
-	}
-
-	public void set(E e) {
-		// the list iterator is read-only
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Load nextIterator with the first iterator that <code>hasNext()</code>
-	 * or the final iterator if all the elements have already been retrieved.
-	 */
-	private void loadNextIterator() {
-		this.checkNextIterator();
-		while (( ! this.nextIterator.hasNext()) && this.iterators.hasNext()) {
-			this.nextIterator = this.iterators.next();
-		}
-	}
-
-	/**
-	 * Load nextIterator with the first iterator that <code>hasPrevious()</code>
-	 * or the first iterator if all the elements have already been retrieved.
-	 */
-	private void loadPreviousIterator() {
-		this.checkNextIterator();
-		while (( ! this.nextIterator.hasPrevious()) && this.iterators.hasPrevious()) {
-			this.nextIterator = this.iterators.previous();
-		}
-	}
-
-	/**
-	 * If 'nextIterator' is null, load it with the first iterator.
-	 */
-	private void checkNextIterator() {
-		if (this.nextIterator == null) {
-			this.nextIterator = this.iterators.next();
-		}
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.iterators);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ReadOnlyIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ReadOnlyIterator.java
deleted file mode 100644
index df0a51333d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ReadOnlyIterator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.Collection;
-import java.util.Iterator;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * A <code>ReadOnlyIterator</code> wraps another <code>Iterator</code>
- * and removes support for #remove().
- */
-public class ReadOnlyIterator<E>
-	implements Iterator<E>
-{
-	private final Iterator<? extends E> nestedIterator;
-
-	/**
-	 * Construct an iterator on the specified collection that
-	 * disallows removes.
-	 */
-	public ReadOnlyIterator(Collection<? extends E> c) {
-		this(c.iterator());
-	}
-
-	/**
-	 * Construct an iterator with the specified nested iterator
-	 * and disallow removes.
-	 */
-	public ReadOnlyIterator(Iterator<? extends E> nestedIterator) {
-		super();
-		this.nestedIterator = nestedIterator;
-	}
-
-	public boolean hasNext() {
-		// delegate to the nested iterator
-		return this.nestedIterator.hasNext();
-	}
-
-	public E next() {
-		// delegate to the nested iterator
-		return this.nestedIterator.next();
-	}
-
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.nestedIterator);
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ReadOnlyListIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ReadOnlyListIterator.java
deleted file mode 100644
index c3b2591f44..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ReadOnlyListIterator.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * A <code>ReadOnlyListIterator</code> wraps another
- * <code>ListIterator</code> and removes support for:
- * 	#remove()
- * 	#set(Object)
- * 	#add(Object)
- */
-public class ReadOnlyListIterator<E>
-	implements ListIterator<E>
-{
-	private final ListIterator<? extends E> nestedListIterator;
-
-
-	/**
-	 * Construct an iterator on the specified list that
-	 * disallows removes, sets, and adds.
-	 */
-	public ReadOnlyListIterator(List<? extends E> list) {
-		this(list.listIterator());
-	}
-
-	/**
-	 * Construct an iterator on the specified list iterator that
-	 * disallows removes, sets, and adds.
-	 */
-	public ReadOnlyListIterator(ListIterator<? extends E> nestedListIterator) {
-		super();
-		this.nestedListIterator = nestedListIterator;
-	}
-
-	public boolean hasNext() {
-		// delegate to the nested iterator
-		return this.nestedListIterator.hasNext();
-	}
-
-	public E next() {
-		// delegate to the nested iterator
-		return this.nestedListIterator.next();
-	}
-
-	public boolean hasPrevious() {
-		// delegate to the nested iterator
-		return this.nestedListIterator.hasPrevious();
-	}
-
-	public E previous() {
-		// delegate to the nested iterator
-		return this.nestedListIterator.previous();
-	}
-
-	public int nextIndex() {
-		// delegate to the nested iterator
-		return this.nestedListIterator.nextIndex();
-	}
-
-	public int previousIndex() {
-		// delegate to the nested iterator
-		return this.nestedListIterator.previousIndex();
-	}
-
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-
-	public void set(E o) {
-		throw new UnsupportedOperationException();
-	}
-
-	public void add(E o) {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.nestedListIterator);
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ResultSetIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ResultSetIterator.java
deleted file mode 100644
index b5891c7dac..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/ResultSetIterator.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * A <code>ResultSetIterator</code> wraps a <code>ResultSet</code>
- * and transforms its rows for client consumption. Subclasses can override
- * <code>#buildNext(ResultSet)</code> to build the expected object from
- * the current row of the result set.
- * <p>
- * To use, supply:<ul>
- * <li> a <code>ResultSet</code>
- * <li> an <code>Adapter</code> that converts a row in the <code>ResultSet</code>
- * into the desired object
- * (alternatively, subclass <code>ResultSetIterator</code>
- * and override the <code>buildNext(ResultSet)</code> method)
- * </ul>
- * <p>
- */
-public class ResultSetIterator<E>
-	implements Iterator<E>
-{
-	private final ResultSet resultSet;
-	private final Adapter<E> adapter;
-	private E next;
-	private boolean done;
-
-
-	/**
-	 * Construct an iterator on the specified result set that returns
-	 * the objects produced by the specified adapter.
-	 */
-	public ResultSetIterator(ResultSet resultSet, Adapter<E> adapter) {
-		super();
-		this.resultSet = resultSet;
-		this.adapter = adapter;
-		this.done = false;
-		this.next = this.buildNext();
-	}
-
-	/**
-	 * Construct an iterator on the specified result set that returns
-	 * the first object in each row of the result set.
-	 */
-	public ResultSetIterator(ResultSet resultSet) {
-		this(resultSet, Adapter.Default.<E>instance());
-	}
-
-	/**
-	 * Build the next object for the iterator to return.
-	 * Close the result set when we reach the end.
-	 */
-	private E buildNext() {
-		try {
-			if (this.resultSet.next()) {
-				return this.buildNext(this.resultSet);
-			}
-			this.resultSet.close();
-			this.done = true;
-			return null;
-		} catch (SQLException ex) {
-			throw new RuntimeException(ex);
-		}
-	}
-
-	/**
-	 * By default, return the first object in the current row
-	 * of the result set. Any <code>SQLException</code>s will
-	 * be caught and wrapped in a <code>RuntimeException</code>.
-	 */
-	protected E buildNext(ResultSet rs) throws SQLException {
-		return this.adapter.buildNext(rs);
-	}
-
-	public boolean hasNext() {
-		return ! this.done;
-	}
-
-	public E next() {
-		if (this.done) {
-			throw new NoSuchElementException();
-		}
-		E temp = this.next;
-		this.next = this.buildNext();
-		return temp;
-	}
-
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.resultSet);
-	}
-
-
-	// ********** interface **********
-
-	/**
-	 * Used by <code>ResultSetIterator</code> to convert a
-	 * <code>ResultSet</code>'s current row into the next object
-	 * to be returned by the <code>Iterator</code>.
-	 */
-	public interface Adapter<T> {
-
-		/**
-		 * Return an object corresponding to the result set's
-		 * "current" row. Any <code>SQLException</code>s will
-		 * be caught and wrapped in a <code>RuntimeException</code>.
-		 * @see java.sql.ResultSet
-		 */
-		T buildNext(ResultSet rs) throws SQLException;
-
-
-		final class Default<S> implements Adapter<S> {
-			@SuppressWarnings("unchecked")
-			public static final Adapter INSTANCE = new Default();
-			@SuppressWarnings("unchecked")
-			public static <R> Adapter<R> instance() {
-				return INSTANCE;
-			}
-			// ensure single instance
-			private Default() {
-				super();
-			}
-			// return the first object in the current row of the result set
-			@SuppressWarnings("unchecked")
-			public S buildNext(ResultSet rs) throws SQLException {
-				// result set columns are indexed starting with 1
-				return (S) rs.getObject(1);
-			}
-			@Override
-			public String toString() {
-				return "ResultSetIterator.Adapter.Default"; //$NON-NLS-1$
-			}
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/SingleElementIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/SingleElementIterator.java
deleted file mode 100644
index 75fd9d80fd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/SingleElementIterator.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * A <code>SingleElementIterator</code> holds a single element
- * and returns it with the first call to <code>next()</code>, at
- * which point it will return <code>false</code> to any subsequent
- * call to <code>hasNext()</code>.
- * <p>
- * A <code>SingleElementIterator</code> is equivalent to the
- * <code>Iterator</code> returned by:
- * 	<code>java.util.Collections.singleton(element).iterator()</code>
- */
-public class SingleElementIterator<E>
-	implements Iterator<E>
-{
-	private final E element;
-	private boolean done;
-
-
-	/**
-	 * Construct an iterator that returns only the specified element.
-	 */
-	public SingleElementIterator(E element) {
-		super();
-		this.element = element;
-		this.done = false;
-	}
-
-	public boolean hasNext() {
-		return ! this.done;
-	}
-
-	public E next() {
-		if (this.done) {
-			throw new NoSuchElementException();
-		}
-		this.done = true;
-		return this.element;
-	}
-
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.element);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/SingleElementListIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/SingleElementListIterator.java
deleted file mode 100644
index 799cb72aef..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/SingleElementListIterator.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.ListIterator;
-import java.util.NoSuchElementException;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * A <code>SingleElementListIterator</code> holds a single element
- * and returns it with the first call to <code>next()</code>, at
- * which point it will return <code>false</code> to any subsequent
- * call to <code>hasNext()</code>. Likewise, it will return <code>false</code>
- * to a call to <code>hasPrevious()</code> until a call to <code>next()</code>,
- * at which point a call to <code>previous()</code> will return the
- * single element.
- * <p>
- * A <code>SingleElementListIterator</code> is equivalent to the
- * <code>Iterator</code> returned by:
- * 	<code>java.util.Collections.singletonList(element).listIterator()</code>
- */
-public class SingleElementListIterator<E>
-	implements ListIterator<E>
-{
-	private final E element;
-	private boolean hasNext;
-
-
-	/**
-	 * Construct a list iterator that returns only the specified element.
-	 */
-	public SingleElementListIterator(E element) {
-		super();
-		this.element = element;
-		this.hasNext = true;
-	}
-
-	public boolean hasNext() {
-		return this.hasNext;
-	}
-
-	public E next() {
-		if (this.hasNext) {
-			this.hasNext = false;
-			return this.element;
-		}
-		throw new NoSuchElementException();
-	}
-
-	public int nextIndex() {
-		return this.hasNext ? 0 : 1;
-	}
-
-	public boolean hasPrevious() {
-		return ! this.hasNext;
-	}
-
-	public E previous() {
-		if (this.hasNext) {
-			throw new NoSuchElementException();
-		}
-		this.hasNext = true;
-		return this.element;
-	}
-
-	public int previousIndex() {
-		return this.hasNext ? -1 : 0;
-	}
-
-	public void add(E e) {
-		throw new UnsupportedOperationException();
-	}
-
-	public void set(E e) {
-		throw new UnsupportedOperationException();
-	}
-
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.element);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/TransformationIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/TransformationIterator.java
deleted file mode 100644
index b970d28841..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/TransformationIterator.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.Iterator;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.Transformer;
-
-
-/**
- * A <code>TransformationIterator</code> wraps another <code>Iterator</code>
- * and transforms its results for client consumption. To use, supply a 
- * <code>Transformer</code> or subclass <code>TransformationIterator</code>
- * and override the <code>transform(Object)</code> method.
- * Objects of type E1 are transformed into objects of type E2;
- * i.e. the iterator returns objects of type E2.
- */
-public class TransformationIterator<E1, E2>
-	implements Iterator<E2>
-{
-	private final Iterator<? extends E1> nestedIterator;
-	private final Transformer<E1, ? extends E2> transformer;
-
-
-	/**
-	 * Construct an iterator with the specified nested iterator
-	 * and a disabled transformer.
-	 * Use this constructor if you want to override the
-	 * <code>transform(Object)</code> method instead of building
-	 * a <code>Transformer</code>.
-	 */
-	public TransformationIterator(Iterator<? extends E1> nestedIterator) {
-		this(nestedIterator, Transformer.Disabled.<E1, E2>instance());
-	}
-
-	/**
-	 * Construct an iterator with the specified nested iterator
-	 * and transformer.
-	 */
-	public TransformationIterator(Iterator<? extends E1> nestedIterator, Transformer<E1, ? extends E2> transformer) {
-		super();
-		this.nestedIterator = nestedIterator;
-		this.transformer = transformer;
-	}
-
-	public boolean hasNext() {
-		// delegate to the nested iterator
-		return this.nestedIterator.hasNext();
-	}
-
-	public E2 next() {
-		// transform the object returned by the nested iterator before returning it
-		return this.transform(this.nestedIterator.next());
-	}
-
-	public void remove() {
-		// delegate to the nested iterator
-		this.nestedIterator.remove();
-	}
-
-	/**
-	 * Transform the specified object and return the result.
-	 */
-	protected E2 transform(E1 next) {
-		return this.transformer.transform(next);
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.nestedIterator);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/TransformationListIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/TransformationListIterator.java
deleted file mode 100644
index 087fc11046..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/TransformationListIterator.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.Transformer;
-
-/**
- * A <code>TransformationListIterator</code> wraps another <code>ListIterator</code>
- * and transforms its results for client consumption. To use, supply a 
- * <code>Transformer</code> or subclass <code>TransformationIterator</code>
- * and override the <code>transform(Object)</code> method.
- * 
- * The methods <code>set(Object)</code> and <code>add(Object)</code>
- * are left unsupported in this class.
- */
-public class TransformationListIterator<E1, E2>
-	implements ListIterator<E2>
-{
-	private final ListIterator<? extends E1> nestedIterator;
-	private final Transformer<E1, ? extends E2> transformer;
-
-
-	/**
-	 * Construct an iterator with the specified nested iterator
-	 * and a disabled transformer.
-	 * Use this constructor if you want to override the
-	 * <code>transform(Object)</code> method instead of building
-	 * a <code>Transformer</code>.
-	 */
-	public TransformationListIterator(ListIterator<? extends E1> nestedIterator) {
-		this(nestedIterator, Transformer.Disabled.<E1, E2>instance());
-	}
-
-	/**
-	 * Construct an iterator with the specified nested iterator
-	 * and transformer.
-	 */
-	public TransformationListIterator(ListIterator<? extends E1> nestedIterator, Transformer<E1, ? extends E2> transformer) {
-		super();
-		this.nestedIterator = nestedIterator;
-		this.transformer = transformer;
-	}
-
-	public boolean hasNext() {
-		// delegate to the nested iterator
-		return this.nestedIterator.hasNext();
-	}
-
-	public E2 next() {
-		// transform the object returned by the nested iterator before returning it
-		return this.transform(this.nestedIterator.next());
-	}
-
-	public int nextIndex() {
-		// delegate to the nested iterator
-		return this.nestedIterator.nextIndex();
-	}
-
-	public boolean hasPrevious() {
-		// delegate to the nested iterator
-		return this.nestedIterator.hasPrevious();
-	}
-
-	public E2 previous() {
-		// transform the object returned by the nested iterator before returning it
-		return this.transform(this.nestedIterator.previous());
-	}
-
-	public int previousIndex() {
-		// delegate to the nested iterator
-		return this.nestedIterator.previousIndex();
-	}
-
-	public void add(E2 o) {
-		throw new UnsupportedOperationException();
-	}
-
-	public void set(E2 o) {
-		throw new UnsupportedOperationException();
-	}
-
-	public void remove() {
-		// delegate to the nested iterator
-		this.nestedIterator.remove();
-	}
-
-	/**
-	 * Transform the specified object and return the result.
-	 */
-	protected E2 transform(E1 next) {
-		return this.transformer.transform(next);
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.nestedIterator);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/TreeIterator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/TreeIterator.java
deleted file mode 100644
index 47074d7c7d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/iterators/TreeIterator.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.iterators;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * A <code>TreeIterator</code> simplifies the traversal of a
- * tree of objects, where the objects' protocol(s) provides
- * a method for getting the immediate children of the given
- * node but does not provide a method for getting all the
- * descendants (children, grandchildren, etc.) of the given node.
- * <p>
- * To use, supply:<ul>
- * <li> either the root element of the tree or, if the tree has
- * multiple roots, an <code>Iterator</code> over the set of roots
- * <li> a <code>Midwife</code> that delivers the children
- * of each child
- * (alternatively, subclass <code>TreeIterator</code>
- * and override the <code>children(Object)</code> method)
- * </ul>
- * <p>
- */
-public class TreeIterator<E>
-	implements Iterator<E>
-{
-	private final LinkedList<Iterator<? extends E>> iterators;
-	private final Midwife<E> midwife;
-	private Iterator<? extends E> currentIterator;
-
-
-	/**
-	 * Construct an iterator with the specified collection of roots
-	 * and a disabled midwife.
-	 * Use this constructor if you want to override the
-	 * <code>children(Object)</code> method instead of building
-	 * a <code>Midwife</code>.
-	 */
-	public TreeIterator(Iterator<? extends E> roots) {
-		this(roots, Midwife.Disabled.<E>instance());
-	}
-
-	/**
-	 * Construct an iterator with the specified root
-	 * and a disabled midwife.
-	 * Use this constructor if you want to override the
-	 * <code>children(Object)</code> method instead of building
-	 * a <code>Midwife</code>.
-	 */
-	public TreeIterator(E root) {
-		this(root, Midwife.Disabled.<E>instance());
-	}
-
-	/**
-	 * Construct an iterator with the specified root
-	 * and midwife.
-	 */
-	public TreeIterator(E root, Midwife<E> midwife) {
-		this(new SingleElementIterator<E>(root), midwife);
-	}
-
-	/**
-	 * Construct an iterator with the specified roots
-	 * and midwife.
-	 */
-	public TreeIterator(Iterator<? extends E> roots, Midwife<E> midwife) {
-		super();
-		this.currentIterator = roots;
-		// use a LinkedList since we will be pulling off the front and adding to the end
-		this.iterators = new LinkedList<Iterator<? extends E>>();
-		this.midwife = midwife;
-	}
-
-	public boolean hasNext() {
-		if (this.currentIterator.hasNext()) {
-			return true;
-		}
-		for (Iterator<? extends E> iterator : this.iterators) {
-			if (iterator.hasNext()) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public E next() {
-		if (this.currentIterator.hasNext()) {
-			return this.nextInternal();
-		}
-		for (Iterator<Iterator<? extends E>> stream = this.iterators.iterator(); stream.hasNext(); ) {
-			this.currentIterator = stream.next();
-			if (this.currentIterator.hasNext()) {
-				break;
-			}
-			stream.remove();
-		}
-		return this.nextInternal();
-	}
-
-	/**
-	 * Fetch the children of the next node before returning it.
-	 */
-	private E nextInternal() {
-		E next = this.currentIterator.next();
-		this.iterators.add(this.children(next));
-		return next;
-	}
-
-	public void remove() {
-		this.currentIterator.remove();
-	}
-
-	/**
-	 * Return the immediate children of the specified object.
-	 */
-	protected Iterator<? extends E> children(E next) {
-		return this.midwife.children(next);
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.currentIterator);
-	}
-
-
-	//********** inner classes **********
-
-	/**
-	 * Used by <code>TreeIterator</code> to retrieve
-	 * the immediate children of a node in the tree.
-	 */
-	public interface Midwife<T> {
-
-		/**
-		 * Return the immediate children of the specified object.
-		 */
-		Iterator<? extends T> children(T o);
-
-
-		final class Null<S> implements Midwife<S> {
-			@SuppressWarnings("unchecked")
-			public static final Midwife INSTANCE = new Null();
-			@SuppressWarnings("unchecked")
-			public static <R> Midwife<R> instance() {
-				return INSTANCE;
-			}
-			// ensure single instance
-			private Null() {
-				super();
-			}
-			// return no neighbors
-			public Iterator<S> children(S next) {
-				return EmptyIterator.instance();
-			}
-			@Override
-			public String toString() {
-				return "TreeIterator.Midwife.Null"; //$NON-NLS-1$
-			}
-		}
-
-		/** The midwife used when the #children(Object) method is overridden. */
-		final class Disabled<S> implements Midwife<S> {
-			@SuppressWarnings("unchecked")
-			public static final Midwife INSTANCE = new Disabled();
-			@SuppressWarnings("unchecked")
-			public static <R> Midwife<R> instance() {
-				return INSTANCE;
-			}
-			// ensure single instance
-			private Disabled() {
-				super();
-			}
-			// throw an exception
-			public Iterator<S> children(S next) {
-				throw new UnsupportedOperationException();  // TreeIterator.children(Object) was not implemented
-			}
-			@Override
-			public String toString() {
-				return "TreeIterator.Midwife.Disabled"; //$NON-NLS-1$
-			}
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/AbstractModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/AbstractModel.java
deleted file mode 100644
index 754d9004b6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/AbstractModel.java
+++ /dev/null
@@ -1,726 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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.utility.internal.model;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.event.StateChangeEvent;
-import org.eclipse.jpt.utility.model.event.TreeChangeEvent;
-import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.listener.StateChangeListener;
-import org.eclipse.jpt.utility.model.listener.TreeChangeListener;
-
-/**
- * Convenience implementation of Model protocol.
- */
-public abstract class AbstractModel implements Model, Serializable {
-	/**
-	 * Delegate state/property/collection/list/tree change support to this
-	 * helper object. The change support object is "lazy-initialized".
-	 */
-	private ChangeSupport changeSupport;
-
-
-	// ********** constructors/initialization **********
-
-	/**
-	 * Default constructor.
-	 * This will call #initialize() on the newly-created instance.
-	 */
-	protected AbstractModel() {
-		super();
-	}
-
-	/**
-	 * This accessor will build the change support when required.
-	 */
-	protected synchronized ChangeSupport getChangeSupport() {
-		if (this.changeSupport == null) {
-			this.changeSupport = this.buildChangeSupport();
-		}
-		return this.changeSupport;
-	}
-
-	/**
-	 * Allow subclasses to tweak the change support used.
-	 */
-	protected ChangeSupport buildChangeSupport() {
-		return new ChangeSupport(this);
-	}
-
-
-	// ********** state change support **********
-
-	public synchronized void addStateChangeListener(StateChangeListener listener) {
-		this.getChangeSupport().addStateChangeListener(listener);
-	}
-
-	public synchronized void removeStateChangeListener(StateChangeListener listener) {
-		this.getChangeSupport().removeStateChangeListener(listener);
-	}
-
-	/**
-	 * Return whether there are any state change listeners.
-	 */
-	public boolean hasAnyStateChangeListeners() {
-		return this.getChangeSupport().hasAnyStateChangeListeners();
-	}
-
-	/**
-	 * Return whether there are no state change listeners.
-	 */
-	public boolean hasNoStateChangeListeners() {
-		return ! this.hasAnyStateChangeListeners();
-	}
-
-	protected final void fireStateChanged(StateChangeEvent event) {
-		this.getChangeSupport().fireStateChanged(event);
-	}
-
-	protected final void fireStateChanged() {
-		this.getChangeSupport().fireStateChanged();
-	}
-
-
-	// ********** property change support **********
-
-	public synchronized void addPropertyChangeListener(PropertyChangeListener listener) {
-		this.getChangeSupport().addPropertyChangeListener(listener);
-	}
-
-	public synchronized void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) {
-		this.getChangeSupport().addPropertyChangeListener(propertyName, listener);
-	}
-
-	public synchronized void removePropertyChangeListener(PropertyChangeListener listener) {
-		this.getChangeSupport().removePropertyChangeListener(listener);
-	}
-
-	public synchronized void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) {
-		this.getChangeSupport().removePropertyChangeListener(propertyName, listener);
-	}
-
-	/**
-	 * Return whether there are any property change listeners for a specific property.
-	 */
-	public boolean hasAnyPropertyChangeListeners(String propertyName) {
-		return this.getChangeSupport().hasAnyPropertyChangeListeners(propertyName);
-	}
-
-	/**
-	 * Return whether there are any property change listeners for a specific property.
-	 */
-	public boolean hasNoPropertyChangeListeners(String propertyName) {
-		return ! this.hasAnyPropertyChangeListeners(propertyName);
-	}
-
-	/**
-	 * Return whether there are any property change listeners.
-	 */
-	public boolean hasAnyPropertyChangeListeners() {
-		return this.getChangeSupport().hasAnyPropertyChangeListeners();
-	}
-
-	/**
-	 * Return whether there are any property change listeners.
-	 */
-	public boolean hasNoPropertyChangeListeners() {
-		return ! this.hasAnyPropertyChangeListeners();
-	}
-
-	protected final void firePropertyChanged(PropertyChangeEvent event) {
-		this.getChangeSupport().firePropertyChanged(event);
-	}
-
-	protected final void firePropertyChanged(String propertyName, Object oldValue, Object newValue) {
-		this.getChangeSupport().firePropertyChanged(propertyName, oldValue, newValue);
-	}
-
-	protected final void firePropertyChanged(String propertyName, int oldValue, int newValue) {
-		this.getChangeSupport().firePropertyChanged(propertyName, oldValue, newValue);
-	}
-
-	protected final void firePropertyChanged(String propertyName, boolean oldValue, boolean newValue) {
-		this.getChangeSupport().firePropertyChanged(propertyName, oldValue, newValue);
-	}
-
-	/**
-	 * implied 'null' old value
-	 */
-	protected final void firePropertyChanged(String propertyName, Object newValue) {
-		this.firePropertyChanged(propertyName, null, newValue);
-	}
-
-
-	// ********** collection change support **********
-
-	public synchronized void addCollectionChangeListener(CollectionChangeListener listener) {
-		this.getChangeSupport().addCollectionChangeListener(listener);
-	}
-
-	public synchronized void addCollectionChangeListener(String collectionName, CollectionChangeListener listener) {
-		this.getChangeSupport().addCollectionChangeListener(collectionName, listener);
-	}
-
-	public synchronized void removeCollectionChangeListener(CollectionChangeListener listener) {
-		this.getChangeSupport().removeCollectionChangeListener(listener);
-	}
-
-	public synchronized void removeCollectionChangeListener(String collectionName, CollectionChangeListener listener) {
-		this.getChangeSupport().removeCollectionChangeListener(collectionName, listener);
-	}
-
-	/**
-	 * Return whether there are any collection change listeners for a specific collection.
-	 */
-	public boolean hasAnyCollectionChangeListeners(String collectionName) {
-		return this.getChangeSupport().hasAnyCollectionChangeListeners(collectionName);
-	}
-
-	/**
-	 * Return whether there are any collection change listeners for a specific collection.
-	 */
-	public boolean hasNoCollectionChangeListeners(String collectionName) {
-		return ! this.hasAnyCollectionChangeListeners(collectionName);
-	}
-
-	/**
-	 * Return whether there are any collection change listeners.
-	 */
-	public boolean hasAnyCollectionChangeListeners() {
-		return this.getChangeSupport().hasAnyCollectionChangeListeners();
-	}
-
-	/**
-	 * Return whether there are any collection change listeners.
-	 */
-	public boolean hasNoCollectionChangeListeners() {
-		return ! this.hasAnyCollectionChangeListeners();
-	}
-
-	protected final void fireItemsAdded(CollectionChangeEvent event) {
-		this.getChangeSupport().fireItemsAdded(event);
-	}
-
-	protected final void fireItemsAdded(String collectionName, Collection<?> addedItems) {
-		this.getChangeSupport().fireItemsAdded(collectionName, addedItems);
-	}
-
-	protected final void fireItemAdded(String collectionName, Object addedItem) {
-		this.getChangeSupport().fireItemAdded(collectionName, addedItem);
-	}
-
-	protected final void fireItemsRemoved(CollectionChangeEvent event) {
-		this.getChangeSupport().fireItemsRemoved(event);
-	}
-
-	protected final void fireItemsRemoved(String collectionName, Collection<?> removedItems) {
-		this.getChangeSupport().fireItemsRemoved(collectionName, removedItems);
-	}
-
-	protected final void fireItemRemoved(String collectionName, Object removedItem) {
-		this.getChangeSupport().fireItemRemoved(collectionName, removedItem);
-	}
-
-	protected final void fireCollectionCleared(CollectionChangeEvent event) {
-		this.getChangeSupport().fireCollectionCleared(event);
-	}
-
-	protected final void fireCollectionCleared(String collectionName) {
-		this.getChangeSupport().fireCollectionCleared(collectionName);
-	}
-
-	protected final void fireCollectionChanged(CollectionChangeEvent event) {
-		this.getChangeSupport().fireCollectionChanged(event);
-	}
-
-	protected final void fireCollectionChanged(String collectionName) {
-		this.getChangeSupport().fireCollectionChanged(collectionName);
-	}
-
-	protected <E> boolean addItemToCollection(E item, Collection<E> collection, String collectionName) {
-		return this.getChangeSupport().addItemToCollection(item, collection, collectionName);
-	}
-
-	protected <E> boolean addItemsToCollection(E[] items, Collection<E> collection, String collectionName) {
-		return this.getChangeSupport().addItemsToCollection(items, collection, collectionName);
-	}
-
-	protected <E> boolean addItemsToCollection(Collection<? extends E> items, Collection<E> collection, String collectionName) {
-		return this.getChangeSupport().addItemsToCollection(items, collection, collectionName);
-	}
-
-	protected <E> boolean addItemsToCollection(Iterable<? extends E> items, Collection<E> collection, String collectionName) {
-		return this.getChangeSupport().addItemsToCollection(items, collection, collectionName);
-	}
-
-	protected <E> boolean addItemsToCollection(Iterator<? extends E> items, Collection<E> collection, String collectionName) {
-		return this.getChangeSupport().addItemsToCollection(items, collection, collectionName);
-	}
-
-	protected boolean removeItemFromCollection(Object item, Collection<?> collection, String collectionName) {
-		return this.getChangeSupport().removeItemFromCollection(item, collection, collectionName);
-	}
-
-	protected boolean removeItemsFromCollection(Object[] items, Collection<?> collection, String collectionName) {
-		return this.getChangeSupport().removeItemsFromCollection(items, collection, collectionName);
-	}
-
-	protected boolean removeItemsFromCollection(Collection<?> items, Collection<?> collection, String collectionName) {
-		return this.getChangeSupport().removeItemsFromCollection(items, collection, collectionName);
-	}
-
-	protected boolean removeItemsFromCollection(Iterable<?> items, Collection<?> collection, String collectionName) {
-		return this.getChangeSupport().removeItemsFromCollection(items, collection, collectionName);
-	}
-
-	protected boolean removeItemsFromCollection(Iterator<?> items, Collection<?> collection, String collectionName) {
-		return this.getChangeSupport().removeItemsFromCollection(items, collection, collectionName);
-	}
-
-	protected boolean retainItemsInCollection(Object[] items, Collection<?> collection, String collectionName) {
-		return this.getChangeSupport().retainItemsInCollection(items, collection, collectionName);
-	}
-
-	protected boolean retainItemsInCollection(Collection<?> items, Collection<?> collection, String collectionName) {
-		return this.getChangeSupport().retainItemsInCollection(items, collection, collectionName);
-	}
-
-	protected boolean retainItemsInCollection(Iterable<?> items, Collection<?> collection, String collectionName) {
-		return this.getChangeSupport().retainItemsInCollection(items, collection, collectionName);
-	}
-
-	protected boolean retainItemsInCollection(Iterator<?> items, Collection<?> collection, String collectionName) {
-		return this.getChangeSupport().retainItemsInCollection(items, collection, collectionName);
-	}
-
-	protected boolean clearCollection(Collection<?> collection, String collectionName) {
-		return this.getChangeSupport().clearCollection(collection, collectionName);
-	}
-
-	protected <E> boolean synchronizeCollection(Collection<E> newCollection, Collection<E> collection, String collectionName) {
-		return this.getChangeSupport().synchronizeCollection(newCollection, collection, collectionName);
-	}
-
-	protected <E> boolean synchronizeCollection(Iterator<E> newCollection, Collection<E> collection, String collectionName) {
-		return this.getChangeSupport().synchronizeCollection(newCollection, collection, collectionName);
-	}
-
-
-	// ********** list change support **********
-
-	public synchronized void addListChangeListener(ListChangeListener listener) {
-		this.getChangeSupport().addListChangeListener(listener);
-	}
-
-	public synchronized void addListChangeListener(String listName, ListChangeListener listener) {
-		this.getChangeSupport().addListChangeListener(listName, listener);
-	}
-
-	public synchronized void removeListChangeListener(ListChangeListener listener) {
-		this.getChangeSupport().removeListChangeListener(listener);
-	}
-
-	public synchronized void removeListChangeListener(String listName, ListChangeListener listener) {
-		this.getChangeSupport().removeListChangeListener(listName, listener);
-	}
-
-	/**
-	 * Return whether there are any list change listeners for a specific list.
-	 */
-	public boolean hasAnyListChangeListeners(String listName) {
-		return this.getChangeSupport().hasAnyListChangeListeners(listName);
-	}
-
-	/**
-	 * Return whether there are any list change listeners for a specific list.
-	 */
-	public boolean hasNoListChangeListeners(String listName) {
-		return ! this.hasAnyListChangeListeners(listName);
-	}
-
-	/**
-	 * Return whether there are any list change listeners.
-	 */
-	public boolean hasAnyListChangeListeners() {
-		return this.getChangeSupport().hasAnyListChangeListeners();
-	}
-
-	/**
-	 * Return whether there are any list change listeners.
-	 */
-	public boolean hasNoListChangeListeners() {
-		return ! this.hasAnyListChangeListeners();
-	}
-
-	protected final void fireItemsAdded(ListChangeEvent event) {
-		this.getChangeSupport().fireItemsAdded(event);
-	}
-
-	protected final void fireItemsAdded(String listName, int index, List<?> addedItems) {
-		this.getChangeSupport().fireItemsAdded(listName, index, addedItems);
-	}
-
-	protected final void fireItemAdded(String listName, int index, Object addedItem) {
-		this.getChangeSupport().fireItemAdded(listName, index, addedItem);
-	}
-
-	protected final void fireItemsRemoved(ListChangeEvent event) {
-		this.getChangeSupport().fireItemsRemoved(event);
-	}
-
-	protected final void fireItemsRemoved(String listName, int index, List<?> removedItems) {
-		this.getChangeSupport().fireItemsRemoved(listName, index, removedItems);
-	}
-
-	protected final void fireItemRemoved(String listName, int index, Object removedItem) {
-		this.getChangeSupport().fireItemRemoved(listName, index, removedItem);
-	}
-
-	protected final void fireItemsReplaced(ListChangeEvent event) {
-		this.getChangeSupport().fireItemsReplaced(event);
-	}
-
-	protected final <E> void fireItemsReplaced(String listName, int index, List<? extends E> newItems, List<E> replacedItems) {
-		this.getChangeSupport().fireItemsReplaced(listName, index, newItems, replacedItems);
-	}
-
-	protected final void fireItemReplaced(String listName, int index, Object newItem, Object replacedItem) {
-		this.getChangeSupport().fireItemReplaced(listName, index, newItem, replacedItem);
-	}
-
-	protected final void fireItemsMoved(ListChangeEvent event) {
-		this.getChangeSupport().fireItemsMoved(event);
-	}
-
-	protected final <E> void fireItemsMoved(String listName, int targetIndex, int sourceIndex, int length) {
-		this.getChangeSupport().fireItemsMoved(listName, targetIndex, sourceIndex, length);
-	}
-
-	protected final void fireItemMoved(String listName, int targetIndex, int sourceIndex) {
-		this.getChangeSupport().fireItemMoved(listName, targetIndex, sourceIndex);
-	}
-
-	protected final void fireListCleared(ListChangeEvent event) {
-		this.getChangeSupport().fireListCleared(event);
-	}
-
-	protected final void fireListCleared(String listName) {
-		this.getChangeSupport().fireListCleared(listName);
-	}
-
-	protected final void fireListChanged(ListChangeEvent event) {
-		this.getChangeSupport().fireListChanged(event);
-	}
-
-	protected final void fireListChanged(String listName) {
-		this.getChangeSupport().fireListChanged(listName);
-	}
-
-	protected <E> void addItemToList(int index, E item, List<E> list, String listName) {
-		this.getChangeSupport().addItemToList(index, item, list, listName);
-	}
-
-	protected <E> boolean addItemToList(E item, List<E> list, String listName) {
-		return this.getChangeSupport().addItemToList(item, list, listName);
-	}
-
-	protected <E> boolean addItemsToList(int index, E[] items, List<E> list, String listName) {
-		return this.getChangeSupport().addItemsToList(index, items, list, listName);
-	}
-
-	protected <E> boolean addItemsToList(int index, Collection<? extends E> items, List<E> list, String listName) {
-		return this.getChangeSupport().addItemsToList(index, items, list, listName);
-	}
-
-	protected <E> boolean addItemsToList(int index, Iterable<? extends E> items, List<E> list, String listName) {
-		return this.getChangeSupport().addItemsToList(index, items, list, listName);
-	}
-
-	protected <E> boolean addItemsToList(int index, Iterator<? extends E> items, List<E> list, String listName) {
-		return this.getChangeSupport().addItemsToList(index, items, list, listName);
-	}
-
-	protected <E> boolean addItemsToList(E[] items, List<E> list, String listName) {
-		return this.getChangeSupport().addItemsToList(items, list, listName);
-	}
-
-	protected <E> boolean addItemsToList(Collection<? extends E> items, List<E> list, String listName) {
-		return this.getChangeSupport().addItemsToList(items, list, listName);
-	}
-
-	protected <E> boolean addItemsToList(Iterable<? extends E> items, List<E> list, String listName) {
-		return this.getChangeSupport().addItemsToList(items, list, listName);
-	}
-
-	protected <E> boolean addItemsToList(Iterator<? extends E> items, List<E> list, String listName) {
-		return this.getChangeSupport().addItemsToList(items, list, listName);
-	}
-
-	protected <E> E removeItemFromList(int index, List<E> list, String listName) {
-		return this.getChangeSupport().removeItemFromList(index, list, listName);
-	}
-
-	protected boolean removeItemFromList(Object item, List<?> list, String listName) {
-		return this.getChangeSupport().removeItemFromList(item, list, listName);
-	}
-
-	protected <E> List<E> removeItemsFromList(int index, int length, List<E> list, String listName) {
-		return this.getChangeSupport().removeItemsFromList(index, length, list, listName);
-	}
-
-	protected boolean removeItemsFromList(Object[] items, List<?> list, String listName) {
-		return this.getChangeSupport().removeItemsFromList(items, list, listName);
-	}
-
-	protected boolean removeItemsFromList(Collection<?> items, List<?> list, String listName) {
-		return this.getChangeSupport().removeItemsFromList(items, list, listName);
-	}
-
-	protected boolean removeItemsFromList(Iterable<?> items, List<?> list, String listName) {
-		return this.getChangeSupport().removeItemsFromList(items, list, listName);
-	}
-
-	protected boolean removeItemsFromList(Iterator<?> items, List<?> list, String listName) {
-		return this.getChangeSupport().removeItemsFromList(items, list, listName);
-	}
-
-	protected boolean retainItemsInList(Object[] items, List<?> list, String listName) {
-		return this.getChangeSupport().retainItemsInList(items, list, listName);
-	}
-
-	protected boolean retainItemsInList(Collection<?> items, List<?> list, String listName) {
-		return this.getChangeSupport().retainItemsInList(items, list, listName);
-	}
-
-	protected boolean retainItemsInList(Iterable<?> items, List<?> list, String listName) {
-		return this.getChangeSupport().retainItemsInList(items, list, listName);
-	}
-
-	protected boolean retainItemsInList(Iterator<?> items, List<?> list, String listName) {
-		return this.getChangeSupport().retainItemsInList(items, list, listName);
-	}
-
-	protected <E> E setItemInList(int index, E item, List<E> list, String listName) {
-		return this.getChangeSupport().setItemInList(index, item, list, listName);
-	}
-
-	protected <E> int replaceItemInList(E oldItem, E newItem, List<E> list, String listName) {
-		return this.getChangeSupport().replaceItemInList(oldItem, newItem, list, listName);
-	}
-
-	protected <E> List<E> setItemsInList(int index, E[] items, List<E> list, String listName) {
-		return this.getChangeSupport().setItemsInList(index, items, list, listName);
-	}
-
-	protected <E> List<E> setItemsInList(int index, List<? extends E> items, List<E> list, String listName) {
-		return this.getChangeSupport().setItemsInList(index, items, list, listName);
-	}
-
-	protected <E> void moveItemsInList(int targetIndex, int sourceIndex, int length, List<E> list, String listName) {
-		this.getChangeSupport().moveItemsInList(targetIndex, sourceIndex, length, list, listName);
-	}
-
-	protected <E> void moveItemInList(int targetIndex, int sourceIndex, List<E> list, String listName) {
-		this.getChangeSupport().moveItemInList(targetIndex, sourceIndex, list, listName);
-	}
-
-	protected boolean clearList(List<?> list, String listName) {
-		return this.getChangeSupport().clearList(list, listName);
-	}
-
-	protected <E> boolean synchronizeList(List<E> newList, List<E> list, String listName) {
-		return this.getChangeSupport().synchronizeList(newList, list, listName);
-	}
-
-	protected <E> boolean synchronizeList(Iterator<E> newList, List<E> list, String listName) {
-		return this.getChangeSupport().synchronizeList(newList, list, listName);
-	}
-
-
-	// ********** tree change support **********
-
-	public synchronized void addTreeChangeListener(TreeChangeListener listener) {
-		this.getChangeSupport().addTreeChangeListener(listener);
-	}
-
-	public synchronized void addTreeChangeListener(String treeName, TreeChangeListener listener) {
-		this.getChangeSupport().addTreeChangeListener(treeName, listener);
-	}
-
-	public synchronized void removeTreeChangeListener(TreeChangeListener listener) {
-		this.getChangeSupport().removeTreeChangeListener(listener);
-	}
-
-	public synchronized void removeTreeChangeListener(String treeName, TreeChangeListener listener) {
-		this.getChangeSupport().removeTreeChangeListener(treeName, listener);
-	}
-
-	/**
-	 * Return whether there are any tree change listeners for a specific tree.
-	 */
-	public boolean hasAnyTreeChangeListeners(String treeName) {
-		return this.getChangeSupport().hasAnyTreeChangeListeners(treeName);
-	}
-
-	/**
-	 * Return whether there are any tree change listeners for a specific tree.
-	 */
-	public boolean hasNoTreeChangeListeners(String treeName) {
-		return ! this.hasAnyTreeChangeListeners(treeName);
-	}
-
-	/**
-	 * Return whether there are any tree change listeners.
-	 */
-	public boolean hasAnyTreeChangeListeners() {
-		return this.getChangeSupport().hasAnyTreeChangeListeners();
-	}
-
-	/**
-	 * Return whether there are any tree change listeners.
-	 */
-	public boolean hasNoTreeChangeListeners() {
-		return ! this.hasAnyTreeChangeListeners();
-	}
-
-	protected final void fireNodeAdded(TreeChangeEvent event) {
-		this.getChangeSupport().fireNodeAdded(event);
-	}
-
-	protected final void fireNodeAdded(String treeName, Object[] path) {
-		this.getChangeSupport().fireNodeAdded(treeName, path);
-	}
-
-	protected final void fireNodeRemoved(TreeChangeEvent event) {
-		this.getChangeSupport().fireNodeRemoved(event);
-	}
-
-	protected final void fireNodeRemoved(String treeName, Object[] path) {
-		this.getChangeSupport().fireNodeRemoved(treeName, path);
-	}
-
-	protected final void fireTreeCleared(TreeChangeEvent event) {
-		this.getChangeSupport().fireTreeCleared(event);
-	}
-
-	protected final void fireTreeCleared(String treeName, Object[] path) {
-		this.getChangeSupport().fireTreeCleared(treeName, path);
-	}
-
-	protected final void fireTreeCleared(String treeName) {
-		this.getChangeSupport().fireTreeCleared(treeName);
-	}
-
-	protected final void fireTreeChanged(TreeChangeEvent event) {
-		this.getChangeSupport().fireTreeChanged(event);
-	}
-
-	protected final void fireTreeChanged(String treeName, Object[] path) {
-		this.getChangeSupport().fireTreeChanged(treeName, path);
-	}
-
-	protected final void fireTreeChanged(String treeName) {
-		this.getChangeSupport().fireTreeChanged(treeName);
-	}
-
-
-	// ********** convenience methods **********
-
-	/**
-	 * Return whether the values are equal, with the appropriate null checks.
-	 * Convenience method for checking whether an attribute value has changed.
-	 * 
-	 * DO NOT use this to determine whether to fire a change notification,
-	 * ChangeSupport already does that.
-	 */
-	protected final boolean valuesAreEqual(Object value1, Object value2) {
-		return this.getChangeSupport().valuesAreEqual(value1, value2);
-	}
-	protected final boolean attributeValueHasNotChanged(Object oldValue, Object newValue) {
-		return this.valuesAreEqual(oldValue, newValue);
-	}
-
-
-	/**
-	 * Return whether the values are different, with the appropriate null checks.
-	 * Convenience method for checking whether an attribute value has changed.
-	 * 
-	 * DO NOT use this to determine whether to fire a change notification,
-	 * ChangeSupport already does that.
-	 * 
-	 * For example, after firing the change notification, you can use this method
-	 * to decide if some other, related, piece of state needs to be synchronized
-	 * with the state that just changed.
-	 */
-	protected final boolean valuesAreDifferent(Object value1, Object value2) {
-		return this.getChangeSupport().valuesAreDifferent(value1, value2);
-	}
-	protected final boolean attributeValueHasChanged(Object oldValue, Object newValue) {
-		return this.valuesAreDifferent(oldValue, newValue);
-	}
-
-
-	// ********** Object overrides **********
-
-	/**
-	 * Although cloning models is usually not a Good Idea,
-	 * we should at least support it properly.
-	 */
-	@Override
-	protected AbstractModel clone() throws CloneNotSupportedException {
-		AbstractModel clone = (AbstractModel) super.clone();
-		clone.postClone();
-		return clone;
-	}
-
-	/**
-	 * Perform any post-clone processing necessary to
-	 * successfully disconnect the clone from the original.
-	 * When this method is called on the clone, the clone
-	 * is a "shallow" copy of the original (i.e. the clone
-	 * shares all its instance variables with the original).
-	 */
-	protected void postClone() {
-		// clear out change support - models do not share listeners
-		this.changeSupport = null;
-	// when you override this method, don't forget to include:
-	//	super.postClone();
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		StringTools.buildSimpleToStringOn(this, sb);
-		sb.append(" ("); //$NON-NLS-1$
-		this.toString(sb);
-		sb.append(')');
-		return sb.toString();
-	}
-
-	/**
-	 * make this public so one model can call a nested model's
-	 * #toString(StringBuilder)
-	 */
-	public void toString(@SuppressWarnings("unused") StringBuilder sb) {
-		// subclasses should override this to do something a bit more helpful
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/CallbackChangeSupport.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/CallbackChangeSupport.java
deleted file mode 100644
index 602b3c3bf5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/CallbackChangeSupport.java
+++ /dev/null
@@ -1,74 +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.utility.internal.model;
-
-import java.util.EventListener;
-
-import org.eclipse.jpt.utility.internal.ListenerList;
-import org.eclipse.jpt.utility.model.Model;
-
-/**
- * This change support class will notify listeners whenever one of the source's
- * aspects has changed. Only the aspect name is passed to the listener; no
- * event is generated. This allows the listeners to delegate to the change
- * support object verification that an aspect as actually changed. This is
- * useful for simple things like setting dirty flags, blanket validation, and
- * blanket sychronization; i.e. things that might be interested in the *name*
- * of the aspect that changed but not so much *how* the aspect changed.
- */
-public class CallbackChangeSupport
-	extends ChangeSupport
-{
-	protected final ListenerList<Listener> listenerList;
-	private static final long serialVersionUID = 1L;
-
-
-	public CallbackChangeSupport(Model source, Listener listener) {
-		this(source);
-		this.listenerList.add(listener);
-	}
-
-	public CallbackChangeSupport(Model source) {
-		super(source);
-		this.listenerList = new ListenerList<Listener>(Listener.class);
-	}
-
-	@Override
-	protected void sourceChanged(String aspectName) {
-		super.sourceChanged(aspectName);
-		for (Listener listener : this.listenerList.getListeners()) {
-			listener.aspectChanged(aspectName);
-		}
-	}
-
-	public void addListener(Listener listener) {
-		this.listenerList.add(listener);
-	}
-
-	public void removeListener(Listener listener) {
-		this.listenerList.remove(listener);
-	}
-
-
-	// ********** listener interface **********
-
-	/**
-	 * Listener that will be notified of any aspect changes.
-	 */
-	public interface Listener extends EventListener {
-
-		/**
-		 * The specified aspect changed.
-		 */
-		void aspectChanged(String aspectName);
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/ChangeSupport.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/ChangeSupport.java
deleted file mode 100644
index 7e5eecc49a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/ChangeSupport.java
+++ /dev/null
@@ -1,3219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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.utility.internal.model;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jpt.utility.internal.ClassTools;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.HashBag;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.event.StateChangeEvent;
-import org.eclipse.jpt.utility.model.event.TreeChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ChangeListener;
-import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.listener.StateChangeListener;
-import org.eclipse.jpt.utility.model.listener.TreeChangeListener;
-
-/**
- * Support object that can be used by implementors of the Model interface.
- * It provides for state, property, collection, list, and tree change notifications to
- * listeners.
- * 
- * NB: There is lots of copy-n-paste code in this class. Nearly all of this duplication
- * is an effort to prevent the unnecessary creation of new objects (typically event
- * objects). Since many events are fired when there are no listeners, we postpone
- * the creation of event objects until we know we have interested listeners.
- * Most methods have the "non-duplicated" version of the method body commented
- * out at the top of the current method body.
- * The hope was that this class would prove to be fairly static and the duplicated
- * code would not prove onerous; but that has not proven to be
- * the case, as we have added support for "state" changes, "dirty" notification,
- * and custom "notifiers", with more to come, I'm sure....  ~bjv
- * 
- * NB2: This class will check to see if, during the firing of events, a listener
- * on the original, cloned, list of listeners has been removed from the master
- * list of listeners *before* it is notified. If the listener has been removed
- * "concurrently" it will *not* be notified. (See the code that uses the
- * 'stillListening' local boolean flag.)
- * 
- * NB3: Any listener that is added during the firing of events will *not* be
- * also notified.
- * 
- * NB4: This class is serializable, but it will only write out listeners that
- * are also serializable while silently leaving behind listeners that are not.
- * 
- * TODO fire a state change event with *every* change?
- * TODO use objects (IDs?) instead of strings to identify aspects?
- */
-public class ChangeSupport
-	implements Serializable
-{
-
-	/** The object to be provided as the "source" for any generated events. */
-	protected final Model source;
-
-	/** Associate a listener class to a collection of "generic" listeners for that class. */
-	private transient GenericListenerList[] genericListeners = EMPTY_GENERIC_LISTENERS;
-		private static final GenericListenerList[] EMPTY_GENERIC_LISTENERS = new GenericListenerList[0];
-
-	/** Associate aspect names to child change support objects. */
-	private AspectChild[] aspectChildren = EMPTY_ASPECT_CHILDREN;
-		private static final AspectChild[] EMPTY_ASPECT_CHILDREN = new AspectChild[0];
-
-	private static final long serialVersionUID = 1L;
-
-
-	// ********** constructor **********
-
-	/**
-	 * Construct support for the specified source of change events.
-	 * The source cannot be null.
-	 */
-	public ChangeSupport(Model source) {
-		super();
-		if (source == null) {
-			throw new NullPointerException();
-		}
-		this.source = source;
-	}
-
-
-	// ********** internal behavior **********
-
-	/**
-	 * Add a "generic" listener that listens to all events appropriate to that
-	 * listener, regardless of the aspect name associated with that event.
-	 * The listener cannot be null.
-	 */
-	protected <T extends ChangeListener> void addListener(Class<T> listenerClass, T listener) {
-		if (listener == null) {
-			throw new NullPointerException();		// better sooner than later
-		}
-		synchronized (this) {
-			GenericListenerList gll = this.getGenericListenerList(listenerClass);
-			if (gll == null) {
-				this.addGenericListenerList(listenerClass, listener);
-			} else {
-				gll.addListener(listener);
-			}
-		}
-	}
-
-	/**
-	 * Return the "generic" listener list for the specified listener class.
-	 * Return null if the list is not present.
-	 */
-	protected GenericListenerList getGenericListenerList(Class<? extends ChangeListener> listenerClass) {
-		for (GenericListenerList gll : this.genericListeners) {
-			if (gll.listenerClass == listenerClass) {
-				return gll;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Add the "generic" listener list for the specified listener class.
-	 * Return the newly-built generic listener list.
-	 */
-	protected <T extends ChangeListener> GenericListenerList addGenericListenerList(Class<T> listenerClass, T listener) {
-		GenericListenerList gll = new GenericListenerList(listenerClass, listener);
-		this.genericListeners = CollectionTools.add(this.genericListeners, gll);
-		return gll;
-	}
-
-	/**
-	 * Adds a listener that listens to all events appropriate to that listener,
-	 * and only to those events carrying the aspect name specified.
-	 * The aspect name cannot be null and the listener cannot be null.
-	 */
-	protected <T extends ChangeListener> void addListener(String aspectName, Class<T> listenerClass, T listener) {
-		if ((aspectName == null) || (listener == null)) {
-			throw new NullPointerException();		// better sooner than later
-		}
-		synchronized (this) {
-			ChangeSupport child = this.getChild(aspectName);
-			if (child == null) {
-				child = this.addChild(aspectName);
-			}
-			child.addListener(listenerClass, listener);
-		}
-	}
-
-	/**
-	 * Return the child change support for the specified aspect name.
-	 * Return null if the aspect name is null or the child is not present.
-	 */
-	protected ChangeSupport getChild(String aspectName) {
-		// put in a null check to simplify calling code
-		if (aspectName == null) {
-			return null;
-		}
-		for (AspectChild aspectChild : this.aspectChildren) {
-			if (aspectChild.aspectName == aspectName) {
-				return aspectChild.child;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Add the child change support for the specified aspect name.
-	 * Return the newly-built child change support.
-	 */
-	protected ChangeSupport addChild(String aspectName) {
-		ChangeSupport child = this.buildChildChangeSupport();
-		this.aspectChildren = CollectionTools.add(this.aspectChildren, new AspectChild(aspectName, child));
-		return child;
-	}
-
-	/**
-	 * Build and return a child change support to hold aspect-specific listeners.
-	 */
-	protected ChangeSupport buildChildChangeSupport() {
-		return new Child(this.source);
-	}
-
-	/**
-	 * Removes a "generic" listener that has been registered for all events
-	 * appropriate to that listener.
-	 */
-	protected <T extends ChangeListener> void removeListener(Class<T> listenerClass, T listener) {
-		synchronized (this) {
-			GenericListenerList gll = this.getGenericListenerList(listenerClass);
-			if (gll == null) {
-				throw new IllegalArgumentException("listener not registered"); //$NON-NLS-1$
-			}
-			if ( ! gll.removeListener(listener)) {  // leave the GLL, even if it is empty?
-				throw new IllegalArgumentException("listener not registered: " + listener); //$NON-NLS-1$
-			}
-		}
-	}
-
-	/**
-	 * Removes a listener that has been registered for appropriate
-	 * events carrying the specified aspect name.
-	 */
-	protected <T extends ChangeListener> void removeListener(String aspectName, Class<T> listenerClass, T listener) {
-		synchronized (this) {
-			ChangeSupport child = this.getChild(aspectName);
-			if (child == null) {
-				throw new IllegalArgumentException("listener not registered"); //$NON-NLS-1$
-			}
-			child.removeListener(listenerClass, listener);  // leave the child, even if it is empty?
-		}
-	}
-
-
-	// ********** internal queries **********
-
-	/**
-	 * Return the "generic" listeners for the specified listener class.
-	 * Return null if there are no listeners.
-	 */
-	protected ChangeListener[] getListeners(Class<? extends ChangeListener> listenerClass) {
-		GenericListenerList gll = this.getGenericListenerList(listenerClass);
-		return (gll == null) ? null : gll.listeners;
-	}
-
-	/**
-	 * Return whether there are any "generic" listeners for the specified
-	 * listener class.
-	 */
-	protected synchronized <T extends ChangeListener> boolean hasAnyListeners(Class<T> listenerClass) {
-		GenericListenerList gll = this.getGenericListenerList(listenerClass);
-		return (gll != null) && gll.hasListeners();
-	}
-
-	/**
-	 * Return whether there are no "generic" listeners for the specified
-	 * listener class.
-	 */
-	protected <T extends ChangeListener> boolean hasNoListeners(Class<T> listenerClass) {
-		return ! this.hasAnyListeners(listenerClass);
-	}
-
-	/**
-	 * Return whether there are any listeners for the specified
-	 * listener class and aspect name.
-	 */
-	protected synchronized boolean hasAnyListeners(Class<? extends ChangeListener> listenerClass, String aspectName) {
-		if (this.hasAnyListeners(listenerClass)) {
-			return true;  // we have a "generic" listener
-		}
-		ChangeSupport child = this.getChild(aspectName);
-		return (child != null) &&
-			child.hasAnyListeners(listenerClass);
-	}
-
-	/**
-	 * Return whether there are no "generic" listeners for the specified
-	 * listener class and aspect name.
-	 */
-	protected <T extends ChangeListener> boolean hasNoListeners(Class<T> listenerClass, String aspectName) {
-		return ! this.hasAnyListeners(listenerClass, aspectName);
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * The specified aspect of the source has changed;
-	 * override this method to perform things like setting a
-	 * dirty flag or validating the source's state.
-	 * The aspect ID will be null if a "state change" occurred.
-	 */
-	protected void sourceChanged(@SuppressWarnings("unused") String aspectName) {
-		// the default is to do nothing
-	}
-
-
-	// ********** state change support **********
-
-	protected static final Class<StateChangeListener> STATE_CHANGE_LISTENER_CLASS = StateChangeListener.class;
-
-	/**
-	 * Add a state change listener.
-	 */
-	public void addStateChangeListener(StateChangeListener listener) {
-		this.addListener(STATE_CHANGE_LISTENER_CLASS, listener);
-	}
-
-	/**
-	 * Remove a state change listener.
-	 */
-	public void removeStateChangeListener(StateChangeListener listener) {
-		this.removeListener(STATE_CHANGE_LISTENER_CLASS, listener);
-	}
-
-	/**
-	 * Return whether there are any state change listeners.
-	 */
-	public boolean hasAnyStateChangeListeners() {
-		return this.hasAnyListeners(STATE_CHANGE_LISTENER_CLASS);
-	}
-
-	private StateChangeListener[] getStateChangeListeners() {
-		return (StateChangeListener[]) this.getListeners(STATE_CHANGE_LISTENER_CLASS);
-	}
-
-	/**
-	 * Fire the specified state change event to any registered listeners.
-	 */
-	public void fireStateChanged(StateChangeEvent event) {
-
-		StateChangeListener[] targets = null;
-
-		synchronized (this) {
-			StateChangeListener[] stateChangeListeners = this.getStateChangeListeners();
-			if (stateChangeListeners != null) {
-				targets = stateChangeListeners.clone();
-			}
-		}
-
-		if (targets != null) {
-			for (StateChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getStateChangeListeners(), target);
-				}
-				if (stillListening) {
-					target.stateChanged(event);
-				}
-			}
-		}
-
-		this.sourceChanged(null);
-	}
-
-	/**
-	 * Report a generic state change event to any registered state change
-	 * listeners.
-	 */
-	public void fireStateChanged() {
-//		this.fireStateChange(new StateChangeEvent(this.source));
-
-		StateChangeListener[] targets = null;
-
-		synchronized (this) {
-			StateChangeListener[] stateChangeListeners = this.getStateChangeListeners();
-			if (stateChangeListeners != null) {
-				targets = stateChangeListeners.clone();
-			}
-		}
-
-		if (targets != null) {
-			StateChangeEvent event = null;
-			for (StateChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getStateChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new StateChangeEvent(this.source);
-					}
-					target.stateChanged(event);
-				}
-			}
-		}
-
-		this.sourceChanged(null);
-	}
-
-
-	// ********** property change support **********
-
-	protected static final Class<PropertyChangeListener> PROPERTY_CHANGE_LISTENER_CLASS = PropertyChangeListener.class;
-
-	/**
-	 * Add a property change listener that is registered for all properties.
-	 */
-	public void addPropertyChangeListener(PropertyChangeListener listener) {
-		this.addListener(PROPERTY_CHANGE_LISTENER_CLASS, listener);
-	}
-
-	/**
-	 * Add a property change listener for the specified property. The listener
-	 * will be notified only for changes to the specified property.
-	 */
-	public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) {
-		this.addListener(propertyName, PROPERTY_CHANGE_LISTENER_CLASS, listener);
-	}
-
-	/**
-	 * Remove a property change listener that was registered for all properties.
-	 */
-	public void removePropertyChangeListener(PropertyChangeListener listener) {
-		this.removeListener(PROPERTY_CHANGE_LISTENER_CLASS, listener);
-	}
-
-	/**
-	 * Remove a property change listener that was registered for a specific property.
-	 */
-	public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) {
-		this.removeListener(propertyName, PROPERTY_CHANGE_LISTENER_CLASS, listener);
-	}
-
-	/**
-	 * Return whether there are any property change listeners that will
-	 * be notified when the specified property has changed.
-	 */
-	public boolean hasAnyPropertyChangeListeners(String propertyName) {
-		return this.hasAnyListeners(PROPERTY_CHANGE_LISTENER_CLASS, propertyName);
-	}
-
-	/**
-	 * Return whether there are any property change listeners that will
-	 * be notified when any property has changed.
-	 */
-	public boolean hasAnyPropertyChangeListeners() {
-		return this.hasAnyListeners(PROPERTY_CHANGE_LISTENER_CLASS);
-	}
-
-	private PropertyChangeListener[] getPropertyChangeListeners() {
-		return (PropertyChangeListener[]) this.getListeners(PROPERTY_CHANGE_LISTENER_CLASS);
-	}
-
-	/**
-	 * Fire the specified property change event to any registered listeners.
-	 * No event is fired if the given event's old and new values are the same;
-	 * this includes when both values are null. Use a state change event
-	 * for general purpose notification of changes.
-	 */
-	public void firePropertyChanged(PropertyChangeEvent event) {
-		if (this.valuesAreEqual(event.getOldValue(), event.getNewValue())) {
-			return; 
-		}
-
-		String propertyName = event.getPropertyName();
-
-		PropertyChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			PropertyChangeListener[] propertyChangeListeners = this.getPropertyChangeListeners();
-			if (propertyChangeListeners != null) {
-				targets = propertyChangeListeners.clone();
-			}
-			child = this.getChild(propertyName);
-		}
-
-		if (targets != null) {
-			for (PropertyChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getPropertyChangeListeners(), target);
-				}
-				if (stillListening) {
-					target.propertyChanged(event);
-				}
-			}
-		}
-		if (child != null) {
-			child.firePropertyChanged(event);
-		}
-
-		this.sourceChanged(propertyName);
-	}
-
-	/**
-	 * Report a bound property update to any registered property change listeners.
-	 * No event is fired if the given old and new values are the same;
-	 * this includes when both values are null. Use a state change event
-	 * for general purpose notification of changes.
-	 */
-	public void firePropertyChanged(String propertyName, Object oldValue, Object newValue) {
-//		this.firePropertyChanged(new PropertyChangeEvent(this.source, propertyName, oldValue, newValue));
-		if (this.valuesAreEqual(oldValue, newValue)) {
-			return;
-		}
-
-		PropertyChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			PropertyChangeListener[] propertyChangeListeners = this.getPropertyChangeListeners();
-			if (propertyChangeListeners != null) {
-				targets = propertyChangeListeners.clone();
-			}
-			child = this.getChild(propertyName);
-		}
-
-		PropertyChangeEvent event = null;
-
-		if (targets != null) {
-			for (PropertyChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getPropertyChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new PropertyChangeEvent(this.source, propertyName, oldValue, newValue);
-					}
-					target.propertyChanged(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.firePropertyChanged(propertyName, oldValue, newValue);
-			} else {
-				child.firePropertyChanged(event);
-			}
-		}
-
-		this.sourceChanged(propertyName);
-	}
-
-	/**
-	 * Report an int bound property update to any registered listeners.
-	 * No event is fired if old and new are equal.
-	 * <p>
-	 * This is merely a convenience wrapper around the more general
-	 * firePropertyChange method that takes Object values.
-	 */
-	public void firePropertyChanged(String propertyName, int oldValue, int newValue) {
-//		this.firePropertyChanged(propertyName, new Integer(oldValue), new Integer(newValue));
-		if (oldValue == newValue) {
-			return;
-		}
-
-		PropertyChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			PropertyChangeListener[] propertyChangeListeners = this.getPropertyChangeListeners();
-			if (propertyChangeListeners != null) {
-				targets = propertyChangeListeners.clone();
-			}
-			child = this.getChild(propertyName);
-		}
-
-		PropertyChangeEvent event = null;
-
-		if (targets != null) {
-			for (PropertyChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getPropertyChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new PropertyChangeEvent(this.source, propertyName, new Integer(oldValue), new Integer(newValue));
-					}
-					target.propertyChanged(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.firePropertyChanged(propertyName, oldValue, newValue);
-			} else {
-				child.firePropertyChanged(event);
-			}
-		}
-
-		this.sourceChanged(propertyName);
-	}
-
-	/**
-	 * Report a boolean bound property update to any registered listeners.
-	 * No event is fired if old and new are equal.
-	 * <p>
-	 * This is merely a convenience wrapper around the more general
-	 * firePropertyChange method that takes Object values.
-	 */
-	public void firePropertyChanged(String propertyName, boolean oldValue, boolean newValue) {
-//		this.firePropertyChanged(propertyName, Boolean.valueOf(oldValue), Boolean.valueOf(newValue));
-		if (oldValue == newValue) {
-			return;
-		}
-
-		PropertyChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			PropertyChangeListener[] propertyChangeListeners = this.getPropertyChangeListeners();
-			if (propertyChangeListeners != null) {
-				targets = propertyChangeListeners.clone();
-			}
-			child = this.getChild(propertyName);
-		}
-
-		PropertyChangeEvent event = null;
-
-		if (targets != null) {
-			for (PropertyChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getPropertyChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new PropertyChangeEvent(this.source, propertyName, Boolean.valueOf(oldValue), Boolean.valueOf(newValue));
-					}
-					target.propertyChanged(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.firePropertyChanged(propertyName, oldValue, newValue);
-			} else {
-				child.firePropertyChanged(event);
-			}
-		}
-
-		this.sourceChanged(propertyName);
-	}
-
-
-	// ********** collection change support **********
-
-	protected static final Class<CollectionChangeListener> COLLECTION_CHANGE_LISTENER_CLASS = CollectionChangeListener.class;
-
-	/**
-	 * Add a collection change listener that is registered for all collections.
-	 */
-	public void addCollectionChangeListener(CollectionChangeListener listener) {
-		this.addListener(COLLECTION_CHANGE_LISTENER_CLASS, listener);
-	}
-
-	/**
-	 * Add a collection change listener for the specified collection. The listener
-	 * will be notified only for changes to the specified collection.
-	 */
-	public void addCollectionChangeListener(String collectionName, CollectionChangeListener listener) {
-		this.addListener(collectionName, COLLECTION_CHANGE_LISTENER_CLASS, listener);
-	}
-
-	/**
-	 * Remove a collection change listener that was registered for all collections.
-	 */
-	public void removeCollectionChangeListener(CollectionChangeListener listener) {
-		this.removeListener(COLLECTION_CHANGE_LISTENER_CLASS, listener);
-	}
-
-	/**
-	 * Remove a collection change listener that was registered for a specific collection.
-	 */
-	public void removeCollectionChangeListener(String collectionName, CollectionChangeListener listener) {
-		this.removeListener(collectionName, COLLECTION_CHANGE_LISTENER_CLASS, listener);
-	}
-
-	/**
-	 * Return whether there are any collection change listeners that will
-	 * be notified when the specified collection has changed.
-	 */
-	public boolean hasAnyCollectionChangeListeners(String collectionName) {
-		return this.hasAnyListeners(COLLECTION_CHANGE_LISTENER_CLASS, collectionName);
-	}
-
-	/**
-	 * Return whether there are any collection change listeners that will
-	 * be notified when any collection has changed.
-	 */
-	public boolean hasAnyCollectionChangeListeners() {
-		return this.hasAnyListeners(COLLECTION_CHANGE_LISTENER_CLASS);
-	}
-
-	private CollectionChangeListener[] getCollectionChangeListeners() {
-		return (CollectionChangeListener[]) this.getListeners(COLLECTION_CHANGE_LISTENER_CLASS);
-	}
-
-	/**
-	 * Report a bound collection update to any registered listeners.
-	 */
-	public void fireItemsAdded(CollectionChangeEvent event) {
-		if (event.itemsSize() == 0) {
-			return;
-		}
-
-		String collectionName = event.getCollectionName();
-
-		CollectionChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			CollectionChangeListener[] collectionChangeListeners = this.getCollectionChangeListeners();
-			if (collectionChangeListeners != null) {
-				targets = collectionChangeListeners.clone();
-			}
-			child = this.getChild(collectionName);
-		}
-
-		if (targets != null) {
-			for (CollectionChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getCollectionChangeListeners(), target);
-				}
-				if (stillListening) {
-					target.itemsAdded(event);
-				}
-			}
-		}
-		if (child != null) {
-			child.fireItemsAdded(event);
-		}
-
-		this.sourceChanged(collectionName);
-	}
-
-	/**
-	 * Report a bound collection update to any registered listeners.
-	 */
-	public void fireItemsAdded(String collectionName, Collection<?> addedItems) {
-//		this.fireItemsAdded(new CollectionChangeEvent(this.source, collectionName, addedItems));
-		if (addedItems.isEmpty()) {
-			return;
-		}
-
-		CollectionChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			CollectionChangeListener[] collectionChangeListeners = this.getCollectionChangeListeners();
-			if (collectionChangeListeners != null) {
-				targets = collectionChangeListeners.clone();
-			}
-			child = this.getChild(collectionName);
-		}
-
-		CollectionChangeEvent event = null;
-
-		if (targets != null) {
-			for (CollectionChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getCollectionChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new CollectionChangeEvent(this.source, collectionName, addedItems);
-					}
-					target.itemsAdded(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireItemsAdded(collectionName, addedItems);
-			} else {
-				child.fireItemsAdded(event);
-			}
-		}
-
-		this.sourceChanged(collectionName);
-	}
-
-	/**
-	 * Report a bound collection update to any registered listeners.
-	 */
-	public void fireItemAdded(String collectionName, Object addedItem) {
-//		this.fireItemsAdded(collectionName, Collections.singleton(addedItem));
-
-		CollectionChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			CollectionChangeListener[] collectionChangeListeners = this.getCollectionChangeListeners();
-			if (collectionChangeListeners != null) {
-				targets = collectionChangeListeners.clone();
-			}
-			child = this.getChild(collectionName);
-		}
-
-		CollectionChangeEvent event = null;
-
-		if (targets != null) {
-			for (CollectionChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getCollectionChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new CollectionChangeEvent(this.source, collectionName, Collections.singleton(addedItem));
-					}
-					target.itemsAdded(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireItemAdded(collectionName, addedItem);
-			} else {
-				child.fireItemsAdded(event);
-			}
-		}
-
-		this.sourceChanged(collectionName);
-	}
-
-	/**
-	 * Report a bound collection update to any registered listeners.
-	 */
-	public void fireItemsRemoved(CollectionChangeEvent event) {
-		if (event.itemsSize() == 0) {
-			return;
-		}
-
-		String collectionName = event.getCollectionName();
-
-		CollectionChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			CollectionChangeListener[] collectionChangeListeners = this.getCollectionChangeListeners();
-			if (collectionChangeListeners != null) {
-				targets = collectionChangeListeners.clone();
-			}
-			child = this.getChild(collectionName);
-		}
-
-		if (targets != null) {
-			for (CollectionChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getCollectionChangeListeners(), target);
-				}
-				if (stillListening) {
-					target.itemsRemoved(event);
-				}
-			}
-		}
-		if (child != null) {
-			child.fireItemsRemoved(event);
-		}
-
-		this.sourceChanged(collectionName);
-	}
-
-	/**
-	 * Report a bound collection update to any registered listeners.
-	 */
-	public void fireItemsRemoved(String collectionName, Collection<?> removedItems) {
-//		this.fireItemsRemoved(new CollectionChangeEvent(this.source, collectionName, removedItems));
-		if (removedItems.isEmpty()) {
-			return;
-		}
-
-		CollectionChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			CollectionChangeListener[] collectionChangeListeners = this.getCollectionChangeListeners();
-			if (collectionChangeListeners != null) {
-				targets = collectionChangeListeners.clone();
-			}
-			child = this.getChild(collectionName);
-		}
-
-		CollectionChangeEvent event = null;
-
-		if (targets != null) {
-			for (CollectionChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getCollectionChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new CollectionChangeEvent(this.source, collectionName, removedItems);
-					}
-					target.itemsRemoved(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireItemsRemoved(collectionName, removedItems);
-			} else {
-				child.fireItemsRemoved(event);
-			}
-		}
-
-		this.sourceChanged(collectionName);
-	}
-
-	/**
-	 * Report a bound collection update to any registered listeners.
-	 */
-	public void fireItemRemoved(String collectionName, Object removedItem) {
-//		this.fireItemsRemoved(collectionName, Collections.singleton(removedItem));
-
-		CollectionChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			CollectionChangeListener[] collectionChangeListeners = this.getCollectionChangeListeners();
-			if (collectionChangeListeners != null) {
-				targets = collectionChangeListeners.clone();
-			}
-			child = this.getChild(collectionName);
-		}
-
-		CollectionChangeEvent event = null;
-
-		if (targets != null) {
-			for (CollectionChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getCollectionChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new CollectionChangeEvent(this.source, collectionName, Collections.singleton(removedItem));
-					}
-					target.itemsRemoved(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireItemRemoved(collectionName, removedItem);
-			} else {
-				child.fireItemsRemoved(event);
-			}
-		}
-
-		this.sourceChanged(collectionName);
-	}
-
-	/**
-	 * Report a bound collection update to any registered listeners.
-	 */
-	public void fireCollectionCleared(CollectionChangeEvent event) {
-		String collectionName = event.getCollectionName();
-
-		CollectionChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			CollectionChangeListener[] collectionChangeListeners = this.getCollectionChangeListeners();
-			if (collectionChangeListeners != null) {
-				targets = collectionChangeListeners.clone();
-			}
-			child = this.getChild(collectionName);
-		}
-
-		if (targets != null) {
-			for (CollectionChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getCollectionChangeListeners(), target);
-				}
-				if (stillListening) {
-					target.collectionCleared(event);
-				}
-			}
-		}
-		if (child != null) {
-			child.fireCollectionCleared(event);
-		}
-
-		this.sourceChanged(collectionName);
-	}
-
-	/**
-	 * Report a bound collection update to any registered listeners.
-	 */
-	public void fireCollectionCleared(String collectionName) {
-//		this.fireCollectionCleared(new CollectionChangeEvent(this.source, collectionName));
-
-		CollectionChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			CollectionChangeListener[] collectionChangeListeners = this.getCollectionChangeListeners();
-			if (collectionChangeListeners != null) {
-				targets = collectionChangeListeners.clone();
-			}
-			child = this.getChild(collectionName);
-		}
-
-		CollectionChangeEvent event = null;
-
-		if (targets != null) {
-			for (CollectionChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getCollectionChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new CollectionChangeEvent(this.source, collectionName);
-					}
-					target.collectionCleared(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireCollectionCleared(collectionName);
-			} else {
-				child.fireCollectionCleared(event);
-			}
-		}
-
-		this.sourceChanged(collectionName);
-	}
-
-	/**
-	 * Report a bound collection update to any registered listeners.
-	 */
-	public void fireCollectionChanged(CollectionChangeEvent event) {
-		String collectionName = event.getCollectionName();
-
-		CollectionChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			CollectionChangeListener[] collectionChangeListeners = this.getCollectionChangeListeners();
-			if (collectionChangeListeners != null) {
-				targets = collectionChangeListeners.clone();
-			}
-			child = this.getChild(collectionName);
-		}
-
-		if (targets != null) {
-			for (CollectionChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getCollectionChangeListeners(), target);
-				}
-				if (stillListening) {
-					target.collectionChanged(event);
-				}
-			}
-		}
-		if (child != null) {
-			child.fireCollectionChanged(event);
-		}
-
-		this.sourceChanged(collectionName);
-	}
-
-	/**
-	 * Report a bound collection update to any registered listeners.
-	 */
-	public void fireCollectionChanged(String collectionName) {
-//		this.fireCollectionChanged(new CollectionChangeEvent(this.source, collectionName));
-
-		CollectionChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			CollectionChangeListener[] collectionChangeListeners = this.getCollectionChangeListeners();
-			if (collectionChangeListeners != null) {
-				targets = collectionChangeListeners.clone();
-			}
-			child = this.getChild(collectionName);
-		}
-
-		CollectionChangeEvent event = null;
-
-		if (targets != null) {
-			for (CollectionChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getCollectionChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new CollectionChangeEvent(this.source, collectionName);
-					}
-					target.collectionChanged(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireCollectionChanged(collectionName);
-			} else {
-				child.fireCollectionChanged(event);
-			}
-		}
-
-		this.sourceChanged(collectionName);
-	}
-
-	/**
-	 * Add the specified item to the specified bound collection
-	 * and fire the appropriate event if necessary.
-	 * Return whether the collection changed.
-	 * @see java.util.Collection#add(Object)
-	 */
-	public <E> boolean addItemToCollection(E item, Collection<E> collection, String collectionName) {
-		if (collection.add(item)) {
-			this.fireItemAdded(collectionName, item);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Add the specified items to the specified bound collection
-	 * and fire the appropriate event if necessary.
-	 * Return whether collection changed.
-	 * @see java.util.Collection#addAll(java.util.Collection)
-	 */
-	public <E> boolean addItemsToCollection(E[] items, Collection<E> collection, String collectionName) {
-		return (items.length != 0)
-				&& this.addItemsToCollection_(new ArrayIterator<E>(items), collection, collectionName);
-	}
-
-	/**
-	 * Add the specified items to the specified bound collection
-	 * and fire the appropriate event if necessary.
-	 * Return whether collection changed.
-	 * @see java.util.Collection#addAll(java.util.Collection)
-	 */
-	public <E> boolean addItemsToCollection(Collection<? extends E> items, Collection<E> collection, String collectionName) {
-		return ( ! items.isEmpty())
-				&& this.addItemsToCollection_(items.iterator(), collection, collectionName);
-	}
-
-	/**
-	 * Add the specified items to the specified bound collection
-	 * and fire the appropriate event if necessary.
-	 * Return whether collection changed.
-	 * @see java.util.Collection#addAll(java.util.Collection)
-	 */
-	public <E> boolean addItemsToCollection(Iterable<? extends E> items, Collection<E> collection, String collectionName) {
-		return this.addItemsToCollection(items.iterator(), collection, collectionName);
-	}
-
-	/**
-	 * Add the specified items to the specified bound collection
-	 * and fire the appropriate event if necessary.
-	 * Return whether collection changed.
-	 * @see java.util.Collection#addAll(java.util.Collection)
-	 */
-	public <E> boolean addItemsToCollection(Iterator<? extends E> items, Collection<E> collection, String collectionName) {
-		return items.hasNext()
-				&& this.addItemsToCollection_(items, collection, collectionName);
-	}
-
-	/**
-	 * no empty check
-	 */
-	protected <E> boolean addItemsToCollection_(Iterator<? extends E> items, Collection<E> collection, String collectionName) {
-		Collection<E> addedItems = null;
-		while (items.hasNext()) {
-			E item = items.next();
-			if (collection.add(item)) {
-				if (addedItems == null) {
-					addedItems = new ArrayList<E>();
-				}
-				addedItems.add(item);
-			}
-		}
-		if (addedItems != null) {
-			this.fireItemsAdded(collectionName, addedItems);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Remove the specified item from the specified bound collection
-	 * and fire the appropriate event if necessary.
-	 * Return whether the collection changed.
-	 * @see java.util.Collection#remove(Object)
-	 */
-	public boolean removeItemFromCollection(Object item, Collection<?> collection, String collectionName) {
-		if (collection.remove(item)) {
-			this.fireItemRemoved(collectionName, item);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Remove the specified items from the specified bound collection
-	 * and fire the appropriate event if necessary.
-	 * Return whether the collection changed.
-	 * @see java.util.Collection#removeAll(java.util.Collection)
-	 */
-	public boolean removeItemsFromCollection(Object[] items, Collection<?> collection, String collectionName) {
-		return (items.length != 0)
-				&& ( ! collection.isEmpty())
-				&& this.removeItemsFromCollection_(new ArrayIterator<Object>(items), collection, collectionName);
-	}
-
-	/**
-	 * Remove the specified items from the specified bound collection
-	 * and fire the appropriate event if necessary.
-	 * Return whether the collection changed.
-	 * @see java.util.Collection#removeAll(java.util.Collection)
-	 */
-	public boolean removeItemsFromCollection(Collection<?> items, Collection<?> collection, String collectionName) {
-		return ( ! items.isEmpty())
-				&& ( ! collection.isEmpty())
-				&& this.removeItemsFromCollection_(items.iterator(), collection, collectionName);
-	}
-
-	/**
-	 * Remove the specified items from the specified bound collection
-	 * and fire the appropriate event if necessary.
-	 * Return whether the collection changed.
-	 * @see java.util.Collection#removeAll(java.util.Collection)
-	 */
-	public boolean removeItemsFromCollection(Iterable<?> items, Collection<?> collection, String collectionName) {
-		return this.removeItemsFromCollection(items.iterator(), collection, collectionName);
-	}
-
-	/**
-	 * Remove the specified items from the specified bound collection
-	 * and fire the appropriate event if necessary.
-	 * Return whether the collection changed.
-	 * @see java.util.Collection#removeAll(java.util.Collection)
-	 */
-	public boolean removeItemsFromCollection(Iterator<?> items, Collection<?> collection, String collectionName) {
-		return items.hasNext()
-				&& ( ! collection.isEmpty())
-				&& this.removeItemsFromCollection_(items, collection, collectionName);
-	}
-
-	/**
-	 * no empty checks
-	 */
-	protected boolean removeItemsFromCollection_(Iterator<?> items, Collection<?> collection, String collectionName) {
-		HashBag<?> removedItems = CollectionTools.collection(items);
-		removedItems.retainAll(collection);
-		boolean changed = collection.removeAll(removedItems);
-
-		if ( ! removedItems.isEmpty()) {
-			this.fireItemsRemoved(collectionName, removedItems);
-		}
-		return changed;
-	}
-
-	/**
-	 * Retain the specified items in the specified bound collection
-	 * and fire the appropriate event if necessary.
-	 * Return whether the collection changed.
-	 * @see java.util.Collection#retainAll(java.util.Collection)
-	 */
-	public boolean retainItemsInCollection(Object[] items, Collection<?> collection, String collectionName) {
-		if (collection.isEmpty()) {
-			return false;
-		}
-		if (items.length == 0) {
-			return this.clearCollection_(collection, collectionName);
-		}
-		return this.retainItemsInCollection_(new ArrayIterator<Object>(items), collection, collectionName);
-	}
-
-	/**
-	 * Retain the specified items in the specified bound collection
-	 * and fire the appropriate event if necessary.
-	 * Return whether the collection changed.
-	 * @see java.util.Collection#retainAll(java.util.Collection)
-	 */
-	public boolean retainItemsInCollection(Collection<?> items, Collection<?> collection, String collectionName) {
-		if (collection.isEmpty()) {
-			return false;
-		}
-		if (items.isEmpty()) {
-			return this.clearCollection_(collection, collectionName);
-		}
-		return this.retainItemsInCollection_(items.iterator(), collection, collectionName);
-	}
-
-	/**
-	 * Retain the specified items in the specified bound collection
-	 * and fire the appropriate event if necessary.
-	 * Return whether the collection changed.
-	 * @see java.util.Collection#retainAll(java.util.Collection)
-	 */
-	public boolean retainItemsInCollection(Iterable<?> items, Collection<?> collection, String collectionName) {
-		return this.retainItemsInCollection(items.iterator(), collection, collectionName);
-	}
-
-	/**
-	 * Retain the specified items in the specified bound collection
-	 * and fire the appropriate event if necessary.
-	 * Return whether the collection changed.
-	 * @see java.util.Collection#retainAll(java.util.Collection)
-	 */
-	public boolean retainItemsInCollection(Iterator<?> items, Collection<?> collection, String collectionName) {
-		if (collection.isEmpty()) {
-			return false;
-		}
-		if ( ! items.hasNext()) {
-			return this.clearCollection_(collection, collectionName);
-		}
-		return this.retainItemsInCollection_(items, collection, collectionName);
-	}
-
-	/**
-	 * no empty checks
-	 */
-	protected boolean retainItemsInCollection_(Iterator<?> items, Collection<?> collection, String collectionName) {
-		HashBag<?> retainedItems = CollectionTools.collection(items);
-		HashBag<?> removedItems = CollectionTools.collection(collection);
-		removedItems.removeAll(retainedItems);
-		boolean changed = collection.retainAll(retainedItems);
-
-		if ( ! removedItems.isEmpty()) {
-			this.fireItemsRemoved(collectionName, removedItems);
-		}
-		return changed;
-	}
-
-	/**
-	 * Clear the entire collection
-	 * and fire the appropriate event if necessary.
-	 * Return whether the collection changed.
-	 * @see java.util.Collection#clear()
-	 */
-	public boolean clearCollection(Collection<?> collection, String collectionName) {
-		if (collection.isEmpty()) {
-			return false;
-		}
-		return this.clearCollection_(collection, collectionName);
-	}
-
-	/**
-	 * no empty check
-	 */
-	protected boolean clearCollection_(Collection<?> collection, String collectionName) {
-		collection.clear();
-		this.fireCollectionCleared(collectionName);
-		return true;
-	}
-
-	/**
-	 * Synchronize the collection with the specified new collection,
-	 * making a minimum number of removes and adds.
-	 * Return whether the collection changed.
-	 */
-	public <E> boolean synchronizeCollection(Collection<E> newCollection, Collection<E> collection, String collectionName) {
-		if (newCollection.isEmpty()) {
-			return this.clearCollection(collection, collectionName);
-		}
-
-		if (collection.isEmpty()) {
-			return this.addItemsToCollection(newCollection, collection, collectionName);
-		}
-
-		return this.synchronizeCollection_(newCollection, collection, collectionName);
-	}
-
-	/**
-	 * Synchronize the collection with the specified new collection,
-	 * making a minimum number of removes and adds.
-	 * Return whether the collection changed.
-	 */
-	public <E> boolean synchronizeCollection(Iterator<E> newCollection, Collection<E> collection, String collectionName) {
-		if ( ! newCollection.hasNext()) {
-			return this.clearCollection(collection, collectionName);
-		}
-
-		if (collection.isEmpty()) {
-			return this.addItemsToCollection(newCollection, collection, collectionName);
-		}
-
-		return this.synchronizeCollection_(CollectionTools.collection(newCollection), collection, collectionName);
-	}
-
-	/**
-	 * no empty checks
-	 */
-	protected <E> boolean synchronizeCollection_(Collection<E> newCollection, Collection<E> collection, String collectionName) {
-		boolean changed = false;
-		Collection<E> removeItems = new HashBag<E>(collection);
-		removeItems.removeAll(newCollection);
-		changed |= this.removeItemsFromCollection(removeItems, collection, collectionName);
-
-		Collection<E> addItems = new HashBag<E>(newCollection);
-		addItems.removeAll(collection);
-		changed |= this.addItemsToCollection(addItems, collection, collectionName);
-
-		return changed;
-	}
-
-
-	// ********** list change support **********
-
-	protected static final Class<ListChangeListener> LIST_CHANGE_LISTENER_CLASS = ListChangeListener.class;
-
-	/**
-	 * Add a list change listener that is registered for all lists.
-	 */
-	public void addListChangeListener(ListChangeListener listener) {
-		this.addListener(LIST_CHANGE_LISTENER_CLASS, listener);
-	}
-
-	/**
-	 * Add a list change listener for the specified list. The listener
-	 * will be notified only for changes to the specified list.
-	 */
-	public void addListChangeListener(String listName, ListChangeListener listener) {
-		this.addListener(listName, LIST_CHANGE_LISTENER_CLASS, listener);
-	}
-
-	/**
-	 * Remove a list change listener that was registered for all lists.
-	 */
-	public void removeListChangeListener(ListChangeListener listener) {
-		this.removeListener(LIST_CHANGE_LISTENER_CLASS, listener);
-	}
-
-	/**
-	 * Remove a list change listener that was registered for a specific list.
-	 */
-	public void removeListChangeListener(String listName, ListChangeListener listener) {
-		this.removeListener(listName, LIST_CHANGE_LISTENER_CLASS, listener);
-	}
-
-	/**
-	 * Return whether there are any list change listeners that will
-	 * be notified when the specified list has changed.
-	 */
-	public boolean hasAnyListChangeListeners(String listName) {
-		return this.hasAnyListeners(LIST_CHANGE_LISTENER_CLASS, listName);
-	}
-
-	/**
-	 * Return whether there are any list change listeners that will
-	 * be notified when any list has changed.
-	 */
-	public boolean hasAnyListChangeListeners() {
-		return this.hasAnyListeners(LIST_CHANGE_LISTENER_CLASS);
-	}
-
-	private ListChangeListener[] getListChangeListeners() {
-		return (ListChangeListener[]) this.getListeners(LIST_CHANGE_LISTENER_CLASS);
-	}
-
-	/**
-	 * Report a bound list update to any registered listeners.
-	 */
-	public void fireItemsAdded(ListChangeEvent event) {
-		if (event.itemsSize() == 0) {
-			return;
-		}
-
-		String listName = event.getListName();
-
-		ListChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			ListChangeListener[] listChangeListeners = this.getListChangeListeners();
-			if (listChangeListeners != null) {
-				targets = listChangeListeners.clone();
-			}
-			child = this.getChild(listName);
-		}
-
-		if (targets != null) {
-			for (ListChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getListChangeListeners(), target);
-				}
-				if (stillListening) {
-					target.itemsAdded(event);
-				}
-			}
-		}
-		if (child != null) {
-			child.fireItemsAdded(event);
-		}
-
-		this.sourceChanged(listName);
-	}
-
-	/**
-	 * Report a bound list update to any registered listeners.
-	 */
-	public void fireItemsAdded(String listName, int index, List<?> addedItems) {
-//		this.fireItemsAdded(new ListChangeEvent(this.source, listName, index, addedItems));
-		if (addedItems.isEmpty()) {
-			return;
-		}
-
-		ListChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			ListChangeListener[] listChangeListeners = this.getListChangeListeners();
-			if (listChangeListeners != null) {
-				targets = listChangeListeners.clone();
-			}
-			child = this.getChild(listName);
-		}
-
-		ListChangeEvent event = null;
-
-		if (targets != null) {
-			for (ListChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getListChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new ListChangeEvent(this.source, listName, index, addedItems);
-					}
-					target.itemsAdded(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireItemsAdded(listName, index, addedItems);
-			} else {
-				child.fireItemsAdded(event);
-			}
-		}
-
-		this.sourceChanged(listName);
-	}
-
-	/**
-	 * Report a bound list update to any registered listeners.
-	 */
-	public void fireItemAdded(String listName, int index, Object addedItem) {
-//		this.fireItemsAdded(listName, index, Collections.singletonList(addedItem));
-
-		ListChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			ListChangeListener[] listChangeListeners = this.getListChangeListeners();
-			if (listChangeListeners != null) {
-				targets = listChangeListeners.clone();
-			}
-			child = this.getChild(listName);
-		}
-
-		ListChangeEvent event = null;
-
-		if (targets != null) {
-			for (ListChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getListChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new ListChangeEvent(this.source, listName, index, Collections.singletonList(addedItem));
-					}
-					target.itemsAdded(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireItemAdded(listName, index, addedItem);
-			} else {
-				child.fireItemsAdded(event);
-			}
-		}
-
-		this.sourceChanged(listName);
-	}
-
-	/**
-	 * Report a bound list update to any registered listeners.
-	 */
-	public void fireItemsRemoved(ListChangeEvent event) {
-		if (event.itemsSize() == 0) {
-			return;
-		}
-
-		String listName = event.getListName();
-
-		ListChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			ListChangeListener[] listChangeListeners = this.getListChangeListeners();
-			if (listChangeListeners != null) {
-				targets = listChangeListeners.clone();
-			}
-			child = this.getChild(listName);
-		}
-
-		if (targets != null) {
-			for (ListChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getListChangeListeners(), target);
-				}
-				if (stillListening) {
-					target.itemsRemoved(event);
-				}
-			}
-		}
-		if (child != null) {
-			child.fireItemsRemoved(event);
-		}
-
-		this.sourceChanged(listName);
-	}
-
-	/**
-	 * Report a bound list update to any registered listeners.
-	 */
-	public void fireItemsRemoved(String listName, int index, List<?> removedItems) {
-//		this.fireItemsRemoved(new ListChangeEvent(this.source, listName, index, removedItems));
-		if (removedItems.isEmpty()) {
-			return;
-		}
-
-		ListChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			ListChangeListener[] listChangeListeners = this.getListChangeListeners();
-			if (listChangeListeners != null) {
-				targets = listChangeListeners.clone();
-			}
-			child = this.getChild(listName);
-		}
-
-		ListChangeEvent event = null;
-
-		if (targets != null) {
-			for (ListChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getListChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new ListChangeEvent(this.source, listName, index, removedItems);
-					}
-					target.itemsRemoved(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireItemsRemoved(listName, index, removedItems);
-			} else {
-				child.fireItemsRemoved(event);
-			}
-		}
-
-		this.sourceChanged(listName);
-	}
-
-	/**
-	 * Report a bound list update to any registered listeners.
-	 */
-	public void fireItemRemoved(String listName, int index, Object removedItem) {
-//		this.fireItemsRemoved(listName, index, Collections.singletonList(removedItem));
-
-		ListChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			ListChangeListener[] listChangeListeners = this.getListChangeListeners();
-			if (listChangeListeners != null) {
-				targets = listChangeListeners.clone();
-			}
-			child = this.getChild(listName);
-		}
-
-		ListChangeEvent event = null;
-
-		if (targets != null) {
-			for (ListChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getListChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new ListChangeEvent(this.source, listName, index, Collections.singletonList(removedItem));
-					}
-					target.itemsRemoved(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireItemRemoved(listName, index, removedItem);
-			} else {
-				child.fireItemsRemoved(event);
-			}
-		}
-
-		this.sourceChanged(listName);
-	}
-
-	/**
-	 * Report a bound list update to any registered listeners.
-	 */
-	public void fireItemsReplaced(ListChangeEvent event) {
-		if (event.itemsSize() == 0) {
-			return;
-		}
-		// TODO check that the items are actually different...
-
-		String listName = event.getListName();
-
-		ListChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			ListChangeListener[] listChangeListeners = this.getListChangeListeners();
-			if (listChangeListeners != null) {
-				targets = listChangeListeners.clone();
-			}
-			child = this.getChild(listName);
-		}
-
-		if (targets != null) {
-			for (ListChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getListChangeListeners(), target);
-				}
-				if (stillListening) {
-					target.itemsReplaced(event);
-				}
-			}
-		}
-		if (child != null) {
-			child.fireItemsReplaced(event);
-		}
-
-		this.sourceChanged(listName);
-	}
-
-	/**
-	 * Report a bound list update to any registered listeners.
-	 */
-	public void fireItemsReplaced(String listName, int index, List<?> newItems, List<?> replacedItems) {
-//		this.fireItemsReplaced(new ListChangeEvent(this.source, listName, index, newItems, replacedItems));
-		if (newItems.isEmpty()) {
-			return;
-		}
-		// TODO check that the items are actually different...
-
-		ListChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			ListChangeListener[] listChangeListeners = this.getListChangeListeners();
-			if (listChangeListeners != null) {
-				targets = listChangeListeners.clone();
-			}
-			child = this.getChild(listName);
-		}
-
-		ListChangeEvent event = null;
-
-		if (targets != null) {
-			for (ListChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getListChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new ListChangeEvent(this.source, listName, index, newItems, replacedItems);
-					}
-					target.itemsReplaced(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireItemsReplaced(listName, index, newItems, replacedItems);
-			} else {
-				child.fireItemsReplaced(event);
-			}
-		}
-
-		this.sourceChanged(listName);
-	}
-
-	/**
-	 * Report a bound list update to any registered listeners.
-	 */
-	public void fireItemReplaced(String listName, int index, Object newItem, Object replacedItem) {
-//		this.fireItemsReplaced(listName, index, Collections.singletonList(newItem), Collections.singletonList(replacedItem));
-		// TODO check that the item is actually different...
-
-		ListChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			ListChangeListener[] listChangeListeners = this.getListChangeListeners();
-			if (listChangeListeners != null) {
-				targets = listChangeListeners.clone();
-			}
-			child = this.getChild(listName);
-		}
-
-		ListChangeEvent event = null;
-
-		if (targets != null) {
-			for (ListChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getListChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new ListChangeEvent(this.source, listName, index, Collections.singletonList(newItem), Collections.singletonList(replacedItem));
-					}
-					target.itemsReplaced(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireItemReplaced(listName, index, newItem, replacedItem);
-			} else {
-				child.fireItemsReplaced(event);
-			}
-		}
-
-		this.sourceChanged(listName);
-	}
-
-	/**
-	 * Report a bound list update to any registered listeners.
-	 */
-	public void fireItemsMoved(ListChangeEvent event) {
-		if (event.getTargetIndex() == event.getSourceIndex()) {
-			return;
-		}
-
-		String listName = event.getListName();
-
-		ListChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			ListChangeListener[] listChangeListeners = this.getListChangeListeners();
-			if (listChangeListeners != null) {
-				targets = listChangeListeners.clone();
-			}
-			child = this.getChild(listName);
-		}
-
-		if (targets != null) {
-			for (ListChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getListChangeListeners(), target);
-				}
-				if (stillListening) {
-					target.itemsMoved(event);
-				}
-			}
-		}
-		if (child != null) {
-			child.fireItemsMoved(event);
-		}
-
-		this.sourceChanged(listName);
-	}
-
-	/**
-	 * Report a bound list update to any registered listeners.
-	 */
-	public void fireItemsMoved(String listName, int targetIndex, int sourceIndex, int length) {
-//		this.fireItemsMoved(new ListChangeEvent(this.source, listName, targetIndex, sourceIndex, length));
-		if (targetIndex == sourceIndex) {
-			return;
-		}
-
-		ListChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			ListChangeListener[] listChangeListeners = this.getListChangeListeners();
-			if (listChangeListeners != null) {
-				targets = listChangeListeners.clone();
-			}
-			child = this.getChild(listName);
-		}
-
-		ListChangeEvent event = null;
-
-		if (targets != null) {
-			for (ListChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getListChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new ListChangeEvent(this.source, listName, targetIndex, sourceIndex, length);
-					}
-					target.itemsMoved(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireItemsMoved(listName, targetIndex, sourceIndex, length);
-			} else {
-				child.fireItemsMoved(event);
-			}
-		}
-
-		this.sourceChanged(listName);
-	}
-
-	/**
-	 * Report a bound list update to any registered listeners.
-	 */
-	public void fireItemMoved(String listName, int targetIndex, int sourceIndex) {
-		this.fireItemsMoved(listName, targetIndex, sourceIndex, 1);
-	}
-
-	/**
-	 * Report a bound list update to any registered listeners.
-	 */
-	public void fireListCleared(ListChangeEvent event) {
-		String listName = event.getListName();
-
-		ListChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			ListChangeListener[] listChangeListeners = this.getListChangeListeners();
-			if (listChangeListeners != null) {
-				targets = listChangeListeners.clone();
-			}
-			child = this.getChild(listName);
-		}
-
-		if (targets != null) {
-			for (ListChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getListChangeListeners(), target);
-				}
-				if (stillListening) {
-					target.listCleared(event);
-				}
-			}
-		}
-		if (child != null) {
-			child.fireListCleared(event);
-		}
-
-		this.sourceChanged(listName);
-	}
-
-	/**
-	 * Report a bound list update to any registered listeners.
-	 */
-	public void fireListCleared(String listName) {
-//		this.fireListCleared(new ListChangeEvent(this.source, listName));
-
-		ListChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			ListChangeListener[] listChangeListeners = this.getListChangeListeners();
-			if (listChangeListeners != null) {
-				targets = listChangeListeners.clone();
-			}
-			child = this.getChild(listName);
-		}
-
-		ListChangeEvent event = null;
-
-		if (targets != null) {
-			for (ListChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getListChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new ListChangeEvent(this.source, listName);
-					}
-					target.listCleared(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireListCleared(listName);
-			} else {
-				child.fireListCleared(event);
-			}
-		}
-
-		this.sourceChanged(listName);
-	}
-
-	/**
-	 * Report a bound list update to any registered listeners.
-	 */
-	public void fireListChanged(ListChangeEvent event) {
-		String listName = event.getListName();
-
-		ListChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			ListChangeListener[] listChangeListeners = this.getListChangeListeners();
-			if (listChangeListeners != null) {
-				targets = listChangeListeners.clone();
-			}
-			child = this.getChild(listName);
-		}
-
-		if (targets != null) {
-			for (ListChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getListChangeListeners(), target);
-				}
-				if (stillListening) {
-					target.listChanged(event);
-				}
-			}
-		}
-		if (child != null) {
-			child.fireListChanged(event);
-		}
-
-		this.sourceChanged(listName);
-	}
-
-	/**
-	 * Report a bound list update to any registered listeners.
-	 */
-	public void fireListChanged(String listName) {
-//		this.fireListChanged(new ListChangeEvent(this.source, listName));
-
-		ListChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			ListChangeListener[] listChangeListeners = this.getListChangeListeners();
-			if (listChangeListeners != null) {
-				targets = listChangeListeners.clone();
-			}
-			child = this.getChild(listName);
-		}
-
-		ListChangeEvent event = null;
-
-		if (targets != null) {
-			for (ListChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getListChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new ListChangeEvent(this.source, listName);
-					}
-					target.listChanged(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireListChanged(listName);
-			} else {
-				child.fireListChanged(event);
-			}
-		}
-
-		this.sourceChanged(listName);
-	}
-
-	/**
-	 * Add the specified item to the specified bound list at the specified index
-	 * and fire the appropriate event.
-	 * @see java.util.List#add(int, Object)
-	 */
-	public <E> void addItemToList(int index, E item, List<E> list, String listName) {
-		list.add(index, item);
-		this.fireItemAdded(listName, index, item);
-	}
-
-	/**
-	 * Add the specified item to the end of the specified bound list
-	 * and fire the appropriate event.
-	 * Return whether the list changed (i.e. 'true').
-	 * @see java.util.List#add(Object)
-	 */
-	public <E> boolean addItemToList(E item, List<E> list, String listName) {
-		if (list.add(item)) {
-			this.fireItemAdded(listName, list.size() - 1, item);
-			return true;
-		}
-		return false;  // List#add(Object) should always return 'true', so we should never get here...
-	}
-
-	/**
-	 * Add the specified items to the specified bound list at the specified index
-	 * and fire the appropriate event if necessary.
-	 * Return whether the list changed.
-	 * @see java.util.List#addAll(int, java.util.Collection)
-	 */
-	public <E> boolean addItemsToList(int index, E[] items, List<E> list, String listName) {
-		return (items.length != 0)
-				&& this.addItemsToList_(index, Arrays.asList(items), list, listName);
-	}
-
-	/**
-	 * Add the specified items to the specified bound list at the specified index
-	 * and fire the appropriate event if necessary.
-	 * Return whether the list changed.
-	 * @see java.util.List#addAll(int, java.util.Collection)
-	 */
-	public <E> boolean addItemsToList(int index, Collection<? extends E> items, List<E> list, String listName) {
-		return ( ! items.isEmpty())
-				&& this.addItemsToList_(index, this.convertToList(items), list, listName);
-	}
-
-	/**
-	 * no empty check
-	 */
-	protected <E> boolean addItemsToList_(int index, List<? extends E> items, List<E> list, String listName) {
-		if (list.addAll(index, items)) {
-			this.fireItemsAdded(listName, index, items);
-			return true;
-		}
-		return false;  //  'items' should not be empty, so we should never get here...
-	}
-
-	/**
-	 * Add the specified items to the specified bound list
-	 * and fire the appropriate event if necessary.
-	 * Return whether the list changed.
-	 * @see java.util.List#addAll(int, java.util.Collection)
-	 */
-	public <E> boolean addItemsToList(int index, Iterable<? extends E> items, List<E> list, String listName) {
-		return this.addItemsToList(index, items.iterator(), list, listName);
-	}
-
-	/**
-	 * Add the specified items to the specified bound list
-	 * and fire the appropriate event if necessary.
-	 * Return whether the list changed.
-	 * @see java.util.List#addAll(int, java.util.Collection)
-	 */
-	public <E> boolean addItemsToList(int index, Iterator<? extends E> items, List<E> list, String listName) {
-		if ( ! items.hasNext()) {
-			return false;
-		}
-
-		ArrayList<E> addedItems = CollectionTools.list(items);
-		if (list.addAll(index, addedItems)) {
-			this.fireItemsAdded(listName, index, addedItems);
-			return true;
-		}
-		return false;  //  'items' should not be empty, so we should never get here...
-	}
-
-	/**
-	 * Add the specified items to the end of to the specified bound list
-	 * and fire the appropriate event if necessary.
-	 * Return whether the list changed.
-	 * @see java.util.List#addAll(java.util.Collection)
-	 */
-	public <E> boolean addItemsToList(E[] items, List<E> list, String listName) {
-		return (items.length != 0)
-				&& this.addItemsToList_(Arrays.asList(items), list, listName);
-	}
-
-	/**
-	 * Add the specified items to the end of the specified bound list
-	 * and fire the appropriate event if necessary.
-	 * Return whether the list changed.
-	 * @see java.util.List#addAll(int, java.util.Collection)
-	 */
-	public <E> boolean addItemsToList(Collection<? extends E> items, List<E> list, String listName) {
-		return ( ! items.isEmpty())
-				&& this.addItemsToList_(this.convertToList(items), list, listName);
-	}
-
-	protected <E> List<? extends E> convertToList(Collection<? extends E> collection) {
-		return (collection instanceof List) ? (List<? extends E>) collection : new ArrayList<E>(collection);
-	}
-
-	/**
-	 * no empty check
-	 */
-	protected <E> boolean addItemsToList_(List<? extends E> items, List<E> list, String listName) {
-		int index = list.size();
-		if (list.addAll(items)) {
-			this.fireItemsAdded(listName, index, items);
-			return true;
-		}
-		return false;  //  'items' should not be empty, so we should never get here...
-	}
-
-	/**
-	 * Add the specified items to the end of to the specified bound list
-	 * and fire the appropriate event if necessary.
-	 * Return whether the list changed.
-	 * @see java.util.List#addAll(java.util.Collection)
-	 */
-	public <E> boolean addItemsToList(Iterable<? extends E> items, List<E> list, String listName) {
-		return this.addItemsToList(items.iterator(), list, listName);
-	}
-
-	/**
-	 * Add the specified items to the end of to the specified bound list
-	 * and fire the appropriate event if necessary.
-	 * Return whether the list changed.
-	 * @see java.util.List#addAll(java.util.Collection)
-	 */
-	public <E> boolean addItemsToList(Iterator<? extends E> items, List<E> list, String listName) {
-		if ( ! items.hasNext()) {
-			return false;
-		}
-		return this.addItemsToList_(items, list, listName);
-	}
-
-	/**
-	 * no empty check
-	 */
-	protected <E> boolean addItemsToList_(Iterator<? extends E> items, List<E> list, String listName) {
-		ArrayList<E> addedItems = CollectionTools.list(items);
-		int index = list.size();
-		if (list.addAll(addedItems)) {
-			this.fireItemsAdded(listName, index, addedItems);
-			return true;
-		}
-		return false;  //  'items' should not be empty, so we should never get here...
-	}
-
-	/**
-	 * Remove the specified item from the specified bound list
-	 * and fire the appropriate event if necessary.
-	 * Return the removed item.
-	 * @see java.util.List#remove(int)
-	 */
-	public <E> E removeItemFromList(int index, List<E> list, String listName) {
-		E item = list.remove(index);
-		this.fireItemRemoved(listName, index, item);
-		return item;
-	}
-
-	/**
-	 * Remove the specified item from the specified bound list
-	 * and fire the appropriate event if necessary.
-	 * Return whether the list changed.
-	 * @see java.util.List#remove(Object)
-	 */
-	public boolean removeItemFromList(Object item, List<?> list, String listName) {
-		int index = list.indexOf(item);
-		if (index == -1) {
-			return false;
-		}
-		list.remove(index);
-		this.fireItemRemoved(listName, index, item);
-		return true;
-	}
-
-	/**
-	 * Remove the specified items from the specified bound list
-	 * and fire the appropriate event if necessary.
-	 * Return the removed items.
-	 * @see java.util.List#remove(int)
-	 */
-	public <E> List<E> removeItemsFromList(int index, int length, List<E> list, String listName) {
-		if (length == 0) {
-			return Collections.emptyList();
-		}
-		return this.removeItemsFromList_(index, length, list, listName);
-	}
-
-	/**
-	 * no empty check
-	 */
-	protected <E> List<E> removeItemsFromList_(int index, int length, List<E> list, String listName) {
-		List<E> subList = list.subList(index, index + length);
-		List<E> removedItems = new ArrayList<E>(subList);
-		subList.clear();
-		this.fireItemsRemoved(listName, index, removedItems);
-		return removedItems;
-	}
-
-	/**
-	 * Remove the specified items from the specified bound list
-	 * and fire the appropriate event(s) if necessary.
-	 * Return whether the list changed.
-	 * @see java.util.List#removeAll(java.util.Collection)
-	 */
-	public boolean removeItemsFromList(Object[] items, List<?> list, String listName) {
-		return (items.length != 0)
-				&& ( ! list.isEmpty())
-				&& this.removeItemsFromList_(new ArrayIterator<Object>(items), list, listName);
-	}
-
-	/**
-	 * Remove the specified items from the specified bound list
-	 * and fire the appropriate event(s) if necessary.
-	 * Return whether the list changed.
-	 * @see java.util.List#removeAll(java.util.Collection)
-	 */
-	public boolean removeItemsFromList(Collection<?> items, List<?> list, String listName) {
-		return ( ! items.isEmpty())
-				&& ( ! list.isEmpty())
-				&& this.removeItemsFromList_(items.iterator(), list, listName);
-	}
-
-	/**
-	 * Remove the specified items from the specified bound list
-	 * and fire the appropriate event(s) if necessary.
-	 * Return whether the list changed.
-	 * @see java.util.List#removeAll(java.util.Collection)
-	 */
-	public boolean removeItemsFromList(Iterable<?> items, List<?> list, String listName) {
-		return this.removeItemsFromList(items.iterator(), list, listName);
-	}
-
-	/**
-	 * Remove the specified items from the specified bound list
-	 * and fire the appropriate event(s) if necessary.
-	 * Return whether the list changed.
-	 * @see java.util.List#removeAll(java.util.Collection)
-	 */
-	public boolean removeItemsFromList(Iterator<?> items, List<?> list, String listName) {
-		return (items.hasNext())
-				&& ( ! list.isEmpty())
-				&& this.removeItemsFromList_(items, list, listName);
-	}
-
-	/**
-	 * no empty checks
-	 */
-	protected boolean removeItemsFromList_(Iterator<?> items, List<?> list, String listName) {
-		boolean changed = false;
-		while (items.hasNext()) {
-			changed |= this.removeItemFromList(items.next(), list, listName);
-		}
-		return changed;
-	}
-
-	/**
-	 * Retain the specified items in the specified bound list
-	 * and fire the appropriate event(s) if necessary.
-	 * Return whether the list changed.
-	 * @see java.util.List#retainAll(java.util.Collection)
-	 */
-	public boolean retainItemsInList(Object[] items, List<?> list, String listName) {
-		if (list.isEmpty()) {
-			return false;
-		}
-		if (items.length == 0) {
-			return this.clearList_(list, listName);
-		}
-		return this.retainItemsInList_(new ArrayIterator<Object>(items), list, listName);
-	}
-
-	/**
-	 * Retain the specified items in the specified bound list
-	 * and fire the appropriate event(s) if necessary.
-	 * Return whether the list changed.
-	 * @see java.util.List#retainAll(java.util.Collection)
-	 */
-	public boolean retainItemsInList(Collection<?> items, List<?> list, String listName) {
-		if (list.isEmpty()) {
-			return false;
-		}
-		if (items.isEmpty()) {
-			return this.clearList_(list, listName);
-		}
-		return this.retainItemsInList_(items.iterator(), list, listName);
-	}
-
-	/**
-	 * Retain the specified items in the specified bound list
-	 * and fire the appropriate event(s) if necessary.
-	 * Return whether the list changed.
-	 * @see java.util.List#retainAll(java.util.Collection)
-	 */
-	public boolean retainItemsInList(Iterable<?> items, List<?> list, String listName) {
-		return this.retainItemsInList(items.iterator(), list, listName);
-	}
-
-	/**
-	 * Retain the specified items in the specified bound list
-	 * and fire the appropriate event(s) if necessary.
-	 * Return whether the list changed.
-	 * @see java.util.List#retainAll(java.util.Collection)
-	 */
-	public boolean retainItemsInList(Iterator<?> items, List<?> list, String listName) {
-		if (list.isEmpty()) {
-			return false;
-		}
-		if ( ! items.hasNext()) {
-			return this.clearList_(list, listName);
-		}
-		return this.retainItemsInList_(items, list, listName);
-	}
-
-	/**
-	 * no empty checks
-	 */
-	protected boolean retainItemsInList_(Iterator<?> items, List<?> list, String listName) {
-		HashBag<?> retainedItems = CollectionTools.collection(items);
-		HashBag<?> removedItems = CollectionTools.collection(list);
-		removedItems.removeAll(retainedItems);
-		return this.removeItemsFromList(removedItems, list, listName);
-	}
-
-	/**
-	 * Set the specified item in the specified bound list
-	 * and fire the appropriate event if necessary.
-	 * Return the replaced item.
-	 * @see java.util.List#set(int, Object)
-	 */
-	public <E> E setItemInList(int index, E item, List<E> list, String listName) {
-		E replacedItem = list.set(index, item);
-		if (this.valuesAreDifferent(item, replacedItem)) {
-			this.fireItemReplaced(listName, index, item, replacedItem);
-		}
-		return replacedItem;
-	}
-
-	/**
-	 * Replace the specified item in the specified bound list
-	 * and fire the appropriate event if necessary.
-	 * Return the index of the replaced item.
-	 * Return -1 if the item was not found in the list.
-	 * @see java.util.List#set(int, Object)
-	 */
-	public <E> int replaceItemInList(E oldItem, E newItem, List<E> list, String listName) {
-		if (list.isEmpty()) {
-			return -1;
-		}
-
-		int index = list.indexOf(oldItem);
-		if ((index != -1) && this.valuesAreDifferent(oldItem, newItem)) {
-			list.set(index, newItem);
-			this.fireItemReplaced(listName, index, newItem, oldItem);
-		}
-		return index;
-	}
-
-	/**
-	 * Set the specified items in the specified bound list
-	 * and fire the appropriate event if necessary.
-	 * Return the replaced items.
-	 * @see java.util.List#set(int, Object)
-	 */
-	public <E> List<E> setItemsInList(int index, E[] items, List<E> list, String listName) {
-		if (items.length == 0) {
-			return Collections.emptyList();
-		}
-		return this.setItemsInList_(index, Arrays.asList(items), list, listName);
-	}
-
-	/**
-	 * Set the specified items in the specified bound list
-	 * and fire the appropriate event if necessary.
-	 * Return the replaced items.
-	 * @see java.util.List#set(int, Object)
-	 */
-	public <E> List<E> setItemsInList(int index, List<? extends E> items, List<E> list, String listName) {
-		if (items.isEmpty()) {
-			return Collections.emptyList();
-		}
-		return this.setItemsInList_(index, items, list, listName);
-	}
-
-	/**
-	 * no empty check
-	 */
-	protected <E> List<E> setItemsInList_(int index, List<? extends E> items, List<E> list, String listName) {
-		List<E> subList = list.subList(index, index + items.size());
-		List<E> replacedItems = new ArrayList<E>(subList);
-		for (int i = 0; i < items.size(); i++) {
-			E newItem = items.get(i);
-			E oldItem = subList.set(i, newItem);
-			if (this.valuesAreDifferent(oldItem, newItem)) {
-				this.fireItemReplaced(listName, index + i, newItem, oldItem);
-			}
-		}
-		return replacedItems;
-	}
-
-	/**
-	 * Move items in the specified list from the specified source index to the
-	 * specified target index for the specified length.
-	 * Return whether the list changed.
-	 */
-	public <E> boolean moveItemsInList(int targetIndex, int sourceIndex, int length, List<E> list, String listName) {
-		if ((targetIndex == sourceIndex) || (length == 0)) {
-			return false;
-		}
-		// it's unlikely but possible the list is unchanged by the move... (e.g. any moves within ["foo", "foo", "foo"]...)
-		CollectionTools.move(list, targetIndex, sourceIndex, length);
-		this.fireItemsMoved(listName, targetIndex, sourceIndex, length);
-		return true;
-	}
-
-	/**
-	 * Move an item in the specified list from the specified source index to the
-	 * specified target index.
-	 * Return whether the list changed.
-	 */
-	public <E> boolean moveItemInList(int targetIndex, int sourceIndex, List<E> list, String listName) {
-		if (targetIndex == sourceIndex) {
-			return false;
-		}
-		// it's unlikely but possible the list is unchanged by the move... (e.g. any moves within ["foo", "foo", "foo"]...)
-		CollectionTools.move(list, targetIndex, sourceIndex);
-		this.fireItemMoved(listName, targetIndex, sourceIndex);
-		return true;
-	}
-
-	/**
-	 * Clear the entire list
-	 * and fire the appropriate event if necessary.
-	 * Return whether the list changed.
-	 * @see java.util.List#clear()
-	 */
-	public boolean clearList(List<?> list, String listName) {
-		if (list.isEmpty()) {
-			return false;
-		}
-		return this.clearList_(list, listName);
-	}
-
-	/**
-	 * no empty check
-	 */
-	protected boolean clearList_(List<?> list, String listName) {
-		list.clear();
-		this.fireListCleared(listName);
-		return true;
-	}
-
-	/**
-	 * Synchronize the list with the specified new list,
-	 * making a minimum number of sets, removes, and/or adds.
-	 * Return whether the list changed.
-	 */
-	public <E> boolean synchronizeList(List<E> newList, List<E> list, String listName) {
-		if (newList.isEmpty()) {
-			return this.clearList(list, listName);
-		}
-		if (list.isEmpty()) {
-			return this.addItemsToList_(newList, list, listName);
-		}
-		return this.synchronizeList_(newList, list, listName);
-	}
-
-	/**
-	 * Synchronize the list with the specified new list,
-	 * making a minimum number of sets, removes, and/or adds.
-	 * Return whether the list changed.
-	 */
-	public <E> boolean synchronizeList(Iterator<E> newList, List<E> list, String listName) {
-		if ( ! newList.hasNext()) {
-			return this.clearList(list, listName);
-		}
-		if (list.isEmpty()) {
-			return this.addItemsToList_(newList, list, listName);
-		}
-		return this.synchronizeList_(CollectionTools.list(newList), list, listName);
-	}
-
-	/**
-	 * no empty checks
-	 */
-	protected <E> boolean synchronizeList_(List<E> newList, List<E> oldList, String listName) {
-		int newSize = newList.size();
-		int oldSize = oldList.size();
-
-		boolean changed = false;
-		int min = Math.min(newSize, oldSize);
-		for (int i = 0; i < min; i++) {
-			E newItem = newList.get(i);
-			E oldItem = oldList.set(i, newItem);
-			if (this.valuesAreDifferent(oldItem, newItem)) {
-				changed = true;
-				this.fireItemReplaced(listName, i, newItem, oldItem);
-			}
-		}
-
-		if (newSize == oldSize) {
-			return changed;
-		}
-
-		if (newSize < oldSize) {
-			this.removeItemsFromList_(newSize, oldSize - newSize, oldList, listName);
-			return true;
-		}
-
-		// newSize > oldSize
-		this.addItemsToList_(newList.subList(oldSize, newSize), oldList, listName);
-		return true;
-	}
-
-
-	// ********** tree change support **********
-
-	protected static final Class<TreeChangeListener> TREE_CHANGE_LISTENER_CLASS = TreeChangeListener.class;
-	private static final Object[] EMPTY_TREE_PATH = new Object[0];
-
-	/**
-	 * Add a tree change listener that is registered for all trees.
-	 */
-	public void addTreeChangeListener(TreeChangeListener listener) {
-		this.addListener(TREE_CHANGE_LISTENER_CLASS, listener);
-	}
-
-	/**
-	 * Add a tree change listener for the specified tree. The listener
-	 * will be notified only for changes to the specified tree.
-	 */
-	public void addTreeChangeListener(String treeName, TreeChangeListener listener) {
-		this.addListener(treeName, TREE_CHANGE_LISTENER_CLASS, listener);
-	}
-
-	/**
-	 * Remove a tree change listener that was registered for all tree.
-	 */
-	public void removeTreeChangeListener(TreeChangeListener listener) {
-		this.removeListener(TREE_CHANGE_LISTENER_CLASS, listener);
-	}
-
-	/**
-	 * Remove a tree change listener that was registered for a specific tree.
-	 */
-	public void removeTreeChangeListener(String treeName, TreeChangeListener listener) {
-		this.removeListener(treeName, TREE_CHANGE_LISTENER_CLASS, listener);
-	}
-
-	/**
-	 * Return whether there are any tree change listeners that will
-	 * be notified when the specified tree has changed.
-	 */
-	public boolean hasAnyTreeChangeListeners(String treeName) {
-		return this.hasAnyListeners(TREE_CHANGE_LISTENER_CLASS, treeName);
-	}
-
-	/**
-	 * Return whether there are any tree change listeners that will
-	 * be notified when any tree has changed.
-	 */
-	public boolean hasAnyTreeChangeListeners() {
-		return this.hasAnyListeners(TREE_CHANGE_LISTENER_CLASS);
-	}
-
-	private TreeChangeListener[] getTreeChangeListeners() {
-		return (TreeChangeListener[]) this.getListeners(TREE_CHANGE_LISTENER_CLASS);
-	}
-
-	/**
-	 * Report a bound tree update to any registered listeners.
-	 */
-	public void fireNodeAdded(TreeChangeEvent event) {
-		String treeName = event.getTreeName();
-
-		TreeChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			TreeChangeListener[] treeChangeListeners = this.getTreeChangeListeners();
-			if (treeChangeListeners != null) {
-				targets = treeChangeListeners.clone();
-			}
-			child = this.getChild(treeName);
-		}
-
-		if (targets != null) {
-			for (TreeChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getTreeChangeListeners(), target);
-				}
-				if (stillListening) {
-					target.nodeAdded(event);
-				}
-			}
-		}
-		if (child != null) {
-			child.fireNodeAdded(event);
-		}
-
-		this.sourceChanged(treeName);
-	}
-
-	/**
-	 * Report a bound tree update to any registered listeners.
-	 */
-	public void fireNodeAdded(String treeName, Object[] path) {
-//		this.fireNodeAdded(new TreeChangeEvent(this.source, treeName, path));
-
-		TreeChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			TreeChangeListener[] treeChangeListeners = this.getTreeChangeListeners();
-			if (treeChangeListeners != null) {
-				targets = treeChangeListeners.clone();
-			}
-			child = this.getChild(treeName);
-		}
-
-		TreeChangeEvent event = null;
-
-		if (targets != null) {
-			for (TreeChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getTreeChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new TreeChangeEvent(this.source, treeName, path);
-					}
-					target.nodeAdded(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireNodeAdded(treeName, path);
-			} else {
-				child.fireNodeAdded(event);
-			}
-		}
-
-		this.sourceChanged(treeName);
-	}
-
-	/**
-	 * Report a bound tree update to any registered listeners.
-	 */
-	public void fireNodeRemoved(TreeChangeEvent event) {
-		String treeName = event.getTreeName();
-
-		TreeChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			TreeChangeListener[] treeChangeListeners = this.getTreeChangeListeners();
-			if (treeChangeListeners != null) {
-				targets = treeChangeListeners.clone();
-			}
-			child = this.getChild(treeName);
-		}
-
-		if (targets != null) {
-			for (TreeChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getTreeChangeListeners(), target);
-				}
-				if (stillListening) {
-					target.nodeRemoved(event);
-				}
-			}
-		}
-		if (child != null) {
-			child.fireNodeRemoved(event);
-		}
-
-		this.sourceChanged(treeName);
-	}
-
-	/**
-	 * Report a bound tree update to any registered listeners.
-	 */
-	public void fireNodeRemoved(String treeName, Object[] path) {
-//		this.fireNodeRemoved(new TreeChangeEvent(this.source, treeName, path));
-
-		TreeChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			TreeChangeListener[] treeChangeListeners = this.getTreeChangeListeners();
-			if (treeChangeListeners != null) {
-				targets = treeChangeListeners.clone();
-			}
-			child = this.getChild(treeName);
-		}
-
-		TreeChangeEvent event = null;
-
-		if (targets != null) {
-			for (TreeChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getTreeChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new TreeChangeEvent(this.source, treeName, path);
-					}
-					target.nodeRemoved(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireNodeRemoved(treeName, path);
-			} else {
-				child.fireNodeRemoved(event);
-			}
-		}
-
-		this.sourceChanged(treeName);
-	}
-
-	/**
-	 * Report a bound tree update to any registered listeners.
-	 */
-	public void fireTreeCleared(TreeChangeEvent event) {
-		String treeName = event.getTreeName();
-
-		TreeChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			TreeChangeListener[] treeChangeListeners = this.getTreeChangeListeners();
-			if (treeChangeListeners != null) {
-				targets = treeChangeListeners.clone();
-			}
-			child = this.getChild(treeName);
-		}
-
-		if (targets != null) {
-			for (TreeChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getTreeChangeListeners(), target);
-				}
-				if (stillListening) {
-					target.treeCleared(event);
-				}
-			}
-		}
-		if (child != null) {
-			child.fireTreeCleared(event);
-		}
-
-		this.sourceChanged(treeName);
-	}
-
-	/**
-	 * Report a bound tree update to any registered listeners.
-	 */
-	public void fireTreeCleared(String treeName, Object[] path) {
-//		this.fireTreeCleared(new TreeChangeEvent(this.source, treeName, path));
-
-		TreeChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			TreeChangeListener[] treeChangeListeners = this.getTreeChangeListeners();
-			if (treeChangeListeners != null) {
-				targets = treeChangeListeners.clone();
-			}
-			child = this.getChild(treeName);
-		}
-
-		TreeChangeEvent event = null;
-
-		if (targets != null) {
-			for (TreeChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getTreeChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new TreeChangeEvent(this.source, treeName, path);
-					}
-					target.treeCleared(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireTreeCleared(treeName, path);
-			} else {
-				child.fireTreeCleared(event);
-			}
-		}
-
-		this.sourceChanged(treeName);
-	}
-
-	/**
-	 * Report a bound tree update to any registered listeners.
-	 */
-	public void fireTreeCleared(String treeName) {
-		this.fireTreeCleared(treeName, EMPTY_TREE_PATH);
-	}
-
-	/**
-	 * Report a bound tree update to any registered listeners.
-	 */
-	public void fireTreeChanged(TreeChangeEvent event) {
-		String treeName = event.getTreeName();
-
-		TreeChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			TreeChangeListener[] treeChangeListeners = this.getTreeChangeListeners();
-			if (treeChangeListeners != null) {
-				targets = treeChangeListeners.clone();
-			}
-			child = this.getChild(treeName);
-		}
-
-		if (targets != null) {
-			for (TreeChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getTreeChangeListeners(), target);
-				}
-				if (stillListening) {
-					target.treeChanged(event);
-				}
-			}
-		}
-		if (child != null) {
-			child.fireTreeChanged(event);
-		}
-
-		this.sourceChanged(treeName);
-	}
-
-	/**
-	 * Report a bound tree update to any registered listeners.
-	 */
-	public void fireTreeChanged(String treeName, Object[] path) {
-//		this.fireTreeChanged(new TreeChangeEvent(this.source, treeName, path));
-
-		TreeChangeListener[] targets = null;
-		ChangeSupport child = null;
-
-		synchronized (this) {
-			TreeChangeListener[] treeChangeListeners = this.getTreeChangeListeners();
-			if (treeChangeListeners != null) {
-				targets = treeChangeListeners.clone();
-			}
-			child = this.getChild(treeName);
-		}
-
-		TreeChangeEvent event = null;
-
-		if (targets != null) {
-			for (TreeChangeListener target : targets) {
-				boolean stillListening;
-				synchronized (this) {
-					stillListening = CollectionTools.contains(this.getTreeChangeListeners(), target);
-				}
-				if (stillListening) {
-					if (event == null) {
-						// here's the reason for the duplicate code...
-						event = new TreeChangeEvent(this.source, treeName, path);
-					}
-					target.treeChanged(event);
-				}
-			}
-		}
-		if (child != null) {
-			if (event == null) {
-				child.fireTreeChanged(treeName, path);
-			} else {
-				child.fireTreeChanged(event);
-			}
-		}
-
-		this.sourceChanged(treeName);
-	}
-
-	/**
-	 * Report a bound tree update to any registered listeners.
-	 */
-	public void fireTreeChanged(String treeName) {
-		this.fireTreeChanged(treeName, EMPTY_TREE_PATH);
-	}
-
-
-	// ********** convenience methods **********
-
-	/**
-	 * Return whether the values are equal, with the appropriate null checks.
-	 * Convenience method for checking whether an attribute value has changed.
-	 */
-	public boolean valuesAreEqual(Object value1, Object value2) {
-		if ((value1 == null) && (value2 == null)) {
-			return true;	// both are null
-		}
-		if ((value1 == null) || (value2 == null)) {
-			return false;	// one is null but the other is not
-		}
-		return value1.equals(value2);
-	}
-
-	/**
-	 * Return whether the values are different, with the appropriate null checks.
-	 * Convenience method for checking whether an attribute value has changed.
-	 */
-	public boolean valuesAreDifferent(Object value1, Object value2) {
-		return ! this.valuesAreEqual(value1, value2);
-	}
-
-
-	// ********** standard methods **********
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.source);
-	}
-
-
-	// ********** serialization **********
-
-	private synchronized void writeObject(ObjectOutputStream s) throws IOException {
-		// write out the source, children, and any hidden stuff
-		s.defaultWriteObject();
-
-		// only write out Serializable listeners
-		int len = this.genericListeners.length;
-		for (int i = 0; i < len; i++) {
-			this.writeObject(s, this.genericListeners[i]);
-		}
-		s.writeObject(null);
-    }
-
-	private void writeObject(ObjectOutputStream s, GenericListenerList gll) throws IOException {
-		boolean first = true;
-		int len = gll.listeners.length;
-		for (int i = 0; i < len; i++) {
-			ChangeListener listener = gll.listeners[i];
-			if (listener instanceof Serializable) {
-				if (first) {
-					first = false;
-					s.writeObject(gll.listenerClass);
-				}
-				s.writeObject(listener);
-			}
-		}
-		if ( ! first) {
-			s.writeObject(null);
-		}
-	}
-
-	private synchronized void readObject(ObjectInputStream s) throws ClassNotFoundException, IOException {
-		// read in the source, children, and any hidden stuff
-		s.defaultReadObject();
-
-		// read in generic listener lists
-		this.genericListeners = EMPTY_GENERIC_LISTENERS;
-		Object o;
-		while (null != (o = s.readObject())) {
-			@SuppressWarnings("unchecked")
-			Class<? extends ChangeListener> listenerClass = (Class<? extends ChangeListener>) o;
-			GenericListenerList gll = null;
-			while (null != (o = s.readObject())) {
-				if (gll == null) {
-					gll = this.addGenericListenerList_(listenerClass, (ChangeListener) o);
-				} else {
-					gll.addListener((ChangeListener) o);
-				}
-			}
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	private <T extends ChangeListener> GenericListenerList addGenericListenerList_(Class<T> listenerClass, ChangeListener listener) {
-		return this.addGenericListenerList(listenerClass, (T) listener);
-	}
-
-
-	// ********** member classes **********
-
-	/**
-	 * Pair a listener class with its "generic" listeners.
-	 */
-	private static class GenericListenerList {
-		final Class<? extends ChangeListener> listenerClass;
-		ChangeListener[] listeners;
-
-		<T extends ChangeListener> GenericListenerList(Class<T> listenerClass, T listener) {
-			super();
-			this.listenerClass = listenerClass;
-			this.listeners = (ChangeListener[]) Array.newInstance(listenerClass, 1);
-			this.listeners[0] = listener;
-		}
-
-		void addListener(ChangeListener listener) {
-			this.listeners = CollectionTools.add(this.listeners, listener);
-		}
-
-		boolean removeListener(ChangeListener listener) {
-			int len = this.listeners.length;
-			if (len == 0) {
-				return false;
-			}
-			try {
-				this.listeners = CollectionTools.remove(this.listeners, listener);
-			} catch (ArrayIndexOutOfBoundsException ex) {
-				return false;  // listener not in the list
-			}
-			return (this.listeners.length + 1) == len;
-		}
-
-		boolean hasListeners() {
-			return this.listeners.length > 0;
-		}
-
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this, ClassTools.shortNameFor(this.listenerClass));
-		}
-
-	}
-
-
-	/**
-	 * Pair an aspect name with the change support holding its associated
-	 * listeners.
-	 */
-	private static class AspectChild implements Serializable {
-		final String aspectName;
-		final ChangeSupport child;
-		private static final long serialVersionUID = 1L;
-
-		AspectChild(String aspectName, ChangeSupport child) {
-			super();
-			this.aspectName = aspectName;
-			this.child = child;
-		}
-
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this, this.aspectName);
-		}
-
-	}
-
-
-	/**
-	 * The aspect-specific change support class does not need to
-	 * build "grandchildren" change support objects.
-	 */
-	protected static class Child extends ChangeSupport {
-		private static final long serialVersionUID = 1L;
-
-		public Child(Model source) {
-			super(source);
-		}
-
-		@Override
-		protected ChangeSupport buildChildChangeSupport() {
-			// there should be no grandchildren
-			throw new UnsupportedOperationException();
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/SingleAspectChangeSupport.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/SingleAspectChangeSupport.java
deleted file mode 100644
index 1b42950515..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/SingleAspectChangeSupport.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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.utility.internal.model;
-
-import java.util.Collection;
-import java.util.List;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.event.StateChangeEvent;
-import org.eclipse.jpt.utility.model.event.TreeChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ChangeListener;
-
-/**
- * This change support class changes the behavior of the standard
- * ChangeSupport in several ways:
- * 	- All events fired by the source must specify the single aspect.
- * 	- Listeners are required to be either "generic" listeners or
- * 	    listeners of the single aspect.
- */
-public class SingleAspectChangeSupport
-	extends ChangeSupport
-{
-	protected final Class<? extends ChangeListener> listenerClass;
-	protected final String aspectName;
-
-	private static final long serialVersionUID = 1L;
-
-
-	// ********** constructor **********
-
-	public SingleAspectChangeSupport(Model source, Class<? extends ChangeListener> listenerClass, String aspectName) {
-		super(source);
-		this.listenerClass = listenerClass;
-		this.aspectName = aspectName;
-	}
-
-
-	// ********** internal behavior **********
-
-	private UnsupportedOperationException unsupportedOperationException() {
-		return new UnsupportedOperationException(
-				"This Model supports only changes for the listener type \"" + this.listenerClass.getName() //$NON-NLS-1$
-				+ "\" and the aspect \"" + this.aspectName + '"' //$NON-NLS-1$
-			);
-	}
-
-	private void check(Class<? extends ChangeListener> lClass, String aName) {
-		if (lClass != this.listenerClass) {
-			throw new IllegalArgumentException(
-					"This Model supports only changes for the listener type \"" + this.listenerClass.getName() //$NON-NLS-1$
-					+ "\" : \"" + lClass.getName() + '"' //$NON-NLS-1$
-				);
-		}
-		if (aName != this.aspectName) {
-			throw new IllegalArgumentException(
-					"This Model supports only changes for the aspect \"" + this.aspectName //$NON-NLS-1$
-					+ "\" : \"" + aName + '"' //$NON-NLS-1$
-				);
-		}
-	}
-
-	@Override
-	protected <T extends ChangeListener> void addListener(String aName, Class<T> lClass, T listener) {
-		this.check(lClass, aName);
-		super.addListener(aName, lClass, listener);
-	}
-
-	@Override
-	protected <T extends ChangeListener> void removeListener(String aName, Class<T> lClass, T listener) {
-		this.check(lClass, aName);
-		super.removeListener(aName, lClass, listener);
-	}
-
-
-	// ********** internal queries **********
-
-	@Override
-	protected boolean hasAnyListeners(Class<? extends ChangeListener> lClass, String aName) {
-		this.check(lClass, aName);
-		return super.hasAnyListeners(lClass, aName);
-	}
-
-
-	// ********** state change support **********
-
-	@Override
-	public void fireStateChanged(StateChangeEvent event) {
-		throw this.unsupportedOperationException();
-	}
-
-	@Override
-	public void fireStateChanged() {
-		throw this.unsupportedOperationException();
-	}
-
-
-	// ********** property change support **********
-
-	@Override
-	public void firePropertyChanged(PropertyChangeEvent event) {
-		this.check(PROPERTY_CHANGE_LISTENER_CLASS, event.getPropertyName());
-		super.firePropertyChanged(event);
-	}
-
-	@Override
-	public void firePropertyChanged(String propertyName, Object oldValue, Object newValue) {
-		this.check(PROPERTY_CHANGE_LISTENER_CLASS, propertyName);
-		super.firePropertyChanged(propertyName, oldValue, newValue);
-	}
-
-	@Override
-	public void firePropertyChanged(String propertyName, int oldValue, int newValue) {
-		this.check(PROPERTY_CHANGE_LISTENER_CLASS, propertyName);
-		super.firePropertyChanged(propertyName, oldValue, newValue);
-	}
-
-	@Override
-	public void firePropertyChanged(String propertyName, boolean oldValue, boolean newValue) {
-		this.check(PROPERTY_CHANGE_LISTENER_CLASS, propertyName);
-		super.firePropertyChanged(propertyName, oldValue, newValue);
-	}
-
-
-	// ********** collection change support **********
-
-	@Override
-	public void fireItemsAdded(CollectionChangeEvent event) {
-		this.check(COLLECTION_CHANGE_LISTENER_CLASS, event.getCollectionName());
-		super.fireItemsAdded(event);
-	}
-
-	@Override
-	public void fireItemsAdded(String collectionName, Collection<?> addedItems) {
-		this.check(COLLECTION_CHANGE_LISTENER_CLASS, collectionName);
-		super.fireItemsAdded(collectionName, addedItems);
-	}
-
-	@Override
-	public void fireItemAdded(String collectionName, Object addedItem) {
-		this.check(COLLECTION_CHANGE_LISTENER_CLASS, collectionName);
-		super.fireItemAdded(collectionName, addedItem);
-	}
-
-	@Override
-	public void fireItemsRemoved(CollectionChangeEvent event) {
-		this.check(COLLECTION_CHANGE_LISTENER_CLASS, event.getCollectionName());
-		super.fireItemsRemoved(event);
-	}
-
-	@Override
-	public void fireItemsRemoved(String collectionName, Collection<?> removedItems) {
-		this.check(COLLECTION_CHANGE_LISTENER_CLASS, collectionName);
-		super.fireItemsRemoved(collectionName, removedItems);
-	}
-
-	@Override
-	public void fireItemRemoved(String collectionName, Object removedItem) {
-		this.check(COLLECTION_CHANGE_LISTENER_CLASS, collectionName);
-		super.fireItemRemoved(collectionName, removedItem);
-	}
-
-	@Override
-	public void fireCollectionCleared(CollectionChangeEvent event) {
-		this.check(COLLECTION_CHANGE_LISTENER_CLASS, event.getCollectionName());
-		super.fireCollectionCleared(event);
-	}
-
-	@Override
-	public void fireCollectionCleared(String collectionName) {
-		this.check(COLLECTION_CHANGE_LISTENER_CLASS, collectionName);
-		super.fireCollectionCleared(collectionName);
-	}
-
-	@Override
-	public void fireCollectionChanged(CollectionChangeEvent event) {
-		this.check(COLLECTION_CHANGE_LISTENER_CLASS, event.getCollectionName());
-		super.fireCollectionChanged(event);
-	}
-
-	@Override
-	public void fireCollectionChanged(String collectionName) {
-		this.check(COLLECTION_CHANGE_LISTENER_CLASS, collectionName);
-		super.fireCollectionChanged(collectionName);
-	}
-
-
-	// ********** list change support **********
-
-	@Override
-	public void fireItemsAdded(ListChangeEvent event) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, event.getListName());
-		super.fireItemsAdded(event);
-	}
-
-	@Override
-	public void fireItemsAdded(String listName, int index, List<?> addedItems) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, listName);
-		super.fireItemsAdded(listName, index, addedItems);
-	}
-
-	@Override
-	public void fireItemAdded(String listName, int index, Object addedItem) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, listName);
-		super.fireItemAdded(listName, index, addedItem);
-	}
-
-	@Override
-	public void fireItemsRemoved(ListChangeEvent event) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, event.getListName());
-		super.fireItemsRemoved(event);
-	}
-
-	@Override
-	public void fireItemsRemoved(String listName, int index, List<?> removedItems) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, listName);
-		super.fireItemsRemoved(listName, index, removedItems);
-	}
-
-	@Override
-	public void fireItemRemoved(String listName, int index, Object removedItem) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, listName);
-		super.fireItemRemoved(listName, index, removedItem);
-	}
-
-	@Override
-	public void fireItemsReplaced(ListChangeEvent event) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, event.getListName());
-		super.fireItemsReplaced(event);
-	}
-
-	@Override
-	public void fireItemsReplaced(String listName, int index, List<?> newItems, List<?> replacedItems) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, listName);
-		super.fireItemsReplaced(listName, index, newItems, replacedItems);
-	}
-
-	@Override
-	public void fireItemReplaced(String listName, int index, Object newItem, Object replacedItem) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, listName);
-		super.fireItemReplaced(listName, index, newItem, replacedItem);
-	}
-
-	@Override
-	public void fireItemsMoved(ListChangeEvent event) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, event.getListName());
-		super.fireItemsMoved(event);
-	}
-
-	@Override
-	public void fireItemsMoved(String listName, int targetIndex, int sourceIndex, int length) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, listName);
-		super.fireItemsMoved(listName, targetIndex, sourceIndex, length);
-	}
-
-	@Override
-	public void fireListCleared(ListChangeEvent event) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, event.getListName());
-		super.fireListCleared(event);
-	}
-
-	@Override
-	public void fireListCleared(String listName) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, listName);
-		super.fireListCleared(listName);
-	}
-
-	@Override
-	public void fireListChanged(ListChangeEvent event) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, event.getListName());
-		super.fireListChanged(event);
-	}
-
-	@Override
-	public void fireListChanged(String listName) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, listName);
-		super.fireListChanged(listName);
-	}
-
-
-	// ********** tree change support **********
-
-	@Override
-	public void fireNodeAdded(TreeChangeEvent event) {
-		this.check(TREE_CHANGE_LISTENER_CLASS, event.getTreeName());
-		super.fireNodeAdded(event);
-	}
-
-	@Override
-	public void fireNodeAdded(String treeName, Object[] path) {
-		this.check(TREE_CHANGE_LISTENER_CLASS, treeName);
-		super.fireNodeAdded(treeName, path);
-	}
-
-	@Override
-	public void fireNodeRemoved(TreeChangeEvent event) {
-		this.check(TREE_CHANGE_LISTENER_CLASS, event.getTreeName());
-		super.fireNodeRemoved(event);
-	}
-
-	@Override
-	public void fireNodeRemoved(String treeName, Object[] path) {
-		this.check(TREE_CHANGE_LISTENER_CLASS, treeName);
-		super.fireNodeRemoved(treeName, path);
-	}
-
-	@Override
-	public void fireTreeCleared(TreeChangeEvent event) {
-		this.check(TREE_CHANGE_LISTENER_CLASS, event.getTreeName());
-		super.fireTreeCleared(event);
-	}
-
-	@Override
-	public void fireTreeCleared(String treeName, Object[] path) {
-		this.check(TREE_CHANGE_LISTENER_CLASS, treeName);
-		super.fireTreeCleared(treeName, path);
-	}
-
-	@Override
-	public void fireTreeChanged(TreeChangeEvent event) {
-		this.check(TREE_CHANGE_LISTENER_CLASS, event.getTreeName());
-		super.fireTreeChanged(event);
-	}
-
-	@Override
-	public void fireTreeChanged(String treeName, Object[] path) {
-		this.check(TREE_CHANGE_LISTENER_CLASS, treeName);
-		super.fireTreeChanged(treeName, path);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/listener/awt/AWTCollectionChangeListenerWrapper.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/listener/awt/AWTCollectionChangeListenerWrapper.java
deleted file mode 100644
index 4cab405723..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/listener/awt/AWTCollectionChangeListenerWrapper.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.listener.awt;
-
-import java.awt.EventQueue;
-import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
-import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
-
-/**
- * Wrap another collection change listener and forward events to it on the AWT
- * event queue.
- */
-public class AWTCollectionChangeListenerWrapper
-	implements CollectionChangeListener
-{
-	private final CollectionChangeListener listener;
-
-	public AWTCollectionChangeListenerWrapper(CollectionChangeListener listener) {
-		super();
-		if (listener == null) {
-			throw new NullPointerException();
-		}
-		this.listener = listener;
-	}
-
-	public void itemsAdded(CollectionChangeEvent event) {
-		if (EventQueue.isDispatchThread()) {
-			this.itemsAdded_(event);
-		} else {
-			this.executeOnEventQueue(this.buildItemsAddedRunnable(event));
-		}
-	}
-
-	public void itemsRemoved(CollectionChangeEvent event) {
-		if (EventQueue.isDispatchThread()) {
-			this.itemsRemoved_(event);
-		} else {
-			this.executeOnEventQueue(this.buildItemsRemovedRunnable(event));
-		}
-	}
-
-	public void collectionCleared(CollectionChangeEvent event) {
-		if (EventQueue.isDispatchThread()) {
-			this.collectionCleared_(event);
-		} else {
-			this.executeOnEventQueue(this.buildCollectionClearedRunnable(event));
-		}
-	}
-
-	public void collectionChanged(CollectionChangeEvent event) {
-		if (EventQueue.isDispatchThread()) {
-			this.collectionChanged_(event);
-		} else {
-			this.executeOnEventQueue(this.buildCollectionChangedRunnable(event));
-		}
-	}
-
-	private Runnable buildItemsAddedRunnable(final CollectionChangeEvent event) {
-		return new Runnable() {
-			public void run() {
-				AWTCollectionChangeListenerWrapper.this.itemsAdded_(event);
-			}
-			@Override
-			public String toString() {
-				return "items added";
-			}
-		};
-	}
-
-	private Runnable buildItemsRemovedRunnable(final CollectionChangeEvent event) {
-		return new Runnable() {
-			public void run() {
-				AWTCollectionChangeListenerWrapper.this.itemsRemoved_(event);
-			}
-			@Override
-			public String toString() {
-				return "items removed";
-			}
-		};
-	}
-
-	private Runnable buildCollectionClearedRunnable(final CollectionChangeEvent event) {
-		return new Runnable() {
-			public void run() {
-				AWTCollectionChangeListenerWrapper.this.collectionCleared_(event);
-			}
-			@Override
-			public String toString() {
-				return "collection cleared";
-			}
-		};
-	}
-
-	private Runnable buildCollectionChangedRunnable(final CollectionChangeEvent event) {
-		return new Runnable() {
-			public void run() {
-				AWTCollectionChangeListenerWrapper.this.collectionChanged_(event);
-			}
-			@Override
-			public String toString() {
-				return "collection changed";
-			}
-		};
-	}
-
-	/**
-	 * EventQueue#invokeLater(Runnable) seems to work OK;
-	 * but using #invokeAndWait(Runnable) can sometimes make things
-	 * more predictable when debugging, at the risk of deadlocks.
-	 */
-	private void executeOnEventQueue(Runnable r) {
-		EventQueue.invokeLater(r);
-//		try {
-//			EventQueue.invokeAndWait(r);
-//		} catch (InterruptedException ex) {
-//			throw new RuntimeException(ex);
-//		} catch (java.lang.reflect.InvocationTargetException ex) {
-//			throw new RuntimeException(ex);
-//		}
-	}
-
-	void itemsAdded_(CollectionChangeEvent event) {
-		this.listener.itemsAdded(event);
-	}
-
-	void itemsRemoved_(CollectionChangeEvent event) {
-		this.listener.itemsRemoved(event);
-	}
-
-	void collectionCleared_(CollectionChangeEvent event) {
-		this.listener.collectionCleared(event);
-	}
-
-	void collectionChanged_(CollectionChangeEvent event) {
-		this.listener.collectionChanged(event);
-	}
-
-	@Override
-	public String toString() {
-		return "AWT(" + this.listener.toString() + ")";
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/listener/awt/AWTListChangeListenerWrapper.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/listener/awt/AWTListChangeListenerWrapper.java
deleted file mode 100644
index 7bed089ac8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/listener/awt/AWTListChangeListenerWrapper.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.listener.awt;
-
-import java.awt.EventQueue;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-
-/**
- * Wrap another list change listener and forward events to it on the AWT
- * event queue.
- */
-public class AWTListChangeListenerWrapper
-	implements ListChangeListener
-{
-	private final ListChangeListener listener;
-
-	public AWTListChangeListenerWrapper(ListChangeListener listener) {
-		super();
-		if (listener == null) {
-			throw new NullPointerException();
-		}
-		this.listener = listener;
-	}
-
-	public void itemsAdded(ListChangeEvent event) {
-		if (EventQueue.isDispatchThread()) {
-			this.itemsAdded_(event);
-		} else {
-			this.executeOnEventQueue(this.buildItemsAddedRunnable(event));
-		}
-	}
-
-	public void itemsRemoved(ListChangeEvent event) {
-		if (EventQueue.isDispatchThread()) {
-			this.itemsRemoved_(event);
-		} else {
-			this.executeOnEventQueue(this.buildItemsRemovedRunnable(event));
-		}
-	}
-
-	public void itemsMoved(ListChangeEvent event) {
-		if (EventQueue.isDispatchThread()) {
-			this.itemsMoved_(event);
-		} else {
-			this.executeOnEventQueue(this.buildItemsMovedRunnable(event));
-		}
-	}
-
-	public void itemsReplaced(ListChangeEvent event) {
-		if (EventQueue.isDispatchThread()) {
-			this.itemsReplaced_(event);
-		} else {
-			this.executeOnEventQueue(this.buildItemsReplacedRunnable(event));
-		}
-	}
-
-	public void listCleared(ListChangeEvent event) {
-		if (EventQueue.isDispatchThread()) {
-			this.listCleared_(event);
-		} else {
-			this.executeOnEventQueue(this.buildListClearedRunnable(event));
-		}
-	}
-
-	public void listChanged(ListChangeEvent event) {
-		if (EventQueue.isDispatchThread()) {
-			this.listChanged_(event);
-		} else {
-			this.executeOnEventQueue(this.buildListChangedRunnable(event));
-		}
-	}
-
-	private Runnable buildItemsAddedRunnable(final ListChangeEvent event) {
-		return new Runnable() {
-			public void run() {
-				AWTListChangeListenerWrapper.this.itemsAdded_(event);
-			}
-			@Override
-			public String toString() {
-				return "items added";
-			}
-		};
-	}
-
-	private Runnable buildItemsRemovedRunnable(final ListChangeEvent event) {
-		return new Runnable() {
-			public void run() {
-				AWTListChangeListenerWrapper.this.itemsRemoved_(event);
-			}
-			@Override
-			public String toString() {
-				return "items removed";
-			}
-		};
-	}
-
-	private Runnable buildItemsMovedRunnable(final ListChangeEvent event) {
-		return new Runnable() {
-			public void run() {
-				AWTListChangeListenerWrapper.this.itemsMoved_(event);
-			}
-			@Override
-			public String toString() {
-				return "items moved";
-			}
-		};
-	}
-
-	private Runnable buildItemsReplacedRunnable(final ListChangeEvent event) {
-		return new Runnable() {
-			public void run() {
-				AWTListChangeListenerWrapper.this.itemsReplaced_(event);
-			}
-			@Override
-			public String toString() {
-				return "items replaced";
-			}
-		};
-	}
-
-	private Runnable buildListClearedRunnable(final ListChangeEvent event) {
-		return new Runnable() {
-			public void run() {
-				AWTListChangeListenerWrapper.this.listCleared_(event);
-			}
-			@Override
-			public String toString() {
-				return "list cleared";
-			}
-		};
-	}
-
-	private Runnable buildListChangedRunnable(final ListChangeEvent event) {
-		return new Runnable() {
-			public void run() {
-				AWTListChangeListenerWrapper.this.listChanged_(event);
-			}
-			@Override
-			public String toString() {
-				return "list changed";
-			}
-		};
-	}
-
-	/**
-	 * EventQueue#invokeLater(Runnable) seems to work OK;
-	 * but using #invokeAndWait(Runnable) can sometimes make things
-	 * more predictable when debugging, at the risk of deadlocks.
-	 */
-	private void executeOnEventQueue(Runnable r) {
-		EventQueue.invokeLater(r);
-//		try {
-//			EventQueue.invokeAndWait(r);
-//		} catch (InterruptedException ex) {
-//			throw new RuntimeException(ex);
-//		} catch (java.lang.reflect.InvocationTargetException ex) {
-//			throw new RuntimeException(ex);
-//		}
-	}
-
-	void itemsAdded_(ListChangeEvent event) {
-		this.listener.itemsAdded(event);
-	}
-
-	void itemsRemoved_(ListChangeEvent event) {
-		this.listener.itemsRemoved(event);
-	}
-
-	void itemsMoved_(ListChangeEvent event) {
-		this.listener.itemsMoved(event);
-	}
-
-	void itemsReplaced_(ListChangeEvent event) {
-		this.listener.itemsReplaced(event);
-	}
-
-	void listCleared_(ListChangeEvent event) {
-		this.listener.listCleared(event);
-	}
-
-	void listChanged_(ListChangeEvent event) {
-		this.listener.listChanged(event);
-	}
-
-	@Override
-	public String toString() {
-		return "AWT(" + this.listener.toString() + ")";
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/listener/awt/AWTPropertyChangeListenerWrapper.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/listener/awt/AWTPropertyChangeListenerWrapper.java
deleted file mode 100644
index bcc372ac02..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/listener/awt/AWTPropertyChangeListenerWrapper.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.listener.awt;
-
-import java.awt.EventQueue;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-
-/**
- * Wrap another property change listener and forward events to it on the AWT
- * event queue.
- */
-public class AWTPropertyChangeListenerWrapper
-	implements PropertyChangeListener
-{
-	private final PropertyChangeListener listener;
-
-
-	public AWTPropertyChangeListenerWrapper(PropertyChangeListener listener) {
-		super();
-		if (listener == null) {
-			throw new NullPointerException();
-		}
-		this.listener = listener;
-	}
-
-	public void propertyChanged(PropertyChangeEvent event) {
-		if (EventQueue.isDispatchThread()) {
-			this.propertyChanged_(event);
-		} else {
-			this.executeOnEventQueue(this.buildRunnable(event));
-		}
-	}
-
-	private Runnable buildRunnable(final PropertyChangeEvent event) {
-		return new Runnable() {
-			public void run() {
-				AWTPropertyChangeListenerWrapper.this.propertyChanged_(event);
-			}
-		};
-	}
-
-	/**
-	 * EventQueue#invokeLater(Runnable) seems to work OK;
-	 * but using #invokeAndWait(Runnable) can sometimes make things
-	 * more predictable when debugging, at the risk of deadlocks.
-	 */
-	private void executeOnEventQueue(Runnable r) {
-		EventQueue.invokeLater(r);
-//		try {
-//			EventQueue.invokeAndWait(r);
-//		} catch (InterruptedException ex) {
-//			throw new RuntimeException(ex);
-//		} catch (java.lang.reflect.InvocationTargetException ex) {
-//			throw new RuntimeException(ex);
-//		}
-	}
-
-	void propertyChanged_(PropertyChangeEvent event) {
-		this.listener.propertyChanged(event);
-	}
-
-	@Override
-	public String toString() {
-		return "AWT(" + this.listener.toString() + ")";
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/listener/awt/AWTStateChangeListenerWrapper.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/listener/awt/AWTStateChangeListenerWrapper.java
deleted file mode 100644
index f5f2988d04..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/listener/awt/AWTStateChangeListenerWrapper.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.listener.awt;
-
-import java.awt.EventQueue;
-import org.eclipse.jpt.utility.model.event.StateChangeEvent;
-import org.eclipse.jpt.utility.model.listener.StateChangeListener;
-
-/**
- * Wrap another state change listener and forward events to it on the AWT
- * event queue.
- */
-public class AWTStateChangeListenerWrapper
-	implements StateChangeListener
-{
-	private final StateChangeListener listener;
-
-	public AWTStateChangeListenerWrapper(StateChangeListener listener) {
-		super();
-		if (listener == null) {
-			throw new NullPointerException();
-		}
-		this.listener = listener;
-	}
-
-	public void stateChanged(StateChangeEvent event) {
-		if (EventQueue.isDispatchThread()) {
-			this.stateChanged_(event);
-		} else {
-			this.executeOnEventQueue(this.buildRunnable(event));
-		}
-	}
-
-	private Runnable buildRunnable(final StateChangeEvent event) {
-		return new Runnable() {
-			public void run() {
-				AWTStateChangeListenerWrapper.this.stateChanged_(event);
-			}
-		};
-	}
-
-	/**
-	 * EventQueue#invokeLater(Runnable) seems to work OK;
-	 * but using #invokeAndWait(Runnable) can sometimes make things
-	 * more predictable when debugging, at the risk of deadlocks.
-	 */
-	private void executeOnEventQueue(Runnable r) {
-		EventQueue.invokeLater(r);
-//		try {
-//			EventQueue.invokeAndWait(r);
-//		} catch (InterruptedException ex) {
-//			throw new RuntimeException(ex);
-//		} catch (java.lang.reflect.InvocationTargetException ex) {
-//			throw new RuntimeException(ex);
-//		}
-	}
-
-	void stateChanged_(StateChangeEvent event) {
-		this.listener.stateChanged(event);
-	}
-
-	@Override
-	public String toString() {
-		return "AWT(" + this.listener.toString() + ")";
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/listener/awt/AWTTreeChangeListenerWrapper.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/listener/awt/AWTTreeChangeListenerWrapper.java
deleted file mode 100644
index be7cfb113a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/listener/awt/AWTTreeChangeListenerWrapper.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.listener.awt;
-
-import java.awt.EventQueue;
-import org.eclipse.jpt.utility.model.event.TreeChangeEvent;
-import org.eclipse.jpt.utility.model.listener.TreeChangeListener;
-
-/**
- * Wrap another tree change listener and forward events to it on the AWT
- * event queue.
- */
-public class AWTTreeChangeListenerWrapper
-	implements TreeChangeListener
-{
-	private final TreeChangeListener listener;
-
-	public AWTTreeChangeListenerWrapper(TreeChangeListener listener) {
-		super();
-		if (listener == null) {
-			throw new NullPointerException();
-		}
-		this.listener = listener;
-	}
-
-	public void nodeAdded(TreeChangeEvent event) {
-		if (EventQueue.isDispatchThread()) {
-			this.nodeAdded_(event);
-		} else {
-			this.executeOnEventQueue(this.buildNodeAddedRunnable(event));
-		}
-	}
-
-	public void nodeRemoved(TreeChangeEvent event) {
-		if (EventQueue.isDispatchThread()) {
-			this.nodeRemoved_(event);
-		} else {
-			this.executeOnEventQueue(this.buildNodeRemovedRunnable(event));
-		}
-	}
-
-	public void treeCleared(TreeChangeEvent event) {
-		if (EventQueue.isDispatchThread()) {
-			this.treeCleared_(event);
-		} else {
-			this.executeOnEventQueue(this.buildTreeClearedRunnable(event));
-		}
-	}
-
-	public void treeChanged(TreeChangeEvent event) {
-		if (EventQueue.isDispatchThread()) {
-			this.treeChanged_(event);
-		} else {
-			this.executeOnEventQueue(this.buildTreeChangedRunnable(event));
-		}
-	}
-
-	private Runnable buildNodeAddedRunnable(final TreeChangeEvent event) {
-		return new Runnable() {
-			public void run() {
-				AWTTreeChangeListenerWrapper.this.nodeAdded_(event);
-			}
-			@Override
-			public String toString() {
-				return "node added";
-			}
-		};
-	}
-
-	private Runnable buildNodeRemovedRunnable(final TreeChangeEvent event) {
-		return new Runnable() {
-			public void run() {
-				AWTTreeChangeListenerWrapper.this.nodeRemoved_(event);
-			}
-			@Override
-			public String toString() {
-				return "node removed";
-			}
-		};
-	}
-
-	private Runnable buildTreeClearedRunnable(final TreeChangeEvent event) {
-		return new Runnable() {
-			public void run() {
-				AWTTreeChangeListenerWrapper.this.treeCleared_(event);
-			}
-			@Override
-			public String toString() {
-				return "tree cleared";
-			}
-		};
-	}
-
-	private Runnable buildTreeChangedRunnable(final TreeChangeEvent event) {
-		return new Runnable() {
-			public void run() {
-				AWTTreeChangeListenerWrapper.this.treeChanged_(event);
-			}
-			@Override
-			public String toString() {
-				return "tree changed";
-			}
-		};
-	}
-
-	/**
-	 * EventQueue#invokeLater(Runnable) seems to work OK;
-	 * but using #invokeAndWait(Runnable) can sometimes make things
-	 * more predictable when debugging, at the risk of deadlocks.
-	 */
-	private void executeOnEventQueue(Runnable r) {
-		EventQueue.invokeLater(r);
-//		try {
-//			EventQueue.invokeAndWait(r);
-//		} catch (InterruptedException ex) {
-//			throw new RuntimeException(ex);
-//		} catch (java.lang.reflect.InvocationTargetException ex) {
-//			throw new RuntimeException(ex);
-//		}
-	}
-
-	void nodeAdded_(TreeChangeEvent event) {
-		this.listener.nodeAdded(event);
-	}
-
-	void nodeRemoved_(TreeChangeEvent event) {
-		this.listener.nodeRemoved(event);
-	}
-
-	void treeCleared_(TreeChangeEvent event) {
-		this.listener.treeCleared(event);
-	}
-
-	void treeChanged_(TreeChangeEvent event) {
-		this.listener.treeChanged(event);
-	}
-
-	@Override
-	public String toString() {
-		return "AWT(" + this.listener.toString() + ")";
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AbstractTreeNodeValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AbstractTreeNodeValueModel.java
deleted file mode 100644
index 906c2e147c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AbstractTreeNodeValueModel.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.ChainIterator;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.internal.model.ChangeSupport;
-import org.eclipse.jpt.utility.model.listener.StateChangeListener;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-import org.eclipse.jpt.utility.model.value.TreeNodeValueModel;
-
-/**
- * Subclasses need only implement the following methods:
- * 
- * #value()
- *	    return the user-determined "value" of the node,
- *     i.e. the object "wrapped" by the node
- * 
- * #setValue(Object)
- *     set the user-determined "value" of the node,
- *     i.e. the object "wrapped" by the node;
- *     typically only overridden for nodes with "primitive" values
- * 
- * #parent()
- *     return the parent of the node, which should be another
- *     TreeNodeValueModel
- * 
- * #childrenModel()
- *     return a ListValueModel for the node's children
- * 
- * #engageValue() and #disengageValue()
- *     override these methods to listen to the node's value if
- *     it can change in a way that should be reflected in the tree
- */
-public abstract class AbstractTreeNodeValueModel<T>
-	extends AbstractModel
-	implements TreeNodeValueModel<T>
-{
-
-
-	// ********** constructors **********
-	
-	/**
-	 * Default constructor.
-	 */
-	protected AbstractTreeNodeValueModel() {
-		super();
-	}
-	
-	@Override
-	protected ChangeSupport buildChangeSupport() {
-		// this model fires *both* "value property change" and "state change" events...
-//		return new SingleAspectChangeSupport(this, PropertyChangeListener.class, PropertyValueModel.VALUE);
-		return super.buildChangeSupport();
-	}
-
-
-	// ********** extend AbstractModel implementation **********
-
-	/**
-	 * Clients should be adding both "state change" and "value property change"
-	 * listeners.
-	 */
-	@Override
-	public void addStateChangeListener(StateChangeListener listener) {
-		if (this.hasNoStateChangeListeners()) {
-			this.engageValue();
-		}
-		super.addStateChangeListener(listener);
-	}
-
-	/**
-	 * Begin listening to the node's value's state. If the state of the node changes
-	 * in a way that should be reflected in the tree, fire a "state change" event.
-	 */
-	protected abstract void engageValue();
-
-	/**
-	 * @see #addStateChangeListener(StateChangeListener)
-	 */
-	@Override
-	public void removeStateChangeListener(StateChangeListener listener) {
-		super.removeStateChangeListener(listener);
-		if (this.hasNoStateChangeListeners()) {
-			this.disengageValue();
-		}
-	}
-
-	/**
-	 * Stop listening to the node's value.
-	 * @see #engageValue()
-	 */
-	protected abstract void disengageValue();
-
-
-	// ********** WritablePropertyValueModel implementation **********
-	
-	public void setValue(T value) {
-		throw new UnsupportedOperationException();
-	}
-
-
-	// ********** TreeNodeValueModel implementation **********
-	
-	@SuppressWarnings("unchecked")
-	public TreeNodeValueModel<T>[] path() {
-		List<TreeNodeValueModel<T>> path = CollectionTools.reverseList(this.backPath());
-		return path.toArray(new TreeNodeValueModel[path.size()]);
-	}
-
-	/**
-	 * Return an iterator that climbs up the node's path,
-	 * starting with, and including, the node
-	 * and up to, and including, the root node.
-	 */
-	protected Iterator<TreeNodeValueModel<T>> backPath() {
-		return new ChainIterator<TreeNodeValueModel<T>>(this) {
-			@Override
-			protected TreeNodeValueModel<T> nextLink(TreeNodeValueModel<T> currentLink) {
-				return currentLink.parent();
-			}
-		};
-	}
-
-	public TreeNodeValueModel<T> child(int index) {
-		return this.childrenModel().get(index);
-	}
-
-	public int childrenSize() {
-		return this.childrenModel().size();
-	}
-
-	public int indexOfChild(TreeNodeValueModel<T> child) {
-		ListValueModel<TreeNodeValueModel<T>> children = this.childrenModel();
-		int size = children.size();
-		for (int i = 0; i < size; i++) {
-			if (children.get(i) == child) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-	public boolean isLeaf() {
-		return this.childrenModel().size() == 0;
-	}
-
-
-	// ********** standard methods **********
-
-	/**
-	 * We implement #equals(Object) so that TreePaths containing these nodes
-	 * will resolve properly when the nodes contain the same values. This is
-	 * necessary because nodes are dropped and rebuilt willy-nilly when dealing
-	 * with a sorted list of children; and this allows us to save and restore
-	 * a tree's expanded paths. The nodes in the expanded paths that are
-	 * saved before any modification (e.g. renaming a node) will be different
-	 * from the nodes in the tree's paths after the modification, if the modification
-	 * results in a possible change in the node sort order.  ~bjv
-	 */
-	@Override
-	public boolean equals(Object o) {
-		if (o == null) {
-			return false;
-		}
-		if (o.getClass() != this.getClass()) {
-			return false;
-		}
-		@SuppressWarnings("unchecked")
-		AbstractTreeNodeValueModel<T> other = (AbstractTreeNodeValueModel<T>) o;
-		return this.getValue().equals(other.getValue());
-	}
-
-	@Override
-	public int hashCode() {
-		return this.getValue().hashCode();
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.getValue());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AspectAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AspectAdapter.java
deleted file mode 100644
index f7d33d56e3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AspectAdapter.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.internal.model.ChangeSupport;
-import org.eclipse.jpt.utility.internal.model.SingleAspectChangeSupport;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ChangeListener;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-
-/**
- * This abstract extension of AbstractModel provides a base for adding 
- * change listeners (PropertyChange, CollectionChange, ListChange, TreeChange)
- * to a subject and converting the subject's change notifications into a single
- * set of change notifications for a common aspect (e.g. VALUE).
- * 
- * The adapter will only listen to the subject (and subject holder) when the
- * adapter itself actually has listeners. This will allow the adapter to be
- * garbage collected when appropriate
- */
-public abstract class AspectAdapter<S>
-	extends AbstractModel
-{
-	/**
-	 * The subject that holds the aspect and fires
-	 * change notification when the aspect changes.
-	 * We need to hold on to this directly so we can
-	 * disengage it when it changes.
-	 */
-	protected S subject;
-
-	/**
-	 * A value model that holds the subject
-	 * that holds the aspect and provides change notification.
-	 * This is useful when there are a number of AspectAdapters
-	 * that have the same subject and that subject can change.
-	 * All the AspectAdapters should share the same subject holder.
-	 * For now, this is can only be set upon construction and is
-	 * immutable.
-	 */
-	protected final PropertyValueModel<? extends S> subjectHolder;
-
-	/** A listener that keeps us in synch with the subjectHolder. */
-	protected final PropertyChangeListener subjectChangeListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct an AspectAdapter for the specified subject.
-	 */
-	protected AspectAdapter(S subject) {
-		this(new StaticPropertyValueModel<S>(subject));
-	}
-
-	/**
-	 * Construct an AspectAdapter for the specified subject holder.
-	 * The subject holder cannot be null.
-	 */
-	protected AspectAdapter(PropertyValueModel<? extends S> subjectHolder) {
-		super();
-		if (subjectHolder == null) {
-			throw new NullPointerException();
-		}
-		this.subjectHolder = subjectHolder;
-		this.subjectChangeListener = this.buildSubjectChangeListener();
-		// the subject is null when we are not listening to it
-		// this will typically result in our value being null
-		this.subject = null;
-	}
-
-
-	// ********** initialization **********
-
-	@Override
-	protected ChangeSupport buildChangeSupport() {
-		return new LocalChangeSupport(this, this.getListenerClass(), this.getListenerAspectName());
-	}
-
-	/**
-	 * The subject holder's value has changed, keep our subject in synch.
-	 */
-	protected PropertyChangeListener buildSubjectChangeListener() {
-		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent event) {
-				AspectAdapter.this.subjectChanged();
-			}
-			@Override
-			public String toString() {
-				return "subject change listener";
-			}
-		};
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * The subject has changed. Notify listeners that the value has changed.
-	 */
-	protected synchronized void subjectChanged() {
-		Object oldValue = this.getValue();
-		boolean hasListeners = this.hasListeners();
-		if (hasListeners) {
-			this.disengageSubject();
-		}
-		this.subject = this.subjectHolder.getValue();
-		if (hasListeners) {
-			this.engageSubject();
-			this.fireAspectChange(oldValue, this.getValue());
-		}
-	}
-
-	/**
-	 * Return the aspect's current value.
-	 */
-	protected abstract Object getValue();
-
-	/**
-	 * Return the class of listener that is interested in the aspect adapter's
-	 * changes.
-	 */
-	protected abstract Class<? extends ChangeListener> getListenerClass();
-
-	/**
-	 * Return the name of the aspect adapter's aspect (e.g. VALUE).
-	 * This is the name of the aspect adapter's single aspect, not the
-	 * name of the subject's aspect the aspect adapter is adapting.
-	 */
-	protected abstract String getListenerAspectName();
-
-	/**
-	 * Return whether there are any listeners for the aspect.
-	 */
-	protected abstract boolean hasListeners();
-
-	/**
-	 * Return whether there are no listeners for the aspect.
-	 */
-	protected boolean hasNoListeners() {
-		return ! this.hasListeners();
-	}
-
-	/**
-	 * The aspect has changed, notify listeners appropriately.
-	 */
-	protected abstract void fireAspectChange(Object oldValue, Object newValue);
-
-	protected void engageSubject() {
-		// check for nothing to listen to
-		if (this.subject != null) {
-			this.engageSubject_();
-		}
-	}
-
-	/**
-	 * The subject is not null - add our listener.
-	 */
-	protected abstract void engageSubject_();
-
-	protected void disengageSubject() {
-		// check for nothing to listen to
-		if (this.subject != null) {
-			this.disengageSubject_();
-		}
-	}
-
-	/**
-	 * The subject is not null - remove our listener.
-	 */
-	protected abstract void disengageSubject_();
-
-	protected void engageSubjectHolder() {
-		this.subjectHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.subjectChangeListener);
-		// synch our subject *after* we start listening to the subject holder,
-		// since its value might change when a listener is added
-		this.subject = this.subjectHolder.getValue();
-	}
-
-	protected void disengageSubjectHolder() {
-		this.subjectHolder.removePropertyChangeListener(PropertyValueModel.VALUE, this.subjectChangeListener);
-		// clear out the subject when we are not listening to its holder
-		this.subject = null;
-	}
-
-	protected void engageModels() {
-		this.engageSubjectHolder();
-		this.engageSubject();
-	}
-
-	protected void disengageModels() {
-		this.disengageSubject();
-		this.disengageSubjectHolder();
-	}
-
-
-	// ********** local change support **********
-
-	/**
-	 * Extend change support to start listening to the aspect adapter's
-	 * models (the subject holder and the subject itself) when the first
-	 * relevant listener is added.
-	 * Conversely, stop listening to the aspect adapter's models when the
-	 * last relevant listener is removed.
-	 * A relevant listener is a listener of the relevant type.
-	 */
-	protected class LocalChangeSupport extends SingleAspectChangeSupport {
-		private static final long serialVersionUID = 1L;
-
-		public LocalChangeSupport(AspectAdapter<S> source, Class<? extends ChangeListener> listenerClass, String aspectName) {
-			super(source, listenerClass, aspectName);
-		}
-
-		protected boolean listenerIsRelevant(Class<? extends ChangeListener> lClass) {
-			return lClass == this.listenerClass;
-		}
-
-		protected boolean hasNoRelevantListeners(Class<? extends ChangeListener> lClass) {
-			return this.listenerIsRelevant(lClass)
-						&& this.hasNoListeners(lClass);
-		}
-
-		protected boolean listenerIsRelevant(Class<? extends ChangeListener> lClass, String listenerAspectName) {
-			return this.listenerIsRelevant(lClass)
-						&& (listenerAspectName == AspectAdapter.this.getListenerAspectName());
-		}
-
-		protected boolean hasNoRelevantListeners(Class<? extends ChangeListener> lClass, String listenerAspectName) {
-			return this.listenerIsRelevant(lClass, listenerAspectName)
-						&& this.hasNoListeners(lClass, listenerAspectName);
-		}
-
-
-		// ********** overrides **********
-
-		@Override
-		protected <T extends ChangeListener> void addListener(Class<T> lClass, T listener) {
-			if (this.hasNoRelevantListeners(lClass)) {
-				AspectAdapter.this.engageModels();
-			}
-			super.addListener(lClass, listener);
-		}
-
-		@Override
-		protected <T extends ChangeListener> void addListener(String listenerAspectName, Class<T> lClass, T listener) {
-			if (this.hasNoRelevantListeners(lClass, listenerAspectName)) {
-				AspectAdapter.this.engageModels();
-			}
-			super.addListener(listenerAspectName, lClass, listener);
-		}
-
-		@Override
-		protected <T extends ChangeListener> void removeListener(Class<T> lClass, T listener) {
-			super.removeListener(lClass, listener);
-			if (this.hasNoRelevantListeners(lClass)) {
-				AspectAdapter.this.disengageModels();
-			}
-		}
-
-		@Override
-		protected <T extends ChangeListener> void removeListener(String listenerAspectName, Class<T> lClass, T listener) {
-			super.removeListener(listenerAspectName, lClass, listener);
-			if (this.hasNoRelevantListeners(lClass, listenerAspectName)) {
-				AspectAdapter.this.disengageModels();
-			}
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AspectPropertyValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AspectPropertyValueModelAdapter.java
deleted file mode 100644
index 75853757ad..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AspectPropertyValueModelAdapter.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.internal.model.ChangeSupport;
-import org.eclipse.jpt.utility.internal.model.SingleAspectChangeSupport;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-
-/**
- * This abstract class provides the infrastructure needed to wrap
- * a value model, "lazily" listen to it, and convert
- * its change notifications into property value model change
- * notifications.
- * 
- * Subclasses must override:
- * - #buildValue()
- *     to return the current property value, as derived from the
- *     current model value
- * 
- */
-public abstract class AspectPropertyValueModelAdapter<T>
-	extends AbstractModel
-	implements PropertyValueModel<T>
-{
-	/**
-	 * Cache the current value so we can pass an "old value" when
-	 * we fire a property change event.
-	 * We need this because the value may be calculated and we may
-	 * not able to derive the "old value" from the collection
-	 * change event fired by the collection value model.
-	 */
-	protected T value;
-
-
-	// ********** constructor/initialization **********
-
-	protected AspectPropertyValueModelAdapter() {
-		super();
-		// our value is null when we are not listening to the collection holder
-		this.value = null;
-	}
-
-	@Override
-	protected ChangeSupport buildChangeSupport() {
-		return new SingleAspectChangeSupport(this, PropertyChangeListener.class, VALUE);
-	}
-
-
-	// ********** PropertyValueModel implementation **********
-
-	/**
-	 * Return the cached value.
-	 */
-	public T getValue() {
-		return this.value;
-	}
-
-
-	// ********** extend change support **********
-
-	/**
-	 * Extend to start listening to the wrapped collection if necessary.
-	 */
-	@Override
-	public synchronized void addPropertyChangeListener(PropertyChangeListener listener) {
-		if (this.hasNoListeners()) {
-			this.engageModel();
-		}
-		super.addPropertyChangeListener(listener);
-	}
-	
-	/**
-	 * Extend to start listening to the wrapped collection if necessary.
-	 */
-	@Override
-	public synchronized void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) {
-		if (propertyName == VALUE && this.hasNoListeners()) {
-			this.engageModel();
-		}
-		super.addPropertyChangeListener(propertyName, listener);
-	}
-	
-	/**
-	 * Extend to stop listening to the wrapped collection if necessary.
-	 */
-	@Override
-	public synchronized void removePropertyChangeListener(PropertyChangeListener listener) {
-		super.removePropertyChangeListener(listener);
-		if (this.hasNoListeners()) {
-			this.disengageModel();
-		}
-	}
-	
-	/**
-	 * Extend to stop listening to the wrapped collection if necessary.
-	 */
-	@Override
-	public synchronized void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) {
-		super.removePropertyChangeListener(propertyName, listener);
-		if (propertyName == VALUE && this.hasNoListeners()) {
-			this.disengageModel();
-		}
-	}
-
-
-	// ********** queries **********
-
-	/**
-	 * Return whether there are any listeners for the aspect.
-	 */
-	protected boolean hasListeners() {
-		return this.hasAnyPropertyChangeListeners(VALUE);
-	}
-
-	/**
-	 * Return whether there are any listeners for the aspect.
-	 */
-	protected boolean hasNoListeners() {
-		return ! this.hasListeners();
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Start listening to the model and build the value.
-	 */
-	protected void engageModel() {
-		this.engageModel_();
-		// synch our value *after* we start listening to the collection,
-		// since the collection's value might change when a listener is added
-		this.value = this.buildValue();
-	}
-
-	/**
-	 * Start listening to the model.
-	 */
-	protected abstract void engageModel_();
-
-	/**
-	 * Build and return the current value, as derived from the
-	 * current state of the wrapped model.
-	 */
-	protected abstract T buildValue();
-
-	/**
-	 * Stop listening to the model and clear the value.
-	 */
-	protected void disengageModel() {
-		this.disengageModel_();
-		// clear out our value when we are not listening to the collection
-		this.value = null;
-	}
-
-	/**
-	 * Stop listening to the model.
-	 */
-	protected abstract void disengageModel_();
-
-	/**
-	 * The wrapped model changed in some fashion.
-	 * Recalculate the value and notify any listeners.
-	 */
-	protected void propertyChanged() {
-		Object old = this.value;
-		this.value = this.buildValue();
-		this.firePropertyChanged(VALUE, old, this.value);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/BufferedWritablePropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/BufferedWritablePropertyValueModel.java
deleted file mode 100644
index 8781be4afd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/BufferedWritablePropertyValueModel.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * A BufferedPropertyValueModel is used to hold a temporary copy of the value
- * in another property value model (the "wrapped" value holder). The application
- * can modify this temporary copy, ad nauseam; but the temporary copy is only
- * passed through to the "wrapped" value holder when the trigger "accepts" the
- * buffered value. Alternatively, the application can "reset" the buffered value
- * to the original, "wrapped" value.
- * 
- * The trigger is another value model that holds a Boolean and the application
- * changes the trigger's value to true on "accept", false on "reset". Typically,
- * in a dialog:
- * 	- pressing the OK button will trigger an "accept" and close the dialog
- * 	- pressing the Cancel button will simply close the dialog,
- * 		dropping the "buffered" values into the bit bucket
- * 	- pressing the Apply button will trigger an "accept" and leave the dialog open
- * 	- pressing the Restore button will trigger a "reset" and leave the dialog open
- * 
- * A number of buffered property value models can wrap another set of
- * property aspect adapters that adapt the various aspects of a single
- * domain model. All the bufferd property value models can be hooked to the
- * same trigger, and that trigger is controlled by the application, typically
- * via the OK button in a dialog.
- * 
- * @see PropertyAspectAdapter
- */
-public class BufferedWritablePropertyValueModel<T>
-	extends PropertyValueModelWrapper<T>
-	implements WritablePropertyValueModel<T>
-{
-
-	/**
-	 * We cache the value here until it is accepted and passed
-	 * through to the wrapped value holder.
-	 */
-	protected T bufferedValue;
-
-	/**
-	 * This is set to true when we are "accepting" the buffered value
-	 * and passing it through to the wrapped value holder. This allows
-	 * us to ignore the property change event fired by the wrapped
-	 * value holder.
-	 * (We can't stop listening to the wrapped value holder, because
-	 * if we are the only listener that could "deactivate" the wrapped
-	 * value holder.)
-	 */
-	protected boolean accepting;
-
-	/**
-	 * This is the trigger that indicates whether the buffered value
-	 * should be accepted or reset.
-	 */
-	protected final PropertyValueModel<Boolean> triggerHolder;
-
-	/** This listens to the trigger holder. */
-	protected final PropertyChangeListener triggerChangeListener;
-
-	/**
-	 * This flag indicates whether our buffered value has been assigned
-	 * a value and is possibly out of synch with the wrapped value.
-	 */
-	protected boolean buffering;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a buffered property value model with the specified wrapped
-	 * property value model and trigger holder.
-	 */
-	public BufferedWritablePropertyValueModel(WritablePropertyValueModel<T> valueHolder, PropertyValueModel<Boolean> triggerHolder) {
-		super(valueHolder);
-		if (triggerHolder == null) {
-			throw new NullPointerException();
-		}
-		this.triggerHolder = triggerHolder;
-		this.bufferedValue = null;
-		this.buffering = false;
-		this.accepting = false;
-		this.triggerChangeListener = this.buildTriggerChangeListener();
-	}
-	
-
-	// ********** initialization **********
-
-	protected PropertyChangeListener buildTriggerChangeListener() {
-		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent event) {
-				BufferedWritablePropertyValueModel.this.triggerChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "trigger change listener";
-			}
-		};
-	}
-	
-
-	// ********** ValueModel implementation **********
-
-	/**
-	 * If we are currently "buffering" a value, return that;
-	 * otherwise, return the wrapped value.
-	 */
-	public T getValue() {
-		return this.buffering ? this.bufferedValue : this.valueHolder.getValue();
-	}
-
-	/**
-	 * Assign the new value to our "buffered" value.
-	 * It will be forwarded to the wrapped value holder
-	 * when the trigger is "accepted".
-	 */
-	public void setValue(T value) {
-		Object old = this.getValue();
-		this.bufferedValue = value;
-		this.buffering = true;
-		this.firePropertyChanged(VALUE, old, this.bufferedValue);
-	}
-
-
-	// ********** PropertyValueModelWrapper extensions **********
-
-	/**
-	 * extend to engage the trigger holder also
-	 */
-	@Override
-	protected void engageValueHolder() {
-		super.engageValueHolder();
-		this.triggerHolder.addPropertyChangeListener(VALUE, this.triggerChangeListener);
-	}
-
-	/**
-	 * extend to disengage the trigger holder also
-	 */
-	@Override
-	protected void disengageValueHolder() {
-		this.triggerHolder.removePropertyChangeListener(VALUE, this.triggerChangeListener);
-		super.disengageValueHolder();
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * If we do not yet have a "buffered" value, simply propagate the
-	 * change notification with the buffered model as the source.
-	 * If we do have a "buffered" value, do nothing.
-	 */
-	@Override
-	protected void valueChanged(PropertyChangeEvent event) {
-		if (this.accepting) {
-			// if we are currently "accepting" the value, ignore change notifications,
-			// since we caused them and our own listeners are already aware of the change
-			return;
-		}
-		if (this.buffering) {
-			this.handleChangeConflict(event);
-		} else {
-			this.firePropertyChanged(event.cloneWithSource(this));
-		}
-	}
-	
-	/**
-	 * By default, if we have a "buffered" value and the "wrapped" value changes,
-	 * we simply ignore the new "wrapped" value and simply overlay it with the
-	 * "buffered" value if it is "accepted". ("Last One In Wins" concurrency model)
-	 * Subclasses can override this method to change that behavior with a
-	 * different concurrency model. For example, you could drop the "buffered" value
-	 * and replace it with the new "wrapped" value, or you could throw an
-	 * exception.
-	 */
-	protected void handleChangeConflict(PropertyChangeEvent event) {
-		// the default is to do nothing
-	}
-	
-	/**
-	 * The trigger changed:
-	 * If it is now true, "accept" the buffered value and forward
-	 * it to the wrapped value holder.
-	 * If it is now false, "reset" the buffered value to its original value.
-	 */
-	protected void triggerChanged(PropertyChangeEvent event) {
-		if ( ! this.buffering) {
-			// if nothing has been "buffered", we don't need to do anything:
-			// nothing needs to be passed through; nothing needs to be reset;
-			return;
-		}
-		if (((Boolean) event.getNewValue()).booleanValue()) {
-			// set the accepting flag so we ignore any events
-			// fired by the wrapped value holder
-			this.accepting = true;
-			this.valueHolder().setValue(this.bufferedValue);
-			this.bufferedValue = null;
-			this.buffering = false;
-			// clear the flag once the "accept" is complete
-			this.accepting = false;
-		} else {
-			// notify our listeners that our value has been reset
-			Object old = this.bufferedValue;
-			this.bufferedValue = null;
-			this.buffering = false;
-			this.firePropertyChanged(VALUE, old, this.valueHolder.getValue());
-		}
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.getValue());
-	}
-
-
-	// ********** convenience methods **********
-
-	/**
-	 * Return whether the buffered model is currently "buffering"
-	 * a value.
-	 */
-	public boolean isBuffering() {
-		return this.buffering;
-	}
-
-	/**
-	 * Our constructor accepts only a WritablePropertyValueModel<T>.
-	 */
-	@SuppressWarnings("unchecked")
-	protected WritablePropertyValueModel<T> valueHolder() {
-		return (WritablePropertyValueModel<T>) this.valueHolder;
-	}
-
-
-	// ********** inner class **********
-
-	/**
-	 * Trigger is a special property value model that only maintains its
-	 * value (of true or false) during the change notification caused by
-	 * the #setValue(Object) method. In other words, a Trigger object
-	 * only has a valid value 
-	 */
-	public static class Trigger extends SimplePropertyValueModel<Boolean> {
-
-
-		// ********** constructor **********
-
-		/**
-		 * Construct a trigger with a null value.
-		 */
-		public Trigger() {
-			super();
-		}
-
-
-		// ********** ValueModel implementation **********
-
-		/**
-		 * Extend so that this method can only be invoked during
-		 * change notification triggered by #setValue(Object).
-		 */
-		@Override
-		public Boolean getValue() {
-			if (this.value == null) {
-				throw new IllegalStateException("The method Trigger.value() may only be called during change notification.");
-			}
-			return this.value;
-		}
-
-		/**
-		 * Extend to reset the value to null once all the
-		 * listeners have been notified.
-		 */
-		@Override
-		public void setValue(Boolean value) {
-			super.setValue(value);
-			this.value = null;
-		}
-
-
-		// ********** convenience methods **********
-
-		/**
-		 * Set the trigger's value:
-		 * 	- true indicates "accept"
-		 * 	- false indicates "reset"
-		 */
-		public void setValue(boolean value) {
-			this.setValue(Boolean.valueOf(value));
-		}
-
-		/**
-		 * Return the trigger's value:
-		 * 	- true indicates "accept"
-		 * 	- false indicates "reset"
-		 */
-		public boolean booleanValue() {
-			return this.getValue().booleanValue();
-		}
-
-		/**
-		 * Accept the trigger (i.e. set its value to true).
-		 */
-		public void accept() {
-			this.setValue(true);
-		}
-
-		/**
-		 * Return whether the trigger has been accepted
-		 * (i.e. its value was changed to true).
-		 */
-		public boolean isAccepted() {
-			return this.booleanValue();
-		}
-
-		/**
-		 * Reset the trigger (i.e. set its value to false).
-		 */
-		public void reset() {
-			this.setValue(false);
-		}
-
-		/**
-		 * Return whether the trigger has been reset
-		 * (i.e. its value was changed to false).
-		 */
-		public boolean isReset() {
-			return ! this.booleanValue();
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CachingTransformationPropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CachingTransformationPropertyValueModel.java
deleted file mode 100644
index a2d1e6157d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CachingTransformationPropertyValueModel.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.internal.Transformer;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-
-/**
- * A <code>CachingTransformationPropertyValueModel</code> wraps another
- * <code>PropertyValueModel</code> and uses a <code>Transformer</code>
- * to transform the wrapped value before it is returned by <code>getValue()</code>.
- * The transformed value is calculated and cached during initialization and every
- * time the wrapped value changes. This can be useful when the old value
- * passed in to <code>valueChanged(PropertyChangeEvent)</code> can no longer
- * be "transformed" because its state is no longer valid.
- * This caching can also improve time performance in some situations.
- * <p>
- * As an alternative to building a <code>Transformer</code>,
- * a subclass of <code>CachingTransformationPropertyValueModel</code> can
- * either override the <code>transform_(Object)</code> method or,
- * if something other than null should be returned when the wrapped value
- * is null, override the <code>transform(Object)</code> method.
- */
-public class CachingTransformationPropertyValueModel<T1, T2>
-	extends TransformationPropertyValueModel<T1, T2>
-{
-
-	/**
-	 * Cache the transformed value so that during property change event notification
-	 * we do not have to transform the old value. The old value could no longer be valid in
-	 * the model; as a result, transforming it would not be valid.
-	 */
-	protected T2 cachedValue;
-
-
-	// ********** constructors/initialization **********
-
-	/**
-	 * Construct a property value model with the specified nested
-	 * property value model and the default transformer.
-	 * Use this constructor if you want to override the
-	 * <code>transform_(Object)</code> or <code>transform(Object)</code>
-	 * method instead of building a <code>Transformer</code>.
-	 */
-	public CachingTransformationPropertyValueModel(PropertyValueModel<? extends T1> valueHolder) {
-		super(valueHolder);
-	}
-
-	/**
-	 * Construct an property value model with the specified nested
-	 * property value model and transformer.
-	 */
-	public CachingTransformationPropertyValueModel(PropertyValueModel<? extends T1> valueHolder, Transformer<T1, T2> transformer) {
-		super(valueHolder, transformer);
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * We have listeners, transform the nested value and cache the result.
-	 */
-	@Override
-	protected void engageValueHolder() {
-		super.engageValueHolder();
-		this.cachedValue = this.transform(this.valueHolder.getValue());
-	}
-
-	/**
-	 * We have no more listeners, clear the cached value.
-	 */
-	@Override
-	protected void disengageValueHolder() {
-		this.cachedValue = null;
-		super.disengageValueHolder();
-	}
-
-	/**
-	 * No need to transform the nested value, simply return the cached value,
-	 * which is already transformed.
-	 */
-	@Override
-	public T2 getValue() {
-		return this.cachedValue;
-	}
-
-	/**
-	 * Transform the specified new value, caching it before returning it.
-	 */
-	@Override
-	protected T2 transformNew(T1 value) {
-		this.cachedValue = super.transformNew(value);
-		return this.cachedValue;
-	}
-
-	/**
-	 * No need to transform the old value, simply return the cached value,
-	 * which is already transformed.
-	 */
-	@Override
-	protected T2 transformOld(T1 value) {
-		return this.cachedValue;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CachingTransformationWritablePropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CachingTransformationWritablePropertyValueModel.java
deleted file mode 100644
index 18b6ce0bdc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CachingTransformationWritablePropertyValueModel.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.internal.BidiTransformer;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * A <code>CachingTransformationWritablePropertyValueModel<code> augments the
- * behavior of a <code>TransformationWritablePropertyValueModel<code> by caching
- * the transformed value.
- * The transformed value is calculated and cached during initialization and every
- * time the wrapped value changes. This can be useful when the old value
- * passed in to <code>valueChanged(PropertyChangeEvent)</code> can no longer
- * be "transformed" because its state is no longer valid.
- * This caching can also improve time performance in some situations.
- */
-public class CachingTransformationWritablePropertyValueModel<T1, T2>
-	extends TransformationWritablePropertyValueModel<T1, T2>
-{
-
-	/**
-	 * Cache the transformed value so that during property change event notification
-	 * we do not have to transform the old value. The old value could no longer be valid in
-	 * the model; as a result, transforming it would not be valid.
-	 */
-	protected T2 cachedValue;
-
-
-	// ********** constructors/initialization **********
-
-	/**
-	 * Construct a writable property value model with the specified nested
-	 * writable property value model and the default bidi transformer.
-	 * Use this constructor if you want to override the
-	 * <code>transform_(Object)</code> and <code>reverseTransform_(Object)</code>
-	 * (or <code>transform(Object)</code> and <code>reverseTransform(Object)</code>)
-	 * methods instead of building a <code>BidiTransformer</code>.
-	 */
-	public CachingTransformationWritablePropertyValueModel(WritablePropertyValueModel<T1> valueHolder) {
-		super(valueHolder);
-	}
-
-	/**
-	 * Construct a writable property value model with the specified nested
-	 * writable property value model and bidi transformer.
-	 */
-	public CachingTransformationWritablePropertyValueModel(WritablePropertyValueModel<T1> valueHolder, BidiTransformer<T1, T2> transformer) {
-		super(valueHolder, transformer);
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * We have listeners, transform the nested value and cache the result.
-	 */
-	@Override
-	protected void engageValueHolder() {
-		super.engageValueHolder();
-		this.cachedValue = this.transform(this.valueHolder.getValue());
-	}
-
-	/**
-	 * We have no more listeners, clear the cached value.
-	 */
-	@Override
-	protected void disengageValueHolder() {
-		this.cachedValue = null;
-		super.disengageValueHolder();
-	}
-
-	/**
-	 * No need to transform the nested value, simply return the cached value,
-	 * which is already transformed.
-	 */
-	@Override
-	public T2 getValue() {
-		return this.cachedValue;
-	}
-
-	/**
-	 * Transform the specified new value, caching it before returning it.
-	 */
-	@Override
-	protected T2 transformNew(T1 value) {
-		this.cachedValue = super.transformNew(value);
-		return this.cachedValue;
-	}
-
-	/**
-	 * No need to transform the old value, simply return the cached value,
-	 * which is already transformed.
-	 */
-	@Override
-	protected T2 transformOld(T1 value) {
-		return this.cachedValue;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionAspectAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionAspectAdapter.java
deleted file mode 100644
index f55783e8a9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionAspectAdapter.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ChangeListener;
-import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-
-/**
- * This extension of AspectAdapter provides CollectionChange support.
- * This allows us to convert a set of one or more collections into
- * a single collection, VALUES.
- * 
- * The typical subclass will override the following methods:
- * #iterator_()
- *     at the very minimum, override this method to return an iterator on the
- *     subject's collection aspect; it does not need to be overridden if
- *     #iterator() is overridden and its behavior changed
- * #size_()
- *     override this method to improve performance; it does not need to be overridden if
- *     #size() is overridden and its behavior changed
- * #iterator()
- *     override this method only if returning an empty iterator when the
- *     subject is null is unacceptable
- * #size()
- *     override this method only if returning a zero when the
- *     subject is null is unacceptable
- */
-public abstract class CollectionAspectAdapter<S extends Model, E>
-	extends AspectAdapter<S>
-	implements CollectionValueModel<E>
-{
-	/**
-	 * The name of the subject's collections that we use for the value.
-	 */
-	protected final String[] collectionNames;
-		protected static final String[] EMPTY_COLLECTION_NAMES = new String[0];
-
-	/** A listener that listens to the subject's collection aspect. */
-	protected final CollectionChangeListener collectionChangeListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a CollectionAspectAdapter for the specified subject
-	 * and collection.
-	 */
-	protected CollectionAspectAdapter(String collectionName, S subject) {
-		this(new String[] {collectionName}, subject);
-	}
-
-	/**
-	 * Construct a CollectionAspectAdapter for the specified subject
-	 * and collections.
-	 */
-	protected CollectionAspectAdapter(String[] collectionNames, S subject) {
-		this(new StaticPropertyValueModel<S>(subject), collectionNames);
-	}
-
-	/**
-	 * Construct a CollectionAspectAdapter for the specified subject holder
-	 * and collections.
-	 */
-	protected CollectionAspectAdapter(PropertyValueModel<? extends S> subjectHolder, String... collectionNames) {
-		super(subjectHolder);
-		this.collectionNames = collectionNames;
-		this.collectionChangeListener = this.buildCollectionChangeListener();
-	}
-
-	/**
-	 * Construct a CollectionAspectAdapter for the specified subject holder
-	 * and collections.
-	 */
-	protected CollectionAspectAdapter(PropertyValueModel<? extends S> subjectHolder, Collection<String> collectionNames) {
-		this(subjectHolder, collectionNames.toArray(new String[collectionNames.size()]));
-	}
-
-	/**
-	 * Construct a CollectionAspectAdapter for an "unchanging" collection in
-	 * the specified subject. This is useful for a collection aspect that does not
-	 * change for a particular subject; but the subject will change, resulting in
-	 * a new collection.
-	 */
-	protected CollectionAspectAdapter(PropertyValueModel<? extends S> subjectHolder) {
-		this(subjectHolder, EMPTY_COLLECTION_NAMES);
-	}
-
-
-	// ********** initialization **********
-
-	/**
-	 * The subject's collection aspect has changed, notify the listeners.
-	 */
-	protected CollectionChangeListener buildCollectionChangeListener() {
-		// transform the subject's collection change events into VALUE collection change events
-		return new CollectionChangeListener() {
-			public void itemsAdded(CollectionChangeEvent event) {
-				CollectionAspectAdapter.this.itemsAdded(event);
-			}
-			public void itemsRemoved(CollectionChangeEvent event) {
-				CollectionAspectAdapter.this.itemsRemoved(event);
-			}
-			public void collectionCleared(CollectionChangeEvent event) {
-				CollectionAspectAdapter.this.collectionCleared(event);
-			}
-			public void collectionChanged(CollectionChangeEvent event) {
-				CollectionAspectAdapter.this.collectionChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "collection change listener: " + Arrays.asList(CollectionAspectAdapter.this.collectionNames);
-			}
-		};
-	}
-
-
-	// ********** CollectionValueModel implementation **********
-
-	/**
-	 * Return the elements of the subject's collection aspect.
-	 */
-	public Iterator<E> iterator() {
-		return (this.subject == null) ? EmptyIterator.<E>instance() : this.iterator_();
-	}
-
-	/**
-	 * Return the elements of the subject's collection aspect.
-	 * At this point we can be sure that the subject is not null.
-	 * @see #iterator()
-	 */
-	protected Iterator<E> iterator_() {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return the size of the subject's collection aspect.
-	 */
-	public int size() {
-		return (this.subject == null) ? 0 : this.size_();
-	}
-
-	/**
-	 * Return the size of the subject's collection aspect.
-	 * At this point we can be sure that the subject is not null.
-	 * @see #size()
-	 */
-	protected int size_() {
-		return CollectionTools.size(this.iterator());
-	}
-
-
-	// ********** AspectAdapter implementation **********
-
-	@Override
-	protected Object getValue() {
-		return this.iterator();
-	}
-
-	@Override
-	protected Class<? extends ChangeListener> getListenerClass() {
-		return CollectionChangeListener.class;
-	}
-
-	@Override
-	protected String getListenerAspectName() {
-		return VALUES;
-	}
-
-	@Override
-	protected boolean hasListeners() {
-		return this.hasAnyCollectionChangeListeners(VALUES);
-	}
-
-	@Override
-	protected void fireAspectChange(Object oldValue, Object newValue) {
-		this.fireCollectionChanged(VALUES);
-	}
-
-	@Override
-	protected void engageSubject_() {
-    	for (String collectionName : this.collectionNames) {
-			((Model) this.subject).addCollectionChangeListener(collectionName, this.collectionChangeListener);
-		}
-	}
-
-	@Override
-	protected void disengageSubject_() {
-    	for (String collectionName : this.collectionNames) {
-			((Model) this.subject).removeCollectionChangeListener(collectionName, this.collectionChangeListener);
-		}
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		for (int i = 0; i < this.collectionNames.length; i++) {
-			if (i != 0) {
-				sb.append(", ");
-			}
-			sb.append(this.collectionNames[i]);
-		}
-	}
-
-
-	// ********** behavior **********
-
-	protected void itemsAdded(CollectionChangeEvent event) {
-		this.fireItemsAdded(event.cloneWithSource(this, VALUES));
-	}
-
-	protected void itemsRemoved(CollectionChangeEvent event) {
-		this.fireItemsRemoved(event.cloneWithSource(this, VALUES));
-	}
-
-	protected void collectionCleared(CollectionChangeEvent event) {
-		this.fireCollectionCleared(VALUES);  // nothing from original event to forward
-	}
-
-	protected void collectionChanged(CollectionChangeEvent event) {
-		this.fireCollectionChanged(VALUES);  // nothing from original event to forward
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionListValueModelAdapter.java
deleted file mode 100644
index 6c236ab78f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionListValueModelAdapter.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.ReadOnlyListIterator;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.internal.model.ChangeSupport;
-import org.eclipse.jpt.utility.internal.model.SingleAspectChangeSupport;
-import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
-import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * An adapter that allows us to make a CollectionValueModel behave like
- * a read-only ListValueModel, sorta.
- * 
- * To maintain a reasonably consistent appearance to client code, we
- * keep an internal list somewhat in synch with the wrapped collection.
- * 
- * NB: Since we only listen to the wrapped collection when we have
- * listeners ourselves and we can only stay in synch with the wrapped
- * collection while we are listening to it, results to various methods
- * (e.g. #size(), getItem(int)) will be unpredictable whenever
- * we do not have any listeners. This should not be too painful since,
- * most likely, client objects will also be listeners.
- */
-public class CollectionListValueModelAdapter<E>
-	extends AbstractModel
-	implements ListValueModel<E>
-{
-	/** The wrapped collection value model. */
-	protected final CollectionValueModel<? extends E> collectionHolder;
-
-	/** A listener that forwards any events fired by the collection holder. */
-	protected final CollectionChangeListener collectionChangeListener;
-
-	/**
-	 * Our internal list, which holds the same elements as
-	 * the wrapped collection, but keeps them in order.
-	 */
-	// we declare this an ArrayList so we can use #clone() and #ensureCapacity(int)
-	protected final ArrayList<E> list;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Wrap the specified CollectionValueModel.
-	 */
-	public CollectionListValueModelAdapter(CollectionValueModel<? extends E> collectionHolder) {
-		super();
-		if (collectionHolder == null) {
-			throw new NullPointerException();
-		}
-		this.collectionHolder = collectionHolder;
-		this.collectionChangeListener = this.buildCollectionChangeListener();
-		this.list = new ArrayList<E>();
-		// postpone building the list and listening to the underlying collection
-		// until we have listeners ourselves...
-	}
-
-
-	// ********** initialization **********
-
-	@Override
-	protected ChangeSupport buildChangeSupport() {
-		return new SingleAspectChangeSupport(this, ListChangeListener.class, LIST_VALUES);
-	}
-
-	/**
-	 * The wrapped collection has changed, forward an equivalent
-	 * list change event to our listeners.
-	 */
-	protected CollectionChangeListener buildCollectionChangeListener() {
-		return new CollectionChangeListener() {
-			public void itemsAdded(CollectionChangeEvent event) {
-				CollectionListValueModelAdapter.this.itemsAdded(event);
-			}
-			public void itemsRemoved(CollectionChangeEvent event) {
-				CollectionListValueModelAdapter.this.itemsRemoved(event);
-			}
-			public void collectionCleared(CollectionChangeEvent event) {
-				CollectionListValueModelAdapter.this.collectionCleared(event);
-			}
-			public void collectionChanged(CollectionChangeEvent event) {
-				CollectionListValueModelAdapter.this.collectionChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "collection change listener";
-			}
-		};
-	}
-
-
-	// ********** ListValueModel implementation **********
-
-	public Iterator<E> iterator() {
-		return this.listIterator();
-	}
-
-	public ListIterator<E> listIterator() {
-		return new ReadOnlyListIterator<E>(this.list);
-	}
-
-	public E get(int index) {
-		return this.list.get(index);
-	}
-
-	public int size() {
-		return this.list.size();
-	}
-
-	public Object[] toArray() {
-		return this.list.toArray();
-	}
-
-
-	// ********** extend change support **********
-
-	/**
-	 * Override to start listening to the collection holder if necessary.
-	 */
-	@Override
-	public void addListChangeListener(ListChangeListener listener) {
-		if (this.hasNoListeners()) {
-			this.engageModel();
-		}
-		super.addListChangeListener(listener);
-	}
-
-	/**
-	 * Override to start listening to the collection holder if necessary.
-	 */
-	@Override
-	public void addListChangeListener(String listName, ListChangeListener listener) {
-		if (listName == LIST_VALUES && this.hasNoListeners()) {
-			this.engageModel();
-		}
-		super.addListChangeListener(listName, listener);
-	}
-
-	/**
-	 * Override to stop listening to the collection holder if appropriate.
-	 */
-	@Override
-	public void removeListChangeListener(ListChangeListener listener) {
-		super.removeListChangeListener(listener);
-		if (this.hasNoListeners()) {
-			this.disengageModel();
-		}
-	}
-
-	/**
-	 * Override to stop listening to the collection holder if appropriate.
-	 */
-	@Override
-	public void removeListChangeListener(String listName, ListChangeListener listener) {
-		super.removeListChangeListener(listName, listener);
-		if (listName == LIST_VALUES && this.hasNoListeners()) {
-			this.disengageModel();
-		}
-	}
-
-
-	// ********** queries **********
-
-	protected boolean hasListeners() {
-		return this.hasAnyListChangeListeners(LIST_VALUES);
-	}
-
-	protected boolean hasNoListeners() {
-		return ! this.hasListeners();
-	}
-
-	/**
-	 * Return the index of the specified item, using object
-	 * identity instead of equality.
-	 */
-	protected int lastIdentityIndexOf(Object o) {
-		return this.lastIdentityIndexOf(o, this.list.size());
-	}
-	
-	/**
-	 * Return the last index of the specified item, starting just before the
-	 * the specified endpoint, and using object identity instead of equality.
-	 */
-	protected int lastIdentityIndexOf(Object o, int end) {
-		for (int i = end; i-- > 0; ) {
-			if (this.list.get(i) == o) {
-				return i;
-			}
-		}
-		return -1;
-	}
-	
-
-	// ********** behavior **********
-
-	protected void buildList() {
-		Iterator<? extends E> stream = this.collectionHolder.iterator();
-		// if the new collection is empty, do nothing
-		if (stream.hasNext()) {
-			this.list.ensureCapacity(this.collectionHolder.size());
-			while (stream.hasNext()) {
-				this.list.add(stream.next());
-			}
-			this.postBuildList();
-		}
-	}
-
-	/**
-	 * Allow subclasses to manipulate the internal list before
-	 * sending out change notification.
-	 */
-	protected void postBuildList() {
-		// the default is to do nothing...
-	}
-
-	protected void engageModel() {
-		this.collectionHolder.addCollectionChangeListener(CollectionValueModel.VALUES, this.collectionChangeListener);
-		// synch our list *after* we start listening to the collection holder,
-		// since its value might change when a listener is added
-		this.buildList();
-	}
-
-	protected void disengageModel() {
-		this.collectionHolder.removeCollectionChangeListener(CollectionValueModel.VALUES, this.collectionChangeListener);
-		// clear out the list when we are not listening to the collection holder
-		this.list.clear();
-	}
-
-	protected void itemsAdded(CollectionChangeEvent e) {
-		this.addItemsToList(this.indexToAddItems(), CollectionTools.list(this.items(e)), this.list, LIST_VALUES);
-	}
-	
-	protected int indexToAddItems() {
-		return this.list.size();
-	}
-
-	@SuppressWarnings("unchecked")
-	protected Iterator<E> items(CollectionChangeEvent e) {
-		return (Iterator<E>) e.items();
-	}
-
-	protected void itemsRemoved(CollectionChangeEvent e) {
-		// we have to remove the items individually,
-		// since they are probably not in sequence
-		for (Iterator<E> stream = this.items(e); stream.hasNext(); ) {
-			this.removeItemFromList(this.lastIdentityIndexOf(stream.next()), this.list, LIST_VALUES);
-		}
-	}
-
-	protected void collectionCleared(CollectionChangeEvent e) {
-		this.clearList(this.list, LIST_VALUES);
-	}
-	
-	/**
-	 * synchronize our internal list with the wrapped collection
-	 * and fire the appropriate events
-	 */
-	protected void collectionChanged(CollectionChangeEvent e) {
-		// put in empty check so we don't fire events unnecessarily
-		if ( ! this.list.isEmpty()) {
-			@SuppressWarnings("unchecked")
-			ArrayList<E> removedItems = (ArrayList<E>) this.list.clone();
-			this.list.clear();
-			this.fireItemsRemoved(LIST_VALUES, 0, removedItems);
-		}
-
-		this.buildList();
-		// put in empty check so we don't fire events unnecessarily
-		if ( ! this.list.isEmpty()) {
-			this.fireItemsAdded(LIST_VALUES, 0, this.list);
-		}
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.collectionHolder);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionPropertyValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionPropertyValueModelAdapter.java
deleted file mode 100644
index a28ff711db..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionPropertyValueModelAdapter.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
-import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-
-/**
- * This abstract class provides the infrastructure needed to wrap
- * a collection value model, "lazily" listen to it, and convert
- * its change notifications into property value model change
- * notifications.
- * 
- * Subclasses must override:
- * - #buildValue()
- *     to return the current property value, as derived from the
- *     current collection value
- * 
- * Subclasses might want to override:
- * - #itemsAdded(CollectionChangeEvent event)
- * - #itemsRemoved(CollectionChangeEvent event)
- * - #collectionCleared(CollectionChangeEvent event)
- * - #collectionChanged(CollectionChangeEvent event)
- *     to improve performance (by not recalculating the value, if possible)
- */
-public abstract class CollectionPropertyValueModelAdapter<T>
-	extends AspectPropertyValueModelAdapter<T>
-{
-	/** The wrapped collection value model. */
-	protected final CollectionValueModel<?> collectionHolder;
-
-	/** A listener that allows us to synch with changes to the wrapped collection holder. */
-	protected final CollectionChangeListener collectionChangeListener;
-
-
-	// ********** constructor/initialization **********
-
-	/**
-	 * Construct a property value model with the specified wrapped
-	 * collection value model.
-	 */
-	protected CollectionPropertyValueModelAdapter(CollectionValueModel<?> collectionHolder) {
-		super();
-		this.collectionHolder = collectionHolder;
-		this.collectionChangeListener = this.buildCollectionChangeListener();
-	}
-
-	protected CollectionChangeListener buildCollectionChangeListener() {
-		return new CollectionChangeListener() {
-			public void itemsAdded(CollectionChangeEvent event) {
-				CollectionPropertyValueModelAdapter.this.itemsAdded(event);
-			}		
-			public void itemsRemoved(CollectionChangeEvent event) {
-				CollectionPropertyValueModelAdapter.this.itemsRemoved(event);
-			}
-			public void collectionCleared(CollectionChangeEvent event) {
-				CollectionPropertyValueModelAdapter.this.collectionCleared(event);
-			}
-			public void collectionChanged(CollectionChangeEvent event) {
-				CollectionPropertyValueModelAdapter.this.collectionChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "collection change listener";
-			}
-		};
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Start listening to the collection holder.
-	 */
-	@Override
-	protected void engageModel_() {
-		this.collectionHolder.addCollectionChangeListener(CollectionValueModel.VALUES, this.collectionChangeListener);
-	}
-
-	/**
-	 * Stop listening to the collection holder.
-	 */
-	@Override
-	protected void disengageModel_() {
-		this.collectionHolder.removeCollectionChangeListener(CollectionValueModel.VALUES, this.collectionChangeListener);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.collectionHolder);
-	}
-
-	
-	// ********** collection change support **********
-
-	/**
-	 * Items were added to the wrapped collection holder;
-	 * propagate the change notification appropriately.
-	 */
-	protected void itemsAdded(CollectionChangeEvent event) {
-		// by default, simply recalculate the value and fire an event
-		this.propertyChanged();
-	}
-
-	/**
-	 * Items were removed from the wrapped collection holder;
-	 * propagate the change notification appropriately.
-	 */
-	protected void itemsRemoved(CollectionChangeEvent event) {
-		// by default, simply recalculate the value and fire an event
-		this.propertyChanged();
-	}
-
-	/**
-	 * The wrapped collection holder was cleared;
-	 * propagate the change notification appropriately.
-	 */
-	protected void collectionCleared(CollectionChangeEvent event) {
-		// by default, simply recalculate the value and fire an event
-		this.propertyChanged();
-	}
-
-	/**
-	 * The value of the wrapped collection holder has changed;
-	 * propagate the change notification appropriately.
-	 */
-	protected void collectionChanged(CollectionChangeEvent event) {
-		// by default, simply recalculate the value and fire an event
-		this.propertyChanged();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionValueModelWrapper.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionValueModelWrapper.java
deleted file mode 100644
index 4190fe1d41..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionValueModelWrapper.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Iterator;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.internal.model.ChangeSupport;
-import org.eclipse.jpt.utility.internal.model.SingleAspectChangeSupport;
-import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
-import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-
-/**
- * This abstract class provides the infrastructure needed to wrap
- * another collection value model, "lazily" listen to it, and propagate
- * its change notifications.
- */
-public abstract class CollectionValueModelWrapper<E>
-	extends AbstractModel
-{
-
-	/** The wrapped collection value model. */
-	protected final CollectionValueModel<? extends E> collectionHolder;
-
-	/** A listener that allows us to synch with changes to the wrapped collection holder. */
-	protected final CollectionChangeListener collectionChangeListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a collection value model with the specified wrapped
-	 * collection value model.
-	 */
-	protected CollectionValueModelWrapper(CollectionValueModel<? extends E> collectionHolder) {
-		super();
-		this.collectionHolder = collectionHolder;
-		this.collectionChangeListener = this.buildCollectionChangeListener();
-	}
-	
-
-	// ********** initialization **********
-
-	@Override
-	protected ChangeSupport buildChangeSupport() {
-		return new SingleAspectChangeSupport(this, CollectionChangeListener.class, CollectionValueModel.VALUES);
-	}
-
-	protected CollectionChangeListener buildCollectionChangeListener() {
-		return new CollectionChangeListener() {
-			public void itemsAdded(CollectionChangeEvent event) {
-				CollectionValueModelWrapper.this.itemsAdded(event);
-			}		
-			public void itemsRemoved(CollectionChangeEvent event) {
-				CollectionValueModelWrapper.this.itemsRemoved(event);
-			}
-			public void collectionCleared(CollectionChangeEvent event) {
-				CollectionValueModelWrapper.this.collectionCleared(event);
-			}
-			public void collectionChanged(CollectionChangeEvent event) {
-				CollectionValueModelWrapper.this.collectionChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "collection change listener";
-			}
-		};
-	}
-
-
-	// ********** extend change support **********
-
-	/**
-	 * Extend to start listening to the nested model if necessary.
-	 */
-	@Override
-	public synchronized void addCollectionChangeListener(CollectionChangeListener listener) {
-		if (this.hasNoCollectionChangeListeners(CollectionValueModel.VALUES)) {
-			this.engageModel();
-		}
-		super.addCollectionChangeListener(listener);
-	}
-	
-	/**
-	 * Extend to start listening to the nested model if necessary.
-	 */
-	@Override
-	public synchronized void addCollectionChangeListener(String collectionName, CollectionChangeListener listener) {
-		if (collectionName == CollectionValueModel.VALUES && this.hasNoCollectionChangeListeners(CollectionValueModel.VALUES)) {
-			this.engageModel();
-		}
-		super.addCollectionChangeListener(collectionName, listener);
-	}
-	
-	/**
-	 * Extend to stop listening to the nested model if necessary.
-	 */
-	@Override
-	public synchronized void removeCollectionChangeListener(CollectionChangeListener listener) {
-		super.removeCollectionChangeListener(listener);
-		if (this.hasNoCollectionChangeListeners(CollectionValueModel.VALUES)) {
-			this.disengageModel();
-		}
-	}
-	
-	/**
-	 * Extend to stop listening to the nested model if necessary.
-	 */
-	@Override
-	public synchronized void removeCollectionChangeListener(String collectionName, CollectionChangeListener listener) {
-		super.removeCollectionChangeListener(collectionName, listener);
-		if (collectionName == CollectionValueModel.VALUES && this.hasNoCollectionChangeListeners(CollectionValueModel.VALUES)) {
-			this.disengageModel();
-		}
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Start listening to the collection holder.
-	 */
-	protected void engageModel() {
-		this.collectionHolder.addCollectionChangeListener(CollectionValueModel.VALUES, this.collectionChangeListener);
-	}
-
-	/**
-	 * Stop listening to the collection holder.
-	 */
-	protected void disengageModel() {
-		this.collectionHolder.removeCollectionChangeListener(CollectionValueModel.VALUES, this.collectionChangeListener);
-	}
-
-	// minimize scope of suppressed warnings
-	@SuppressWarnings("unchecked")
-	protected Iterator<E> items(CollectionChangeEvent event) {
-		return (Iterator<E>) event.items();
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.collectionHolder);
-	}
-
-
-	// ********** collection change support **********
-
-	/**
-	 * Items were added to the wrapped collection holder;
-	 * propagate the change notification appropriately.
-	 */
-	protected abstract void itemsAdded(CollectionChangeEvent event);
-
-	/**
-	 * Items were removed from the wrapped collection holder;
-	 * propagate the change notification appropriately.
-	 */
-	protected abstract void itemsRemoved(CollectionChangeEvent event);
-
-	/**
-	 * The wrapped collection holder was cleared;
-	 * propagate the change notification appropriately.
-	 */
-	protected abstract void collectionCleared(CollectionChangeEvent event);
-
-	/**
-	 * The value of the wrapped collection holder has changed;
-	 * propagate the change notification appropriately.
-	 */
-	protected abstract void collectionChanged(CollectionChangeEvent event);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CompositeCollectionValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CompositeCollectionValueModel.java
deleted file mode 100644
index 815e48e54c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CompositeCollectionValueModel.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.NullList;
-import org.eclipse.jpt.utility.internal.Transformer;
-import org.eclipse.jpt.utility.internal.iterators.CompositeIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
-import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * A <code>CompositeCollectionValueModel</code> wraps another
- * <code>CollectionValueModel</code> and uses a <code>Transformer</code>
- * to convert each item in the wrapped collection to yet another
- * <code>CollectionValueModel</code>. This composite collection contains
- * the combined items from all these component collections.
- * 
- * NB: The wrapped collection must be an "identity set" that does not
- * contain the same item twice or this class will throw an exception.
- * 
- * Terminology:
- * - sources - the items in the wrapped collection value model; these
- *    are converted into component CVMs by the transformer
- * - component CVMs - the component collection value models that are combined
- *    by this composite collection value model
- * - items - the items held by the component CVMs
- */
-public class CompositeCollectionValueModel<E1, E2>
-	extends CollectionValueModelWrapper<E1>
-	implements CollectionValueModel<E2>
-{
-	/**
-	 * This is the (optional) user-supplied object that transforms
-	 * the items in the wrapped collection to collection value models.
-	 */
-	private final Transformer<E1, CollectionValueModel<E2>> transformer;
-
-	/**
-	 * Cache of the component collection value models that
-	 * were generated by the transformer; keyed by the item
-	 * in the wrapped collection that was passed to the transformer.
-	 */
-	private final IdentityHashMap<E1, CollectionValueModel<E2>> componentCVMs;
-
-	/**
-	 * Cache of the collections corresponding to the component
-	 * collection value models above; keyed by the component
-	 * collection value models.
-	 * Use ArrayLists so we can use ArrayList-specific methods
-	 * (e.g. #clone() and #ensureCapacity()).
-	 */
-	private final IdentityHashMap<CollectionValueModel<E2>, ArrayList<E2>> collections;
-
-	/** Listener that listens to all the component collection value models. */
-	private final CollectionChangeListener componentCVMListener;
-
-	/** Cache the size of the composite collection. */
-	private int size;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a collection value model with the specified wrapped
-	 * collection value model. Use this constructor if
-	 *     - the wrapped collection value model already contains other
-	 *       collection value models or
-	 *     - you want to override the <code>transform(E1)</code> method
-	 *       instead of building a <code>Transformer</code>
-	 */
-	public CompositeCollectionValueModel(CollectionValueModel<? extends E1> collectionHolder) {
-		this(collectionHolder, Transformer.Null.<E1, CollectionValueModel<E2>>instance());
-	}
-
-	/**
-	 * Construct a collection value model with the specified wrapped
-	 * collection value model and transformer.
-	 */
-	public CompositeCollectionValueModel(CollectionValueModel<? extends E1> collectionHolder, Transformer<E1, CollectionValueModel<E2>> transformer) {
-		super(collectionHolder);
-		this.transformer = transformer;
-		this.componentCVMs = new IdentityHashMap<E1, CollectionValueModel<E2>>();
-		this.collections = new IdentityHashMap<CollectionValueModel<E2>, ArrayList<E2>>();
-		this.componentCVMListener = this.buildComponentListener();
-		this.size = 0;
-	}
-
-	/**
-	 * Construct a collection value model with the specified wrapped
-	 * list value model. Use this constructor if
-	 *     - the wrapped list value model already contains collection
-	 *       value models or
-	 *     - you want to override the <code>transform(E1)</code> method
-	 *       instead of building a <code>Transformer</code>
-	 */
-	public CompositeCollectionValueModel(ListValueModel<? extends E1> listHolder) {
-		this(new ListCollectionValueModelAdapter<E1>(listHolder));
-	}
-
-	/**
-	 * Construct a collection value model with the specified wrapped
-	 * list value model and transformer.
-	 */
-	public CompositeCollectionValueModel(ListValueModel<? extends E1> listHolder, Transformer<E1, CollectionValueModel<E2>> transformer) {
-		this(new ListCollectionValueModelAdapter<E1>(listHolder), transformer);
-	}
-
-	/**
-	 * Construct a collection value model with the specified, unchanging, wrapped
-	 * collection. Use this constructor if
-	 *     - the wrapped collection already contains collection
-	 *       value models or
-	 *     - you want to override the <code>transform(E1)</code> method
-	 *       instead of building a <code>Transformer</code>
-	 */
-	public CompositeCollectionValueModel(Collection<? extends E1> collection) {
-		this(new StaticCollectionValueModel<E1>(collection));
-	}
-
-	/**
-	 * Construct a collection value model with the specified, unchanging, wrapped
-	 * collection and transformer.
-	 */
-	public CompositeCollectionValueModel(Collection<? extends E1> collection, Transformer<E1, CollectionValueModel<E2>> transformer) {
-		this(new StaticCollectionValueModel<E1>(collection), transformer);
-	}
-
-
-	// ********** initialization **********
-
-	protected CollectionChangeListener buildComponentListener() {
-		return new CollectionChangeListener() {
-			public void itemsAdded(CollectionChangeEvent event) {
-				CompositeCollectionValueModel.this.componentItemsAdded(event);
-			}		
-			public void itemsRemoved(CollectionChangeEvent event) {
-				CompositeCollectionValueModel.this.componentItemsRemoved(event);
-			}
-			public void collectionCleared(CollectionChangeEvent event) {
-				CompositeCollectionValueModel.this.componentCollectionCleared(event);
-			}
-			public void collectionChanged(CollectionChangeEvent event) {
-				CompositeCollectionValueModel.this.componentCollectionChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "component listener";
-			}
-		};
-	}
-
-
-	// ********** CollectionValueModel implementation **********
-
-	public Iterator<E2> iterator() {
-		return new CompositeIterator<E2>(this.buildCollectionsIterators());
-	}
-
-	protected Iterator<Iterator<E2>> buildCollectionsIterators() {
-		return new TransformationIterator<ArrayList<E2>, Iterator<E2>>(this.collections.values().iterator()) {
-			@Override
-			protected Iterator<E2> transform(ArrayList<E2> next) {
-				return next.iterator();
-			}
-		};
-	}
-
-	public int size() {
-		return this.size;
-	}
-
-
-	// ********** CollectionValueModelWrapper overrides/implementation **********
-
-	@Override
-	protected void engageModel() {
-		super.engageModel();
-		// synch our cache *after* we start listening to the wrapped collection,
-		// since its value might change when a listener is added
-		this.addAllComponentSources();
-	}
-
-	/**
-	 * Transform all the sources to collection value models
-	 * and add their items to our cache, with no event notification.
-	 */
-	protected void addAllComponentSources() {
-		for (E1 source : this.collectionHolder) {
-			this.addComponentSource(source, NullList.<E2>instance());
-		}
-	}
-
-	@Override
-	protected void disengageModel() {
-		super.disengageModel();
-		// stop listening to the components...
-		for (CollectionValueModel<E2> componentCVM : this.componentCVMs.values()) {
-			componentCVM.removeCollectionChangeListener(VALUES, this.componentCVMListener);
-		}
-		// ...and clear the cache
-		this.componentCVMs.clear();
-		this.collections.clear();
-		this.size = 0;
-	}
-
-	/**
-	 * Some component sources were added;
-	 * add their corresponding items to our cache.
-	 */
-	@Override
-	protected void itemsAdded(CollectionChangeEvent event) {
-		ArrayList<E2> addedItems = new ArrayList<E2>();
-		for (Iterator<E1> stream = this.items(event); stream.hasNext(); ) {
-			this.addComponentSource(stream.next(), addedItems);
-		}
-		this.fireItemsAdded(VALUES, addedItems);
-	}
-
-	/**
-	 * Transform the specified source to a collection value model
-	 * and add its items to our cache and the "collecting parameter".
-	 */
-	protected void addComponentSource(E1 source, List<E2> addedItems) {
-		CollectionValueModel<E2> componentCVM = this.transform(source);
-		if (this.componentCVMs.put(source, componentCVM) != null) {
-			throw new IllegalStateException("duplicate component: " + source);
-		}
-		componentCVM.addCollectionChangeListener(VALUES, this.componentCVMListener);
-		ArrayList<E2> componentCollection = new ArrayList<E2>(componentCVM.size());
-		if (this.collections.put(componentCVM, componentCollection) != null) {
-			throw new IllegalStateException("duplicate collection: " + source);
-		}
-		this.addComponentItems(componentCVM, componentCollection);
-		addedItems.addAll(componentCollection);
-	}
-
-	/**
-	 * Add the items in the specified component CVM to the specified component
-	 * collection.
-	 */
-	protected void addComponentItems(CollectionValueModel<E2> componentCVM, ArrayList<E2> componentCollection) {
-		int itemsSize = componentCVM.size();
-		this.size += itemsSize;
-		componentCollection.ensureCapacity(componentCollection.size() + itemsSize);
-		CollectionTools.addAll(componentCollection, componentCVM);
-	}
-
-	/**
-	 * Some component sources were removed;
-	 * remove their corresponding items from our cache.
-	 */
-	@Override
-	protected void itemsRemoved(CollectionChangeEvent event) {
-		ArrayList<E2> removedItems = new ArrayList<E2>();
-		for (Iterator<E1> stream = this.items(event); stream.hasNext(); ) {
-			this.removeComponentSource(stream.next(), removedItems);
-		}
-		this.fireItemsRemoved(VALUES, removedItems);
-	}
-
-	/**
-	 * Remove the items corresponding to the specified source
-	 * from our cache.
-	 */
-	protected void removeComponentSource(E1 source, List<E2> removedItems) {
-		CollectionValueModel<E2> componentCVM = this.componentCVMs.remove(source);
-		if (componentCVM == null) {
-			throw new IllegalStateException("missing component: " + source);
-		}
-		componentCVM.removeCollectionChangeListener(VALUES, this.componentCVMListener);
-		ArrayList<E2> componentCollection = this.collections.remove(componentCVM);
-		if (componentCollection == null) {
-			throw new IllegalStateException("missing collection: " + source);
-		}
-		removedItems.addAll(componentCollection);
-		this.removeComponentItems(componentCollection);
-	}
-
-	/**
-	 * Update our size and collection cache.
-	 */
-	protected void removeComponentItems(ArrayList<E2> componentCollection) {
-		this.size -= componentCollection.size();
-		componentCollection.clear();
-	}
-
-	/**
-	 * The component sources cleared;
-	 * clear our cache.
-	 */
-	@Override
-	protected void collectionCleared(CollectionChangeEvent event) {
-		this.removeAllComponentSources();
-		this.fireCollectionCleared(VALUES);
-	}
-
-	protected void removeAllComponentSources() {
-		// copy the keys so we don't eat our own tail
-		ArrayList<E1> copy = new ArrayList<E1>(this.componentCVMs.keySet());
-		for (E1 source : copy) {
-			this.removeComponentSource(source, NullList.<E2>instance());
-		}
-	}
-
-	/**
-	 * The component sources changed;
-	 * rebuild our cache.
-	 */
-	@Override
-	protected void collectionChanged(CollectionChangeEvent event) {
-		this.removeAllComponentSources();
-		this.addAllComponentSources();
-		this.fireCollectionChanged(VALUES);
-	}
-
-
-	// ********** internal methods **********
-
-	/**
-	 * Transform the specified object into a collection value model.
-	 * <p>
-	 * This method can be overridden by a subclass as an
-	 * alternative to building a <code>Transformer</code>.
-	 */
-	protected CollectionValueModel<E2> transform(E1 value) {
-		return this.transformer.transform(value);
-	}
-
-	/**
-	 * One of the component collections had items added;
-	 * synchronize our caches.
-	 */
-	protected void componentItemsAdded(CollectionChangeEvent event) {
-		int itemsSize = event.itemsSize();
-		this.size += itemsSize;
-
-		ArrayList<E2> componentCollection = this.collections.get(this.componentCVM(event));
-		componentCollection.ensureCapacity(componentCollection.size() + itemsSize);
-
-		this.addItemsToCollection(this.componentItems(event), componentCollection, VALUES);
-	}
-
-	/**
-	 * One of the component collections had items removed;
-	 * synchronize our caches.
-	 */
-	protected void componentItemsRemoved(CollectionChangeEvent event) {
-		this.size -= event.itemsSize();
-		ArrayList<E2> componentCollection = this.collections.get(this.componentCVM(event));
-		this.removeItemsFromCollection(this.componentItems(event), componentCollection, VALUES);
-	}
-
-	/**
-	 * One of the component collections was cleared;
-	 * synchronize our caches by clearing out the appropriate
-	 * collection.
-	 */
-	protected void componentCollectionCleared(CollectionChangeEvent event) {
-		ArrayList<E2> componentCollection = this.collections.get(this.componentCVM(event));
-		ArrayList<E2> removedItems = new ArrayList<E2>(componentCollection);
-		this.removeComponentItems(componentCollection);
-		this.fireItemsRemoved(VALUES, removedItems);
-	}
-
-	/**
-	 * One of the component collections changed;
-	 * synchronize our caches by clearing out the appropriate
-	 * collection and then rebuilding it.
-	 */
-	protected void componentCollectionChanged(CollectionChangeEvent event) {
-		CollectionValueModel<E2> componentCVM = this.componentCVM(event);
-		ArrayList<E2> componentCollection = this.collections.get(componentCVM);
-		this.removeComponentItems(componentCollection);
-		this.addComponentItems(componentCVM, componentCollection);
-		this.fireCollectionChanged(VALUES);
-	}
-
-	// minimize scope of suppressed warnings
-	@SuppressWarnings("unchecked")
-	protected Iterator<E2> componentItems(CollectionChangeEvent event) {
-		return (Iterator<E2>) event.items();
-	}
-
-	// minimize scope of suppressed warnings
-	@SuppressWarnings("unchecked")
-	protected CollectionValueModel<E2> componentCVM(CollectionChangeEvent event) {
-		return (CollectionValueModel<E2>) event.getSource();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CompositeListValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CompositeListValueModel.java
deleted file mode 100644
index 3609d5a4dd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CompositeListValueModel.java
+++ /dev/null
@@ -1,574 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.Transformer;
-import org.eclipse.jpt.utility.internal.iterators.ReadOnlyCompositeListIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationListIterator;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * A <code>CompositeListValueModel</code> wraps another
- * <code>ListValueModel</code> and uses a <code>Transformer</code>
- * to convert each item in the wrapped list to yet another
- * <code>ListValueModel</code>. This composite list contains
- * the combined items from all these component lists.
- * 
- * Terminology:
- * - sources - the items in the wrapped list value model; these
- *    are converted into component LVMs by the transformer
- * - componentLVMs - the component list value models that are combined
- *    by this composite list value model
- * - items - the items held by the component LVMs
- */
-public class CompositeListValueModel<E1, E2>
-	extends ListValueModelWrapper<E1>
-	implements ListValueModel<E2>
-{
-	/**
-	 * This is the (optional) user-supplied object that transforms
-	 * the items in the wrapped list to list value models.
-	 */
-	private final Transformer<E1, ListValueModel<E2>> transformer;
-
-	/**
-	 * Cache of the sources, component LVMs, lists.
-	 */
-	private final ArrayList<Info> infoList;
-	protected class Info {
-		// the object passed to the transformer
-		final E1 source;
-		// the list value model generated by the transformer
-		final ListValueModel<E2> componentLVM;
-		// cache of the items held by the component LVM
-		final ArrayList<E2> items;
-		// the component LVM's beginning index within the composite LVM
-		int begin;
-		Info(E1 source, ListValueModel<E2> componentLVM, ArrayList<E2> items, int begin) {
-			super();
-			this.source = source;
-			this.componentLVM = componentLVM;
-			this.items = items;
-			this.begin = begin;
-		}
-	}
-
-	/** Listener that listens to all the component list value models. */
-	private final ListChangeListener componentLVMListener;
-
-	/** Cache the size of the composite list. */
-	private int size;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a list value model with the specified wrapped
-	 * list value model. Use this constructor if
-	 *     - the wrapped list value model already contains other
-	 *       list value models or
-	 *     - you want to override the <code>transform(E1)</code> method
-	 *       instead of building a <code>Transformer</code>
-	 */
-	public CompositeListValueModel(ListValueModel<? extends E1> listHolder) {
-		this(listHolder, Transformer.Null.<E1, ListValueModel<E2>>instance());
-	}
-
-	/**
-	 * Construct a list value model with the specified wrapped
-	 * list value model and transformer.
-	 */
-	public CompositeListValueModel(ListValueModel<? extends E1> listHolder, Transformer<E1, ListValueModel<E2>> transformer) {
-		super(listHolder);
-		this.transformer = transformer;
-		this.infoList = new ArrayList<Info>();
-		this.componentLVMListener = this.buildComponentLVMListener();
-		this.size = 0;
-	}
-
-	/**
-	 * Construct a list value model with the specified, unchanging, wrapped
-	 * list. Use this constructor if
-	 *     - the wrapped list already contains list value models or
-	 *     - you want to override the <code>transform(E1)</code> method
-	 *       instead of building a <code>Transformer</code>
-	 */
-	public CompositeListValueModel(List<? extends E1> list) {
-		this(new StaticListValueModel<E1>(list));
-	}
-
-	/**
-	 * Construct a list value model with the specified, unchanging, wrapped
-	 * list and transformer.
-	 */
-	public CompositeListValueModel(List<? extends E1> list, Transformer<E1, ListValueModel<E2>> transformer) {
-		this(new StaticListValueModel<E1>(list), transformer);
-	}
-
-
-	// ********** initialization **********
-
-	protected ListChangeListener buildComponentLVMListener() {
-		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent event) {
-				CompositeListValueModel.this.componentItemsAdded(event);
-			}		
-			public void itemsRemoved(ListChangeEvent event) {
-				CompositeListValueModel.this.componentItemsRemoved(event);
-			}
-			public void itemsReplaced(ListChangeEvent event) {
-				CompositeListValueModel.this.componentItemsReplaced(event);
-			}
-			public void itemsMoved(ListChangeEvent event) {
-				CompositeListValueModel.this.componentItemsMoved(event);
-			}
-			public void listCleared(ListChangeEvent event) {
-				CompositeListValueModel.this.componentListCleared(event);
-			}
-			public void listChanged(ListChangeEvent event) {
-				CompositeListValueModel.this.componentListChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "component LVM listener";
-			}
-		};
-	}
-
-
-	// ********** ListValueModel implementation **********
-
-	public E2 get(int index) {
-		if ((index < 0) || (index >= this.size)) {
-			throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + this.size);
-		}
-		// move backwards through the info list
-		for (int i = this.infoList.size(); i-- > 0; ) {
-			Info info = this.infoList.get(i);
-			if (index >= info.begin) {
-				return info.items.get(index - info.begin);
-			}
-		}
-		throw new IllegalStateException();  // something is wack
-	}
-
-	public Iterator<E2> iterator() {
-		return this.listIterator();
-	}
-
-	public ListIterator<E2> listIterator() {
-		return new ReadOnlyCompositeListIterator<E2>(this.buildListsIterators());
-	}
-
-	protected ListIterator<ListIterator<E2>> buildListsIterators() {
-		return new TransformationListIterator<Info, ListIterator<E2>>(this.infoList.listIterator()) {
-			@Override
-			protected ListIterator<E2> transform(Info info) {
-				return info.items.listIterator();
-			}
-		};
-	}
-
-	public int size() {
-		return this.size;
-	}
-
-	public Object[] toArray() {
-		return CollectionTools.array(this.listIterator(), this.size);
-	}
-
-
-	// ********** ListValueModelWrapper overrides/implementation **********
-
-	@Override
-	protected void engageModel() {
-		super.engageModel();
-		// synch our cache *after* we start listening to the wrapped list,
-		// since its value might change when a listener is added
-		this.addComponentSources(0, this.listHolder.listIterator(), this.listHolder.size());
-	}
-
-	@Override
-	protected void disengageModel() {
-		super.disengageModel();
-		// stop listening to the component LVMs...
-		for (Info info : this.infoList) {
-			info.componentLVM.removeListChangeListener(LIST_VALUES, this.componentLVMListener);
-		}
-		// ...and clear the cache
-		this.infoList.clear();
-		this.size = 0;
-	}
-
-	/**
-	 * Some component sources were added; update our cache.
-	 */
-	@Override
-	protected void itemsAdded(ListChangeEvent event) {
-		this.addComponentSources(event.getIndex(), this.items(event), event.itemsSize(), true);  // true = fire event
-	}
-
-	/**
-	 * Do not fire an event.
-	 */
-	protected void addComponentSources(int addedSourcesIndex, ListIterator<? extends E1> addedSources, int addedSourcesSize) {
-		this.addComponentSources(addedSourcesIndex, addedSources, addedSourcesSize, false);  // false = do not fire event
-	}
-
-	/**
-	 * Add infos corresponding to the specified sources to our cache.
-	 * Fire the appropriate event if requested.
-	 */
-	protected void addComponentSources(int addedSourcesIndex, ListIterator<? extends E1> addedSources, int addedSourcesSize, boolean fireEvent) {
-		ArrayList<Info> newInfoList = new ArrayList<Info>(addedSourcesSize);
-		// the 'items' are either tacked on to the end or
-		// at the 'begin' index of the first 'info' that is being pushed back
-		int newItemsIndex = (addedSourcesIndex == this.infoList.size()) ? this.size : this.infoList.get(addedSourcesIndex).begin;
-
-		int begin = newItemsIndex;
-		while (addedSources.hasNext()) {
-			E1 source = addedSources.next();
-			ListValueModel<E2> componentLVM = this.transform(source);
-			componentLVM.addListChangeListener(LIST_VALUES, this.componentLVMListener);
-			ArrayList<E2> items = new ArrayList<E2>(componentLVM.size());
-			CollectionTools.addAll(items, componentLVM.listIterator());
-			newInfoList.add(new Info(source, componentLVM, items, begin));
-			begin += items.size();
-		}
-		this.infoList.addAll(addedSourcesIndex, newInfoList);
-		int newItemsSize = begin - newItemsIndex;
-		this.size += newItemsSize;
-
-		// bump the 'begin' index for all the infos that were pushed back by the insert
-		int movedInfosIndex = addedSourcesIndex + addedSourcesSize;
-		for (int i = movedInfosIndex; i < this.infoList.size(); i++) {
-			this.infoList.get(i).begin += newItemsSize;
-		}
-
-		if (fireEvent) {
-			ArrayList<E2> newItems = new ArrayList<E2>(newItemsSize);
-			for (int i = addedSourcesIndex; i < movedInfosIndex; i++) {
-				newItems.addAll(this.infoList.get(i).items);
-			}
-			this.fireItemsAdded(LIST_VALUES, newItemsIndex, newItems);
-		}
-	}
-
-	/**
-	 * Some component sources were removed; update our cache.
-	 */
-	@Override
-	protected void itemsRemoved(ListChangeEvent event) {
-		this.removeComponentSources(event.getIndex(), event.itemsSize(), true);  // true = fire event
-	}
-
-	/**
-	 * Do not fire an event.
-	 */
-	protected void removeComponentSources(int removedSourcesIndex, int removedSourcesSize) {
-		this.removeComponentSources(removedSourcesIndex, removedSourcesSize, false);  // false = do not fire event
-	}
-
-	/**
-	 * Remove the infos corresponding to the specified sources from our cache.
-	 */
-	protected void removeComponentSources(int removedSourcesIndex, int removedSourcesSize, boolean fireEvent) {
-		int removedItemsIndex = this.infoList.get(removedSourcesIndex).begin;
-		int movedSourcesIndex = removedSourcesIndex + removedSourcesSize;
-		int movedItemsIndex = (movedSourcesIndex == this.infoList.size()) ? this.size : this.infoList.get(movedSourcesIndex).begin;
-		int removedItemsSize = movedItemsIndex - removedItemsIndex;
-		this.size -= removedItemsSize;
-
-		List<Info> subList = this.infoList.subList(removedSourcesIndex, removedSourcesIndex + removedSourcesSize);
-		ArrayList<Info> removedInfoList = new ArrayList<Info>(subList);  // make a copy
-		subList.clear();
-
-		// decrement the 'begin' index for all the infos that were moved forward by the deletes
-		for (int i = removedSourcesIndex; i < this.infoList.size(); i++) {
-			this.infoList.get(i).begin -= removedItemsSize;
-		}
-
-		for (Info removedInfo : removedInfoList) {
-			removedInfo.componentLVM.removeListChangeListener(LIST_VALUES, this.componentLVMListener);
-		}
-
-		if (fireEvent) {
-			ArrayList<E2> removedItems = new ArrayList<E2>(removedItemsSize);
-			for (Info removedInfo : removedInfoList) {
-				removedItems.addAll(removedInfo.items);
-			}
-			this.fireItemsRemoved(LIST_VALUES, removedItemsIndex, removedItems);
-		}
-	}
-
-	/**
-	 * Some component sources were replaced; update our cache.
-	 */
-	@Override
-	protected void itemsReplaced(ListChangeEvent event) {
-		this.replaceComponentSources(event.getIndex(), this.items(event), event.itemsSize(), true);  // true = fire event
-	}
-
-	/**
-	 * Replaced component sources will not (typically) map to a set of replaced
-	 * items, so we remove and add the corresponding lists of items, resulting in
-	 * two events.
-	 */
-	protected void replaceComponentSources(int replacedSourcesIndex, ListIterator<? extends E1> newSources, int replacedSourcesSize, boolean fireEvent) {
-		this.removeComponentSources(replacedSourcesIndex, replacedSourcesSize, fireEvent);
-		this.addComponentSources(replacedSourcesIndex, newSources, replacedSourcesSize, fireEvent);
-	}
-
-	/**
-	 * Some component sources were moved; update our cache.
-	 */
-	@Override
-	protected void itemsMoved(ListChangeEvent event) {
-		this.moveComponentSources(event.getTargetIndex(), event.getSourceIndex(), event.getMoveLength(), true);  // true = fire event
-	}
-
-	protected void moveComponentSources(int targetSourcesIndex, int sourceSourcesIndex, int movedSourcesLength, boolean fireEvent) {
-		int sourceItemsIndex = this.infoList.get(sourceSourcesIndex).begin;
-
-		int nextSourceSourceIndex = sourceSourcesIndex + movedSourcesLength;
-		int nextSourceItemIndex = (nextSourceSourceIndex == this.infoList.size()) ? this.size : this.infoList.get(nextSourceSourceIndex).begin;
-		int moveItemsLength = nextSourceItemIndex - sourceItemsIndex;
-
-		int targetItemsIndex = -1;
-		if (sourceSourcesIndex > targetSourcesIndex) {
-			// move from high to low index
-			targetItemsIndex = this.infoList.get(targetSourcesIndex).begin;
-		} else {
-			// move from low to high index (higher items move down during move)
-			int nextTargetSourceIndex = targetSourcesIndex + movedSourcesLength;
-			targetItemsIndex = (nextTargetSourceIndex == this.infoList.size()) ? this.size : this.infoList.get(nextTargetSourceIndex).begin;
-			targetItemsIndex = targetItemsIndex - moveItemsLength;
-		}
-
-		CollectionTools.move(this.infoList, targetSourcesIndex, sourceSourcesIndex, movedSourcesLength);
-
-		// update the 'begin' indexes of all the affected 'infos'
-		int min = Math.min(targetSourcesIndex, sourceSourcesIndex);
-		int max = Math.max(targetSourcesIndex, sourceSourcesIndex) + movedSourcesLength;
-		int begin = Math.min(targetItemsIndex, sourceItemsIndex);
-		for (int i = min; i < max; i++) {
-			Info info = this.infoList.get(i);
-			info.begin = begin;
-			begin += info.componentLVM.size();
-		}
-
-		if (fireEvent) {
-			this.fireItemsMoved(LIST_VALUES, targetItemsIndex, sourceItemsIndex, moveItemsLength);
-		}
-	}
-
-	/**
-	 * The component sources were cleared; clear our cache.
-	 */
-	@Override
-	protected void listCleared(ListChangeEvent event) {
-		this.removeComponentSources(0, this.infoList.size());
-		this.fireListCleared(LIST_VALUES);
-	}
-
-	/**
-	 * The component sources changed; rebuild our cache.
-	 */
-	@Override
-	protected void listChanged(ListChangeEvent event) {
-		this.removeComponentSources(0, this.infoList.size());
-		this.addComponentSources(0, this.listHolder.listIterator(), this.listHolder.size());
-		this.fireListChanged(LIST_VALUES);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(CollectionTools.list(this.listIterator(), this.size));
-	}
-
-
-	// ********** internal methods **********
-
-	/**
-	 * Transform the specified object into a list value model.
-	 * <p>
-	 * This method can be overridden by a subclass as an
-	 * alternative to building a <code>Transformer</code>.
-	 */
-	protected ListValueModel<E2> transform(E1 value) {
-		return this.transformer.transform(value);
-	}
-
-	/**
-	 * Return the index of the specified component LVM.
-	 */
-	protected int indexOf(ListValueModel<E2> componentLVM) {
-		for (int i = 0; i < this.infoList.size(); i++) {
-			if (this.infoList.get(i).componentLVM == componentLVM) {
-				return i;
-			}
-		}
-		throw new IllegalArgumentException("invalid component LVM: " + componentLVM);
-	}
-
-	/**
-	 * Return the index of the specified event's component LVM.
-	 */
-	protected int indexFor(ListChangeEvent event) {
-		return this.indexOf(this.componentLVM(event));
-	}
-
-	/**
-	 * Items were added to one of the component lists;
-	 * synchronize our cache.
-	 */
-	protected void componentItemsAdded(ListChangeEvent event) {
-		// update the affected 'begin' indices
-		int componentLVMIndex = this.indexFor(event);
-		int newItemsSize = event.itemsSize();
-		for (int i = componentLVMIndex + 1; i < this.infoList.size(); i++) {
-			this.infoList.get(i).begin += newItemsSize;
-		}
-		this.size += newItemsSize;
-
-		// synchronize the cached list
-		Info info = this.infoList.get(componentLVMIndex);
-		CollectionTools.addAll(info.items, event.getIndex(), this.componentItems(event), event.itemsSize());
-
-		// translate the event
-		this.fireItemsAdded(event.cloneWithSource(this, LIST_VALUES, info.begin));
-	}
-
-	/**
-	 * Items were removed from one of the component lists;
-	 * synchronize our cache.
-	 */
-	protected void componentItemsRemoved(ListChangeEvent event) {
-		// update the affected 'begin' indices
-		int componentLVMIndex = this.indexFor(event);
-		int removedItemsSize = event.itemsSize();
-		for (int i = componentLVMIndex + 1; i < this.infoList.size(); i++) {
-			this.infoList.get(i).begin -= removedItemsSize;
-		}
-		this.size -= removedItemsSize;
-
-		// synchronize the cached list
-		Info info = this.infoList.get(componentLVMIndex);
-		int itemIndex = event.getIndex();
-		info.items.subList(itemIndex, itemIndex + event.itemsSize()).clear();
-
-		// translate the event
-		this.fireItemsRemoved(event.cloneWithSource(this, LIST_VALUES, info.begin));
-	}
-
-	/**
-	 * Items were replaced in one of the component lists;
-	 * synchronize our cache.
-	 */
-	protected void componentItemsReplaced(ListChangeEvent event) {
-		// no changes to the 'begin' indices or size
-
-		// synchronize the cached list
-		int componentLVMIndex = this.indexFor(event);
-		Info info = this.infoList.get(componentLVMIndex);
-		int i = event.getIndex();
-		for (Iterator<E2> stream = this.componentItems(event); stream.hasNext(); ) {
-			info.items.set(i++, stream.next());
-		}
-
-		// translate the event
-		this.fireItemsReplaced(event.cloneWithSource(this, LIST_VALUES, info.begin));
-	}
-
-	/**
-	 * Items were moved in one of the component lists;
-	 * synchronize our cache.
-	 */
-	protected void componentItemsMoved(ListChangeEvent event) {
-		// no changes to the 'begin' indices or size
-
-		// synchronize the cached list
-		int componentLVMIndex = this.indexFor(event);
-		Info info = this.infoList.get(componentLVMIndex);
-		CollectionTools.move(info.items, event.getTargetIndex(), event.getSourceIndex(), event.getMoveLength());
-
-		// translate the event
-		this.fireItemsMoved(event.cloneWithSource(this, LIST_VALUES, info.begin));
-	}
-
-	/**
-	 * One of the component lists was cleared;
-	 * synchronize our cache.
-	 */
-	protected void componentListCleared(ListChangeEvent event) {
-		int componentLVMIndex = this.indexFor(event);
-		this.clearComponentList(componentLVMIndex, this.infoList.get(componentLVMIndex));
-	}
-
-	protected void clearComponentList(int componentLVMIndex, Info info) {
-		// update the affected 'begin' indices
-		int removedItemsSize = info.items.size();
-		for (int i = componentLVMIndex + 1; i < this.infoList.size(); i++) {
-			this.infoList.get(i).begin -= removedItemsSize;
-		}
-		this.size -= removedItemsSize;
-
-		// synchronize the cached list
-		ArrayList<E2> items = new ArrayList<E2>(info.items);
-		info.items.clear();
-
-		// translate the event
-		this.fireItemsRemoved(LIST_VALUES, info.begin, items);
-	}
-
-	/**
-	 * One of the component lists changed;
-	 * synchronize our cache by clearing out the appropriate
-	 * list and rebuilding it.
-	 */
-	protected void componentListChanged(ListChangeEvent event) {
-		int componentLVMIndex = this.indexFor(event);
-		Info info = this.infoList.get(componentLVMIndex);
-		this.clearComponentList(componentLVMIndex, info);
-
-		// update the affected 'begin' indices
-		int newItemsSize = info.componentLVM.size();
-		for (int i = componentLVMIndex + 1; i < this.infoList.size(); i++) {
-			this.infoList.get(i).begin += newItemsSize;
-		}
-		this.size += newItemsSize;
-
-		// synchronize the cached list
-		CollectionTools.addAll(info.items, info.componentLVM.listIterator(), newItemsSize);
-
-		// translate the event
-		this.fireItemsAdded(LIST_VALUES, info.begin, info.items);
-	}
-
-	// minimize scope of suppressed warnings
-	@SuppressWarnings("unchecked")
-	protected ListIterator<E2> componentItems(ListChangeEvent event) {
-		return (ListIterator<E2>) event.items();
-	}
-
-	// minimize scope of suppressed warnings
-	@SuppressWarnings("unchecked")
-	protected ListValueModel<E2> componentLVM(ListChangeEvent event) {
-		return (ListValueModel<E2>) event.getSource();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ExtendedListValueModelWrapper.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ExtendedListValueModelWrapper.java
deleted file mode 100644
index 84650cf2b8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ExtendedListValueModelWrapper.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.ReadOnlyCompositeListIterator;
-import org.eclipse.jpt.utility.internal.iterators.ReadOnlyListIterator;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * This wrapper extends a ListValueModel (or CollectionValueModel)
- * with fixed collections of items on either end.
- * <p>
- * NB: Be careful using or wrapping this list value model, since the
- * "extended" items may be unexpected by the client code or wrapper.
- */
-public class ExtendedListValueModelWrapper<E>
-	extends ListValueModelWrapper<E>
-	implements ListValueModel<E>
-{
-	/** the items "prepended" to the wrapped list */
-	protected List<E> prefix;
-
-	/** the items "appended" to the wrapped list */
-	protected List<E> suffix;
-
-
-	// ********** lots o' constructors **********
-
-	/**
-	 * Extend the specified list with a prefix and suffix.
-	 */
-	public ExtendedListValueModelWrapper(List<? extends E> prefix, ListValueModel<? extends E> listHolder, List<? extends E> suffix) {
-		super(listHolder);
-		this.prefix = new ArrayList<E>(prefix);
-		this.suffix = new ArrayList<E>(suffix);
-	}
-
-	/**
-	 * Extend the specified list with a prefix and suffix.
-	 */
-	public ExtendedListValueModelWrapper(E prefix, ListValueModel<? extends E> listHolder, E suffix) {
-		super(listHolder);
-		this.prefix = Collections.singletonList(prefix);
-		this.suffix = Collections.singletonList(suffix);
-	}
-
-	/**
-	 * Extend the specified list with a prefix.
-	 */
-	public ExtendedListValueModelWrapper(List<? extends E> prefix, ListValueModel<? extends E> listHolder) {
-		super(listHolder);
-		this.prefix = new ArrayList<E>(prefix);
-		this.suffix = Collections.emptyList();
-	}
-
-	/**
-	 * Extend the specified list with a prefix.
-	 */
-	public ExtendedListValueModelWrapper(E prefix, ListValueModel<? extends E> listHolder) {
-		super(listHolder);
-		this.prefix = Collections.singletonList(prefix);
-		this.suffix = Collections.emptyList();
-	}
-
-	/**
-	 * Extend the specified list with a suffix.
-	 */
-	public ExtendedListValueModelWrapper(ListValueModel<? extends E> listHolder, List<? extends E> suffix) {
-		super(listHolder);
-		this.prefix = Collections.emptyList();
-		this.suffix = new ArrayList<E>(suffix);
-	}
-
-	/**
-	 * Extend the specified list with a suffix.
-	 */
-	public ExtendedListValueModelWrapper(ListValueModel<? extends E> listHolder, E suffix) {
-		super(listHolder);
-		this.prefix = Collections.emptyList();
-		this.suffix = Collections.singletonList(suffix);
-	}
-
-	/**
-	 * Extend the specified list with a prefix containing a single null item.
-	 */
-	public ExtendedListValueModelWrapper(ListValueModel<? extends E> listHolder) {
-		super(listHolder);
-		this.prefix = Collections.singletonList(null);
-		this.suffix = Collections.emptyList();
-	}
-
-
-	// ********** ListValueModel implementation **********
-
-	public Iterator<E> iterator() {
-		return this.listIterator();
-	}
-
-	public ListIterator<E> listIterator() {
-		return new ReadOnlyListIterator<E>(this.listIterator_());
-	}
-
-	@SuppressWarnings("unchecked")
-	protected ListIterator<E> listIterator_() {
-		return new ReadOnlyCompositeListIterator<E>(
-			this.prefix.listIterator(),
-			this.listHolder.listIterator(),
-			this.suffix.listIterator()
-		);
-	}
-
-	public E get(int index) {
-		int prefixSize = this.prefix.size();
-		if (index < prefixSize) {
-			return this.prefix.get(index);
-		} else if (index >= prefixSize + this.listHolder.size()) {
-			return this.suffix.get(index - (prefixSize + this.listHolder.size()));
-		} else {
-			return this.listHolder.get(index - prefixSize);
-		}
-	}
-
-	public int size() {
-		return this.prefix.size() + this.listHolder.size() + this.suffix.size();
-	}
-
-	public Object[] toArray() {
-		ArrayList<E> list = new ArrayList<E>(this.size());
-		list.addAll(this.prefix);
-		CollectionTools.addAll(list, this.listHolder.iterator());
-		list.addAll(this.suffix);
-		return list.toArray();
-	}
-
-
-	// ********** ListValueModelWrapper implementation/overrides **********
-
-	@Override
-	protected void itemsAdded(ListChangeEvent event) {
-		this.fireItemsAdded(event.cloneWithSource(this, LIST_VALUES, this.prefix.size()));
-	}
-
-	@Override
-	protected void itemsRemoved(ListChangeEvent event) {
-		this.fireItemsRemoved(event.cloneWithSource(this, LIST_VALUES, this.prefix.size()));
-	}
-
-	@Override
-	protected void itemsReplaced(ListChangeEvent event) {
-		this.fireItemsReplaced(event.cloneWithSource(this, LIST_VALUES, this.prefix.size()));
-	}
-
-	@Override
-	protected void itemsMoved(ListChangeEvent event) {
-		this.fireItemsMoved(event.cloneWithSource(this, LIST_VALUES, this.prefix.size()));
-	}
-
-	@Override
-	protected void listCleared(ListChangeEvent event) {
-		this.fireListChanged(LIST_VALUES);  // not "cleared"
-	}
-
-	@Override
-	protected void listChanged(ListChangeEvent event) {
-		this.fireListChanged(LIST_VALUES);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.prefix);
-		sb.append(" ");
-		super.toString(sb);
-		sb.append(" ");
-		sb.append(this.suffix);
-	}
-
-
-	// ********** miscellaneous **********
-
-	public void setPrefix(List<E> prefix) {
-		this.prefix = prefix;
-		this.fireListChanged(LIST_VALUES);
-	}
-
-	public void setSuffix(List<E> suffix) {
-		this.suffix = suffix;
-		this.fireListChanged(LIST_VALUES);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringCollectionValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringCollectionValueModel.java
deleted file mode 100644
index 8dc865a0f3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringCollectionValueModel.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-import org.eclipse.jpt.utility.internal.iterators.ReadOnlyIterator;
-import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * A <code>FilteringCollectionValueModel</code> wraps another
- * <code>CollectionValueModel</code> and uses a <code>Filter</code>
- * to determine which items in the collection are returned by calls
- * to <code>#iterator()</code>.
- * <p>
- * The filter can be changed at any time; allowing the same
- * adapter to be used with different filter criteria (e.g. when the user
- * wants to view a list of .java files).
- * <p>
- * NB: If the objects in the "filtered" collection can change in such a way
- * that they should be removed from the "filtered" collection, you will
- * need to wrap the original collection in an ItemAspectListValueModelAdapter.
- * For example, if the filter only "accepts" items whose names begin
- * with "X" and the names of the items can change, you will need to
- * wrap the original list of unfiltered items with an
- * ItemPropertyListValueModelAdapter that listens for changes to each
- * item's name and fires the appropriate event whenever an item's name
- * changes. The event will cause this wrapper to re-filter the changed
- * item and add or remove it from the "filtered" collection as appropriate.
- */
-public class FilteringCollectionValueModel<E>
-	extends CollectionValueModelWrapper<E>
-	implements CollectionValueModel<E>
-{
-	/** This filters the items in the nested collection. */
-	private Filter<E> filter;
-
-	/** Cache the items that were accepted by the filter */
-	private final Collection<E> filteredItems;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a collection value model with the specified wrapped
-	 * collection value model and a filter that simply accepts every object.
-	 */
-	public FilteringCollectionValueModel(CollectionValueModel<? extends E> collectionHolder) {
-		this(collectionHolder, Filter.Null.<E>instance());
-	}
-
-	/**
-	 * Construct a collection value model with the specified wrapped
-	 * collection value model and filter.
-	 */
-	public FilteringCollectionValueModel(CollectionValueModel<? extends E> collectionHolder, Filter<E> filter) {
-		super(collectionHolder);
-		this.filter = filter;
-		this.filteredItems = new ArrayList<E>();
-	}
-
-	/**
-	 * Construct a collection value model with the specified wrapped
-	 * list value model and a filter that simply accepts every object.
-	 */
-	public FilteringCollectionValueModel(ListValueModel<E> listHolder) {
-		this(new ListCollectionValueModelAdapter<E>(listHolder));
-	}
-
-	/**
-	 * Construct a collection value model with the specified wrapped
-	 * list value model and filter.
-	 */
-	public FilteringCollectionValueModel(ListValueModel<E> listHolder, Filter<E> filter) {
-		this(new ListCollectionValueModelAdapter<E>(listHolder), filter);
-	}
-
-
-	// ********** CollectionValueModel implementation **********
-
-	public Iterator<E> iterator() {
-		return new ReadOnlyIterator<E>(this.filteredItems);
-	}
-
-	public int size() {
-		return this.filteredItems.size();
-	}
-
-
-	// ********** CollectionValueModelWrapper overrides/implementation **********
-
-	@Override
-	protected void engageModel() {
-		super.engageModel();
-		// synch our cache *after* we start listening to the nested collection,
-		// since its value might change when a listener is added
-		CollectionTools.addAll(this.filteredItems, this.filter(this.collectionHolder.iterator()));
-	}
-
-	@Override
-	protected void disengageModel() {
-		super.disengageModel();
-		// clear out the cache when we are not listening to the nested collection
-		this.filteredItems.clear();
-	}
-
-	@Override
-	protected void itemsAdded(CollectionChangeEvent event) {
-		// filter the values before propagating the change event
-		this.addItemsToCollection(this.filter(this.items(event)), this.filteredItems, VALUES);
-	}
-
-	@Override
-	protected void itemsRemoved(CollectionChangeEvent event) {
-		// do *not* filter the values, because they may no longer be
-		// "accepted" and that might be why they were removed in the first place;
-		// anyway, any extraneous items are harmless
-		this.removeItemsFromCollection(event.items(), this.filteredItems, VALUES);
-	}
-
-	@Override
-	protected void collectionCleared(CollectionChangeEvent event) {
-		this.clearCollection(this.filteredItems, VALUES);
-	}
-
-	@Override
-	protected void collectionChanged(CollectionChangeEvent event) {
-		this.rebuildFilteredItems();
-	}
-
-
-	// ********** miscellaneous **********
-
-	/**
-	 * Change the filter and rebuild the collection.
-	 */
-	public void setFilter(Filter<E> filter) {
-		this.filter = filter;
-		this.rebuildFilteredItems();
-	}
-
-	/**
-	 * Return an iterator that filters the specified iterator.
-	 */
-	protected Iterator<E> filter(Iterator<? extends E> items) {
-		return new FilteringIterator<E, E>(items, this.filter);
-	}
-
-	/**
-	 * Synchronize our cache with the wrapped collection.
-	 */
-	protected void rebuildFilteredItems() {
-		this.filteredItems.clear();
-		CollectionTools.addAll(this.filteredItems, this.filter(this.collectionHolder.iterator()));
-		this.fireCollectionChanged(VALUES);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringPropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringPropertyValueModel.java
deleted file mode 100644
index a56cc34c80..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringPropertyValueModel.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-
-/**
- * A <code>FilteringPropertyValueModel</code> wraps another
- * <code>PropertyValueModel</code> and uses a <code>Filter</code>
- * to determine when the wrapped value is to be returned by calls
- * to <code>value()</code>.
- * <p>
- * As an alternative to building a <code>Filter</code>, a subclass
- * of <code>FilteringPropertyValueModel</code> can override the
- * <code>accept(Object)</code> method.
- * <p>
- * One, possibly undesirable, side-effect of using this value model is that
- * it must return *something* as the value. The default behavior is
- * to return <code>null</code> whenever the wrapped value is not "accepted",
- * which can be configured and/or overridden.
- */
-public class FilteringPropertyValueModel<T>
-	extends PropertyValueModelWrapper<T>
-	implements PropertyValueModel<T>
-{
-	protected final Filter<T> filter;
-	protected final T defaultValue;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a property value model with the specified nested
-	 * property value model and a disabled filter.
-	 * Use this constructor if you want to override the
-	 * <code>accept(Object)</code>
-	 * method instead of building a <code>Filter</code>.
-	 * The default value will be <code>null</code>.
-	 */
-	public FilteringPropertyValueModel(PropertyValueModel<? extends T> valueHolder) {
-		this(valueHolder, Filter.Disabled.<T>instance(), null);
-	}
-
-	/**
-	 * Construct a property value model with the specified nested
-	 * property value model, specified default value, and a disabled filter.
-	 * Use this constructor if you want to override the
-	 * <code>accept(Object)</code>
-	 * method instead of building a <code>Filter</code>
-	 * <em>and</em> you need to specify
-	 * a default value other than <code>null</code>.
-	 */
-	public FilteringPropertyValueModel(PropertyValueModel<? extends T> valueHolder, T defaultValue) {
-		this(valueHolder, Filter.Disabled.<T>instance(), defaultValue);
-	}
-
-	/**
-	 * Construct an property value model with the specified nested
-	 * property value model and filter.
-	 * The default value will be <code>null</code>.
-	 */
-	public FilteringPropertyValueModel(PropertyValueModel<? extends T> valueHolder, Filter<T> filter) {
-		this(valueHolder, filter, null);
-	}
-
-	/**
-	 * Construct an property value model with the specified nested
-	 * property value model, filter, and default value.
-	 */
-	public FilteringPropertyValueModel(PropertyValueModel<? extends T> valueHolder, Filter<T> filter, T defaultValue) {
-		super(valueHolder);
-		this.filter = filter;
-		this.defaultValue = defaultValue;
-	}
-
-
-	// ********** PropertyValueModel implementation **********
-
-	public T getValue() {
-		return this.filterValue(this.valueHolder.getValue());
-	}
-
-
-	// ********** PropertyValueModelWrapper implementation **********
-
-	@Override
-	protected void valueChanged(PropertyChangeEvent event) {
-		// filter the values before propagating the change event
-		@SuppressWarnings("unchecked")
-		Object oldValue = this.filterValue((T) event.getOldValue());
-		@SuppressWarnings("unchecked")
-		Object newValue = this.filterValue((T) event.getNewValue());
-		this.firePropertyChanged(VALUE, oldValue, newValue);
-	}
-
-
-	// ********** queries **********
-
-	/**
-	 * If the specified value is "accepted" simply return it,
-	 * otherwise return the default value.
-	 */
-	protected T filterValue(T value) {
-		return this.accept(value) ? value : this.defaultValue();
-	}
-
-	/**
-	 * Return whether the <code>FilteringPropertyValueModel</code> should
-	 * return the specified value from a call to the
-	 * <code>value()</code> method; the value came
-	 * from the nested property value model
-	 * <p>
-	 * This method can be overridden by a subclass as an
-	 * alternative to building a <code>Filter</code>.
-	 */
-	protected boolean accept(T value) {
-		return this.filter.accept(value);
-	}
-
-	/**
-	 * Return the object that should be returned if
-	 * the nested value was rejected by the filter.
-	 * The default is <code>null</code>.
-	 */
-	protected T defaultValue() {
-		return this.defaultValue;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringWritablePropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringWritablePropertyValueModel.java
deleted file mode 100644
index d7e20f4cb3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringWritablePropertyValueModel.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.internal.BidiFilter;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * A <code>FilteringWritablePropertyValueModel</code> wraps another
- * <code>WritabelPropertyValueModel</code> and uses a <code>BidiFilter</code>
- * to determine when the wrapped value is to be returned by calls
- * to <code>value()</code> and modified by calls to
- * <code>setValue(Object)</code>.
- * <p>
- * As an alternative to building a <code>BidiFilter</code>, a subclass
- * of <code>FilteringWritablePropertyValueModel</code> can override the
- * <code>accept(Object)</code> and <code>reverseAccept(Object)</code>
- * methods.
- * <p>
- * One, possibly undesirable, side-effect of using this value model is that
- * it must return *something* as the value. The default behavior is
- * to return <code>null</code> whenever the wrapped value is not "accepted",
- * which can be configured and/or overridden.
- * <p>
- * Similarly, if an incoming value is not "reverseAccepted", *nothing* will passed
- * through to the wrapped value holder, not even <code>null</code>.
- */
-public class FilteringWritablePropertyValueModel<T>
-	extends FilteringPropertyValueModel<T>
-	implements WritablePropertyValueModel<T>
-{
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a property value model with the specified nested
-	 * property value model and a disabled filter.
-	 * Use this constructor if you want to override the
-	 * <code>accept(Object)</code> and <code>reverseAccept(Object)</code>
-	 * methods instead of building a <code>BidiFilter</code>.
-	 * The default value will be <code>null</code>.
-	 */
-	public FilteringWritablePropertyValueModel(WritablePropertyValueModel<T> valueHolder) {
-		this(valueHolder, BidiFilter.Disabled.<T>instance(), null);
-	}
-
-	/**
-	 * Construct a property value model with the specified nested
-	 * property value model, specified default value, and a disabled filter.
-	 * Use this constructor if you want to override the
-	 * <code>accept(Object)</code> and <code>reverseAccept(Object)</code>
-	 * methods instead of building a <code>BidiFilter</code>
-	 * <em>and</em> you need to specify
-	 * a default value other than <code>null</code>.
-	 */
-	public FilteringWritablePropertyValueModel(WritablePropertyValueModel<T> valueHolder, T defaultValue) {
-		this(valueHolder, BidiFilter.Disabled.<T>instance(), defaultValue);
-	}
-
-	/**
-	 * Construct an property value model with the specified nested
-	 * property value model and filter.
-	 * The default value will be <code>null</code>.
-	 */
-	public FilteringWritablePropertyValueModel(WritablePropertyValueModel<T> valueHolder, BidiFilter<T> filter) {
-		this(valueHolder, filter, null);
-	}
-
-	/**
-	 * Construct an property value model with the specified nested
-	 * property value model, filter, and default value.
-	 */
-	public FilteringWritablePropertyValueModel(WritablePropertyValueModel<T> valueHolder, BidiFilter<T> filter, T defaultValue) {
-		super(valueHolder, filter, defaultValue);
-	}
-
-
-	// ********** WritablePropertyValueModel implementation **********
-
-	public void setValue(T value) {
-		if (this.reverseAccept(value)) {
-			this.valueHolder().setValue(value);
-		}
-	}
-
-
-	// ********** queries **********
-
-	/**
-	 * Return whether the <code>FilteringWritablePropertyValueModel</code>
-	 * should pass through the specified value to the nested
-	 * writable property value model in a call to the
-	 * <code>setValue(Object)</code> method
-	 * <p>
-	 * This method can be overridden by a subclass as an
-	 * alternative to building a <code>BidiFilter</code>.
-	 */
-	protected boolean reverseAccept(T value) {
-		return this.getFilter().reverseAccept(value);
-	}
-
-	/**
-	 * Our constructors accept only a WritablePropertyValueModel<T>.
-	 */
-	@SuppressWarnings("unchecked")
-	protected WritablePropertyValueModel<T> valueHolder() {
-		return (WritablePropertyValueModel<T>) this.valueHolder;
-	}
-
-	/**
-	 * Our constructors accept only a bidirectional filter.
-	 */
-	protected BidiFilter<T> getFilter() {
-		return (BidiFilter<T>) this.filter;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemAspectListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemAspectListValueModelAdapter.java
deleted file mode 100644
index 17538f93d3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemAspectListValueModelAdapter.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.EventObject;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.internal.Counter;
-import org.eclipse.jpt.utility.internal.iterators.ReadOnlyListIterator;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * Abstract list value model that provides behavior for wrapping a list value
- * model (or collection value model) and listening for changes to aspects of the
- * *items* held by the list (or collection). Changes to the actual list
- * (or collection) are also monitored.
- * 
- * This is useful if you have a collection of items that can be modified by adding
- * or removing items or the items themselves might change in a fashion that
- * might change the collection's external appearance.
- * 
- * Subclasses need to override two methods:
- * 
- * #listenToItem(Model)
- *     begin listening to the appropriate aspect of the specified item and call
- *     #itemAspectChanged(Object) whenever the aspect changes
- * 
- * #stopListeningToItem(Model)
- *     stop listening to the appropriate aspect of the specified item
- */
-public abstract class ItemAspectListValueModelAdapter<E>
-	extends ListValueModelWrapper<E>
-	implements ListValueModel<E>
-{
-
-	/**
-	 * Maintain a counter for each of the items in the
-	 * wrapped list holder we are listening to.
-	 */
-	protected final IdentityHashMap<E, Counter> counters;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Constructor - the list holder is required.
-	 */
-	protected ItemAspectListValueModelAdapter(ListValueModel<? extends E> listHolder) {
-		super(listHolder);
-		this.counters = new IdentityHashMap<E, Counter>();
-	}
-
-	/**
-	 * Constructor - the collection holder is required.
-	 */
-	protected ItemAspectListValueModelAdapter(CollectionValueModel<? extends E> collectionHolder) {
-		this(new CollectionListValueModelAdapter<E>(collectionHolder));
-	}
-
-
-	// ********** ListValueModel implementation **********
-
-	public Iterator<E> iterator() {
-		return this.listIterator();
-	}
-
-	public ListIterator<E> listIterator() {
-		return new ReadOnlyListIterator<E>(this.listHolder.listIterator());
-	}
-
-	public E get(int index) {
-		return this.listHolder.get(index);
-	}
-
-	public int size() {
-		return this.listHolder.size();
-	}
-
-	public Object[] toArray() {
-		return this.listHolder.toArray();
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Start listening to the list holder and the items in the list.
-	 */
-	@Override
-	protected void engageModel() {
-		super.engageModel();
-		this.engageAllItems();
-	}
-
-	protected void engageAllItems() {
-		this.engageItems(this.listHolder.iterator());
-	}
-
-	protected void engageItems(Iterator<? extends E> stream) {
-		while (stream.hasNext()) {
-			this.engageItem(stream.next());
-		}
-	}
-
-	protected void engageItem(E item) {
-		// listen to an item only once
-		Counter counter = this.counters.get(item);
-		if (counter == null) {
-			counter = new Counter();
-			this.counters.put(item, counter);
-			this.startListeningToItem((Model) item);
-		}
-		counter.increment();
-	}
-
-	/**
-	 * Start listening to the specified item.
-	 */
-	protected abstract void startListeningToItem(Model item);
-
-	/**
-	 * Stop listening to the list holder and the items in the list.
-	 */
-	@Override
-	protected void disengageModel() {
-		this.disengageAllItems();
-		super.disengageModel();
-	}
-
-	protected void disengageAllItems() {
-		this.disengageItems(this.listHolder.iterator());
-	}
-
-	protected void disengageItems(Iterator<? extends E> stream) {
-		while (stream.hasNext()) {
-			this.disengageItem(stream.next());
-		}
-	}
-
-	protected void disengageItem(E item) {
-		// stop listening to an item only once
-		Counter counter = this.counters.get(item);
-		if (counter == null) {
-			// something is wrong if this happens...  ~bjv
-			throw new IllegalStateException("missing counter: " + item);
-		}
-		if (counter.decrement() == 0) {
-			this.counters.remove(item);
-			this.stopListeningToItem((Model) item);
-		}
-	}
-
-	/**
-	 * Stop listening to the specified item.
-	 */
-	protected abstract void stopListeningToItem(Model item);
-
-
-	// ********** list change support **********
-
-	/**
-	 * Items were added to the wrapped list holder.
-	 * Forward the event and begin listening to the added items.
-	 */
-	@Override
-	protected void itemsAdded(ListChangeEvent event) {
-		// re-fire event with the wrapper as the source
-		this.fireItemsAdded(event.cloneWithSource(this, LIST_VALUES));
-		this.engageItems(this.items(event));
-	}
-
-	/**
-	 * Items were removed from the wrapped list holder.
-	 * Stop listening to the removed items and forward the event.
-	 */
-	@Override
-	protected void itemsRemoved(ListChangeEvent event) {
-		this.disengageItems(this.items(event));
-		// re-fire event with the wrapper as the source
-		this.fireItemsRemoved(event.cloneWithSource(this, LIST_VALUES));
-	}
-
-	/**
-	 * Items were replaced in the wrapped list holder.
-	 * Stop listening to the removed items, forward the event,
-	 * and begin listening to the added items.
-	 */
-	@Override
-	protected void itemsReplaced(ListChangeEvent event) {
-		this.disengageItems(this.replacedItems(event));
-		// re-fire event with the wrapper as the source
-		this.fireItemsReplaced(event.cloneWithSource(this, LIST_VALUES));
-		this.engageItems(this.items(event));
-	}
-
-	/**
-	 * Items were moved in the wrapped list holder.
-	 * No need to change any listeners; just forward the event.
-	 */
-	@Override
-	protected void itemsMoved(ListChangeEvent event) {
-		// re-fire event with the wrapper as the source
-		this.fireItemsMoved(event.cloneWithSource(this, LIST_VALUES));
-	}
-
-	/**
-	 * The wrapped list holder was cleared.
-	 * Stop listening to the removed items and forward the event.
-	 */
-	@Override
-	protected void listCleared(ListChangeEvent event) {
-		// we should only need to disengage each item once...
-		// make a copy to prevent a ConcurrentModificationException
-		Collection<E> keys = new ArrayList<E>(this.counters.keySet());
-		this.disengageItems(keys.iterator());
-		this.counters.clear();
-		// re-fire event with the wrapper as the source
-		this.fireListCleared(LIST_VALUES);
-	}
-
-	/**
-	 * The wrapped list holder has changed in some dramatic fashion.
-	 * Reconfigure our listeners and forward the event.
-	 */
-	@Override
-	protected void listChanged(ListChangeEvent event) {
-		// we should only need to disengage each item once...
-		// make a copy to prevent a ConcurrentModificationException
-		Collection<E> keys = new ArrayList<E>(this.counters.keySet());
-		this.disengageItems(keys.iterator());
-		this.counters.clear();
-		// re-fire event with the wrapper as the source
-		this.fireListChanged(LIST_VALUES);
-		this.engageAllItems();
-	}
-
-
-	// ********** item change support **********
-
-	/**
-	 * The specified item has a bound property that has changed.
-	 * Notify listeners of the change.
-	 */
-	protected void itemAspectChanged(EventObject event) {
-		Object item = event.getSource();
-		int index = this.lastIdentityIndexOf(item);
-		while (index != -1) {
-			this.itemAspectChanged(index, item);
-			index = this.lastIdentityIndexOf(item, index);
-		}
-	}
-
-	/**
-	 * The specified item has a bound property that has changed.
-	 * Notify listeners of the change.
-	 */
-	protected void itemAspectChanged(int index, Object item) {
-		this.fireItemReplaced(LIST_VALUES, index, item, item);		// hmmm...
-	}
-
-	/**
-	 * Return the last index of the specified item, using object
-	 * identity instead of equality.
-	 */
-	protected int lastIdentityIndexOf(Object o) {
-		return this.lastIdentityIndexOf(o, this.listHolder.size());
-	}
-
-	/**
-	 * Return the last index of the specified item, starting just before the
-	 * the specified endpoint, and using object identity instead of equality.
-	 */
-	protected int lastIdentityIndexOf(Object o, int end) {
-		for (int i = end; i-- > 0; ) {
-			if (this.listHolder.get(i) == o) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemCollectionListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemCollectionListValueModelAdapter.java
deleted file mode 100644
index 151a90f6c3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemCollectionListValueModelAdapter.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Arrays;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
-import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * Extend ItemAspectListValueModelAdapter to listen to one or more collection
- * aspects of each item in the wrapped list model.
- */
-public class ItemCollectionListValueModelAdapter<E>
-	extends ItemAspectListValueModelAdapter<E>
-{
-
-	/** The names of the items' collections that we listen to. */
-	protected final String[] collectionNames;
-
-	/** Listener that listens to all the items in the list. */
-	protected final CollectionChangeListener itemCollectionListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct an adapter for the specified item Collections.
-	 */
-	public ItemCollectionListValueModelAdapter(ListValueModel<E> listHolder, String... collectionNames) {
-		super(listHolder);
-		this.collectionNames = collectionNames;
-		this.itemCollectionListener = this.buildItemCollectionListener();
-	}
-
-	/**
-	 * Construct an adapter for the specified item Collections.
-	 */
-	public ItemCollectionListValueModelAdapter(CollectionValueModel<E> collectionHolder, String... collectionNames) {
-		this(new CollectionListValueModelAdapter<E>(collectionHolder), collectionNames);
-	}
-
-
-	// ********** initialization **********
-
-	/**
-	 * All we really care about is the fact that a Collection aspect has 
-	 * changed.  Do the same thing no matter which event occurs.
-	 */
-	protected CollectionChangeListener buildItemCollectionListener() {
-		return new CollectionChangeListener() {
-			public void itemsAdded(CollectionChangeEvent event) {
-				ItemCollectionListValueModelAdapter.this.itemAspectChanged(event);
-			}
-			public void itemsRemoved(CollectionChangeEvent event) {
-				ItemCollectionListValueModelAdapter.this.itemAspectChanged(event);
-			}
-			public void collectionCleared(CollectionChangeEvent event) {
-				ItemCollectionListValueModelAdapter.this.itemAspectChanged(event);
-			}
-			public void collectionChanged(CollectionChangeEvent event) {
-				ItemCollectionListValueModelAdapter.this.itemAspectChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "item collection listener: " + Arrays.asList(ItemCollectionListValueModelAdapter.this.collectionNames);
-			}
-		};
-	}
-
-
-	// ********** behavior **********
-
-	@Override
-	protected void startListeningToItem(Model item) {
-		for (String collectionName : this.collectionNames) {
-			item.addCollectionChangeListener(collectionName, this.itemCollectionListener);
-		}
-	}
-
-	@Override
-	protected void stopListeningToItem(Model item) {
-		for (String collectionName : this.collectionNames) {
-			item.removeCollectionChangeListener(collectionName, this.itemCollectionListener);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemListListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemListListValueModelAdapter.java
deleted file mode 100644
index 5354c1bde5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemListListValueModelAdapter.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Arrays;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * Extend ItemAspectListValueModelAdapter to listen to one or more list
- * aspects of each item in the wrapped list model.
- */
-public class ItemListListValueModelAdapter<E>
-	extends ItemAspectListValueModelAdapter<E>
-{
-
-	/** The names of the subject's lists that we listen to. */
-	protected final String[] listNames;
-
-	/** Listener that listens to all the items in the list. */
-	protected final ListChangeListener itemListListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct an adapter for the specified item List aspects.
-	 */
-	public ItemListListValueModelAdapter(ListValueModel<E> listHolder, String... listNames) {
-		super(listHolder);
-		this.listNames = listNames;
-		this.itemListListener = this.buildItemListListener();
-	}
-
-	/**
-	 * Construct an adapter for the specified item List aspects.
-	 */
-	public ItemListListValueModelAdapter(CollectionValueModel<E> collectionHolder, String... listNames) {
-		this(new CollectionListValueModelAdapter<E>(collectionHolder), listNames);
-	}
-
-
-	// ********** initialization **********
-
-	/**
-	 * All we really care about is the fact that the List aspect has 
-	 * changed.  Do the same thing no matter which event occurs.
-	 */
-	protected ListChangeListener buildItemListListener() {
-		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent event) {
-				ItemListListValueModelAdapter.this.itemAspectChanged(event);
-			}
-			public void itemsRemoved(ListChangeEvent event) {
-				ItemListListValueModelAdapter.this.itemAspectChanged(event);
-			}
-			public void itemsReplaced(ListChangeEvent event) {
-				ItemListListValueModelAdapter.this.itemAspectChanged(event);
-			}
-			public void itemsMoved(ListChangeEvent event) {
-				ItemListListValueModelAdapter.this.itemAspectChanged(event);
-			}
-			public void listCleared(ListChangeEvent event) {
-				ItemListListValueModelAdapter.this.itemAspectChanged(event);
-			}
-			public void listChanged(ListChangeEvent event) {
-				ItemListListValueModelAdapter.this.itemAspectChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "item list listener: " + Arrays.asList(ItemListListValueModelAdapter.this.listNames);
-			}
-		};
-	}
-	
-
-	// ********** behavior **********
-
-	@Override
-	protected void startListeningToItem(Model item) {
-		for (String listName : this.listNames) {
-			item.addListChangeListener(listName, this.itemListListener);
-		}
-	}
-
-	@Override
-	protected void stopListeningToItem(Model item) {
-		for (String listName : this.listNames) {
-			item.removeListChangeListener(listName, this.itemListListener);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemPropertyListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemPropertyListValueModelAdapter.java
deleted file mode 100644
index 48140a0c5b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemPropertyListValueModelAdapter.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Arrays;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * Extend ItemAspectListValueModelAdapter to listen to one or more
- * properties of each item in the wrapped list model.
- */
-public class ItemPropertyListValueModelAdapter<E>
-	extends ItemAspectListValueModelAdapter<E>
-{
-
-	/** The names of the items' properties that we listen to. */
-	protected final String[] propertyNames;
-
-	/** Listener that listens to all the items in the list. */
-	protected final PropertyChangeListener itemPropertyListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct an adapter for the specified item properties.
-	 */
-	public ItemPropertyListValueModelAdapter(ListValueModel<E> listHolder, String... propertyNames) {
-		super(listHolder);
-		this.propertyNames = propertyNames;
-		this.itemPropertyListener = this.buildItemPropertyListener();
-	}
-
-	/**
-	 * Construct an adapter for the specified item properties.
-	 */
-	public ItemPropertyListValueModelAdapter(CollectionValueModel<E> collectionHolder, String... propertyNames) {
-		this(new CollectionListValueModelAdapter<E>(collectionHolder), propertyNames);
-	}
-
-
-	// ********** initialization **********
-
-	protected PropertyChangeListener buildItemPropertyListener() {
-		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent event) {
-				ItemPropertyListValueModelAdapter.this.itemAspectChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "item property listener: " + Arrays.asList(ItemPropertyListValueModelAdapter.this.propertyNames);
-			}
-		};
-	}
-	
-
-	// ********** behavior **********
-
-	@Override
-	protected void startListeningToItem(Model item) {
-		for (String propertyName : this.propertyNames) {
-			item.addPropertyChangeListener(propertyName, this.itemPropertyListener);
-		}
-	}
-
-	@Override
-	protected void stopListeningToItem(Model item) {
-		for (String propertyName : this.propertyNames) {
-			item.removePropertyChangeListener(propertyName, this.itemPropertyListener);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemStateListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemStateListValueModelAdapter.java
deleted file mode 100644
index 46d7d863fb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemStateListValueModelAdapter.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.StateChangeEvent;
-import org.eclipse.jpt.utility.model.listener.StateChangeListener;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * Extend ItemAspectListValueModelAdapter to listen to the
- * "state" of each item in the wrapped list model.
- */
-public class ItemStateListValueModelAdapter<E>
-	extends ItemAspectListValueModelAdapter<E>
-{
-	/** Listener that listens to all the items in the list. */
-	protected final StateChangeListener itemStateListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct an adapter for the item state.
-	 */
-	public ItemStateListValueModelAdapter(ListValueModel<E> listHolder) {
-		super(listHolder);
-		this.itemStateListener = this.buildItemStateListener();
-	}
-
-	/**
-	 * Construct an adapter for the item state.
-	 */
-	public ItemStateListValueModelAdapter(CollectionValueModel<E> collectionHolder) {
-		this(new CollectionListValueModelAdapter<E>(collectionHolder));
-	}
-
-
-	// ********** initialization **********
-
-	protected StateChangeListener buildItemStateListener() {
-		return new StateChangeListener() {
-			public void stateChanged(StateChangeEvent event) {
-				ItemStateListValueModelAdapter.this.itemAspectChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "item state listener";
-			}
-		};
-	}
-	
-
-	// ********** behavior **********
-
-	@Override
-	protected void startListeningToItem(Model item) {
-		item.addStateChangeListener(this.itemStateListener);
-	}
-
-	@Override
-	protected void stopListeningToItem(Model item) {
-		item.removeStateChangeListener(this.itemStateListener);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemTreeListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemTreeListValueModelAdapter.java
deleted file mode 100644
index 4e39f6ec34..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemTreeListValueModelAdapter.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Arrays;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.TreeChangeEvent;
-import org.eclipse.jpt.utility.model.listener.TreeChangeListener;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * Extend ItemAspectListValueModelAdapter to listen to one or more tree
- * aspects of each item in the wrapped list model.
- */
-public class ItemTreeListValueModelAdapter<E>
-	extends ItemAspectListValueModelAdapter<E>
-{
-
-	/** The names of the items' tree that we listen to. */
-	protected final String[] treeNames;
-
-	/** Listener that listens to all the items in the list. */
-	protected final TreeChangeListener itemTreeListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct an adapter for the specified item trees.
-	 */
-	public ItemTreeListValueModelAdapter(ListValueModel<E> listHolder, String... treeNames) {
-		super(listHolder);
-		this.treeNames = treeNames;
-		this.itemTreeListener = this.buildItemTreeListener();
-	}
-
-	/**
-	 * Construct an adapter for the specified item trees.
-	 */
-	public ItemTreeListValueModelAdapter(CollectionValueModel<E> collectionHolder, String... treeNames) {
-		this(new CollectionListValueModelAdapter<E>(collectionHolder), treeNames);
-	}
-
-
-	// ********** initialization **********
-
-	/**
-	 * All we really care about is the fact that a tree aspect has 
-	 * changed.  Do the same thing no matter which event occurs.
-	 */
-	protected TreeChangeListener buildItemTreeListener() {
-		return new TreeChangeListener() {
-			public void nodeAdded(TreeChangeEvent event) {
-				ItemTreeListValueModelAdapter.this.itemAspectChanged(event);
-			}
-			public void nodeRemoved(TreeChangeEvent event) {
-				ItemTreeListValueModelAdapter.this.itemAspectChanged(event);
-			}
-			public void treeCleared(TreeChangeEvent event) {
-				ItemTreeListValueModelAdapter.this.itemAspectChanged(event);
-			}
-			public void treeChanged(TreeChangeEvent event) {
-				ItemTreeListValueModelAdapter.this.itemAspectChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "item tree listener: " + Arrays.asList(ItemTreeListValueModelAdapter.this.treeNames);
-			}
-		};
-	}
-
-
-	// ********** behavior **********
-
-	@Override
-	protected void startListeningToItem(Model item) {
-		for (String treeName : this.treeNames) {
-			item.addTreeChangeListener(treeName, this.itemTreeListener);
-		}
-	}
-
-	@Override
-	protected void stopListeningToItem(Model item) {
-		for (String treeName : this.treeNames) {
-			item.removeTreeChangeListener(treeName, this.itemTreeListener);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListAspectAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListAspectAdapter.java
deleted file mode 100644
index b8adaaa96f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListAspectAdapter.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ChangeListener;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-
-/**
- * This extension of AspectAdapter provides ListChange support.
- * This allows us to convert a set of one or more collections into
- * a single collection, LIST_VALUES.
- * 
- * The typical subclass will override the following methods:
- * #listIterator_()
- *     at the very minimum, override this method to return a list iterator
- *     on the subject's list aspect; it does not need to be overridden if
- *     #listIterator() is overridden and its behavior changed
- * #get(int)
- *     override this method to improve performance
- * #size_()
- *     override this method to improve performance; it does not need to be overridden if
- *     #size() is overridden and its behavior changed
- * #listIterator()
- *     override this method only if returning an empty list iterator when the
- *     subject is null is unacceptable
- * #size()
- *     override this method only if returning a zero when the
- *     subject is null is unacceptable
- */
-public abstract class ListAspectAdapter<S extends Model, E>
-	extends AspectAdapter<S>
-	implements ListValueModel<E>
-{
-	/**
-	 * The name of the subject's lists that we use for the value.
-	 */
-	protected final String[] listNames;
-		protected static final String[] EMPTY_LIST_NAMES = new String[0];
-
-	/** A listener that listens to the subject's list aspect. */
-	protected final ListChangeListener listChangeListener;
-
-	private static final Object[] EMPTY_ARRAY = new Object[0];
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a ListAspectAdapter for the specified subject
-	 * and list.
-	 */
-	protected ListAspectAdapter(String listName, S subject) {
-		this(new String[] {listName}, subject);
-	}
-
-	/**
-	 * Construct a ListAspectAdapter for the specified subject
-	 * and lists.
-	 */
-	protected ListAspectAdapter(String[] listNames, S subject) {
-		this(new StaticPropertyValueModel<S>(subject), listNames);
-	}
-
-	/**
-	 * Construct a ListAspectAdapter for the specified subject holder
-	 * and lists.
-	 */
-	protected ListAspectAdapter(PropertyValueModel<? extends S> subjectHolder, String... listNames) {
-		super(subjectHolder);
-		this.listNames = listNames;
-		this.listChangeListener = this.buildListChangeListener();
-	}
-
-	/**
-	 * Construct a ListAspectAdapter for the specified subject holder
-	 * and lists.
-	 */
-	protected ListAspectAdapter(PropertyValueModel<? extends S> subjectHolder, Collection<String> listNames) {
-		this(subjectHolder, listNames.toArray(new String[listNames.size()]));
-	}
-
-	/**
-	 * Construct a ListAspectAdapter for an "unchanging" list in
-	 * the specified subject. This is useful for a list aspect that does not
-	 * change for a particular subject; but the subject will change, resulting in
-	 * a new list.
-	 */
-	protected ListAspectAdapter(PropertyValueModel<? extends S> subjectHolder) {
-		this(subjectHolder, EMPTY_LIST_NAMES);
-	}
-
-
-	// ********** initialization **********
-
-	/**
-	 * The subject's list aspect has changed, notify the listeners.
-	 */
-	protected ListChangeListener buildListChangeListener() {
-		// transform the subject's list change events into VALUE list change events
-		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent event) {
-				ListAspectAdapter.this.itemsAdded(event);
-			}
-			public void itemsRemoved(ListChangeEvent event) {
-				ListAspectAdapter.this.itemsRemoved(event);
-			}
-			public void itemsReplaced(ListChangeEvent event) {
-				ListAspectAdapter.this.itemsReplaced(event);
-			}
-			public void itemsMoved(ListChangeEvent event) {
-				ListAspectAdapter.this.itemsMoved(event);
-			}
-			public void listCleared(ListChangeEvent event) {
-				ListAspectAdapter.this.listCleared(event);
-			}
-			public void listChanged(ListChangeEvent event) {
-				ListAspectAdapter.this.listChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "list change listener: " + Arrays.asList(ListAspectAdapter.this.listNames);
-			}
-		};
-	}
-
-
-	// ********** ListValueModel implementation **********
-
-	/**
-	 * Return the elements of the subject's list aspect.
-	 */
-	public Iterator<E> iterator() {
-		return this.listIterator();
-	}
-
-	/**
-	 * Return the elements of the subject's list aspect.
-	 */
-	public ListIterator<E> listIterator() {
-		return (this.subject == null) ? EmptyListIterator.<E>instance() : this.listIterator_();
-	}
-
-	/**
-	 * Return the elements of the subject's list aspect.
-	 * At this point we can be sure that the subject is not null.
-	 * @see #listIterator()
-	 */
-	protected ListIterator<E> listIterator_() {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return the element at the specified index of the subject's list aspect.
-	 */
-	public E get(int index) {
-		return CollectionTools.get(this.listIterator(), index);
-	}
-
-	/**
-	 * Return the size of the subject's list aspect.
-	 */
-	public int size() {
-		return this.subject == null ? 0 : this.size_();
-	}
-
-	/**
-	 * Return the size of the subject's list aspect.
-	 * At this point we can be sure that the subject is not null.
-	 * @see #size()
-	 */
-	protected int size_() {
-		return CollectionTools.size(this.listIterator());
-	}
-
-	/**
-	 * Return an array manifestation of the subject's list aspect.
-	 */
-	public Object[] toArray() {
-		return this.subject == null ? EMPTY_ARRAY : this.toArray_();
-	}
-
-	/**
-	 * Return an array manifestation of the subject's list aspect.
-	 * At this point we can be sure that the subject is not null.
-	 * @see #toArray()
-	 */
-	protected Object[] toArray_() {
-		return CollectionTools.array(this.listIterator(), this.size());
-	}
-
-
-	// ********** AspectAdapter implementation **********
-
-	@Override
-	protected Object getValue() {
-		return this.iterator();
-	}
-
-	@Override
-	protected Class<? extends ChangeListener> getListenerClass() {
-		return ListChangeListener.class;
-	}
-
-	@Override
-	protected String getListenerAspectName() {
-		return LIST_VALUES;
-	}
-
-	@Override
-	protected boolean hasListeners() {
-		return this.hasAnyListChangeListeners(LIST_VALUES);
-	}
-
-	@Override
-	protected void fireAspectChange(Object oldValue, Object newValue) {
-		this.fireListChanged(LIST_VALUES);
-	}
-
-	@Override
-	protected void engageSubject_() {
-    	for (String listName : this.listNames) {
-			((Model) this.subject).addListChangeListener(listName, this.listChangeListener);
-		}
-	}
-
-	@Override
-	protected void disengageSubject_() {
-    	for (String listName : this.listNames) {
-			((Model) this.subject).removeListChangeListener(listName, this.listChangeListener);
-		}
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		for (int i = 0; i < this.listNames.length; i++) {
-			if (i != 0) {
-				sb.append(", ");
-			}
-			sb.append(this.listNames[i]);
-		}
-	}
-
-
-	// ********** behavior **********
-
-	protected void itemsAdded(ListChangeEvent event) {
-		this.fireItemsAdded(event.cloneWithSource(this, LIST_VALUES));
-	}
-
-	protected void itemsRemoved(ListChangeEvent event) {
-		this.fireItemsRemoved(event.cloneWithSource(this, LIST_VALUES));
-	}
-
-	protected void itemsReplaced(ListChangeEvent event) {
-		this.fireItemsReplaced(event.cloneWithSource(this, LIST_VALUES));
-	}
-
-	protected void itemsMoved(ListChangeEvent event) {
-		this.fireItemsMoved(event.cloneWithSource(this, LIST_VALUES));
-	}
-
-	protected void listCleared(ListChangeEvent event) {
-		this.fireListCleared(LIST_VALUES);  // nothing from original event to forward
-	}
-
-	protected void listChanged(ListChangeEvent event) {
-		this.fireListChanged(LIST_VALUES);  // nothing from original event to forward
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListCollectionValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListCollectionValueModelAdapter.java
deleted file mode 100644
index dc8a7aad40..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListCollectionValueModelAdapter.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.internal.iterators.ReadOnlyIterator;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.internal.model.ChangeSupport;
-import org.eclipse.jpt.utility.internal.model.SingleAspectChangeSupport;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * An adapter that allows us to make a ListValueModel behave like
- * a read-only CollectionValueModel, sorta.
- * 
- * We keep an internal collection somewhat in synch with the wrapped list.
- * 
- * NB: Since we only listen to the wrapped list when we have
- * listeners ourselves and we can only stay in synch with the wrapped
- * list while we are listening to it, results to various methods
- * (e.g. #size(), value()) will be unpredictable whenever
- * we do not have any listeners. This should not be too painful since,
- * most likely, client objects will also be listeners.
- */
-public class ListCollectionValueModelAdapter<E>
-	extends AbstractModel
-	implements CollectionValueModel<E>
-{
-	/** The wrapped list value model. */
-	protected final ListValueModel<? extends E> listHolder;
-
-	/** A listener that forwards any events fired by the list holder. */
-	protected final ListChangeListener listChangeListener;
-
-	/**
-	 * Our internal collection, which holds the same elements as
-	 * the wrapped list.
-	 */
-	// we declare this an ArrayList so we can use #clone() and #ensureCapacity(int)
-	protected final ArrayList<E> collection;
-
-
-	// ********** constructors/initialization **********
-
-	/**
-	 * Wrap the specified ListValueModel.
-	 */
-	public ListCollectionValueModelAdapter(ListValueModel<? extends E> listHolder) {
-		super();
-		if (listHolder == null) {
-			throw new NullPointerException();
-		}
-		this.listHolder = listHolder;
-		this.listChangeListener = this.buildListChangeListener();
-		this.collection = new ArrayList<E>();
-		// postpone building the collection and listening to the underlying list
-		// until we have listeners ourselves...
-	}
-
-	@Override
-	protected ChangeSupport buildChangeSupport() {
-		return new SingleAspectChangeSupport(this, CollectionChangeListener.class, VALUES);
-	}
-
-	/**
-	 * The wrapped list has changed, forward an equivalent
-	 * collection change event to our listeners.
-	 */
-	protected ListChangeListener buildListChangeListener() {
-		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent event) {
-				ListCollectionValueModelAdapter.this.itemsAdded(event);
-			}
-			public void itemsRemoved(ListChangeEvent event) {
-				ListCollectionValueModelAdapter.this.itemsRemoved(event);
-			}
-			public void itemsReplaced(ListChangeEvent event) {
-				ListCollectionValueModelAdapter.this.itemsReplaced(event);
-			}
-			public void itemsMoved(ListChangeEvent event) {
-				ListCollectionValueModelAdapter.this.itemsMoved(event);
-			}
-			public void listCleared(ListChangeEvent event) {
-				ListCollectionValueModelAdapter.this.listCleared(event);
-			}
-			public void listChanged(ListChangeEvent event) {
-				ListCollectionValueModelAdapter.this.listChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "list change listener";
-			}
-		};
-	}
-
-
-	// ********** CollectionValueModel implementation **********
-
-	public Iterator<E> iterator() {
-		// try to prevent backdoor modification of the list
-		return new ReadOnlyIterator<E>(this.collection);
-	}
-
-	public int size() {
-		return this.collection.size();
-	}
-
-
-	// ********** extend change support **********
-
-	/**
-	 * Override to start listening to the list holder if necessary.
-	 */
-	@Override
-	public void addCollectionChangeListener(CollectionChangeListener listener) {
-		if (this.hasNoListeners()) {
-			this.engageModel();
-		}
-		super.addCollectionChangeListener(listener);
-	}
-
-	/**
-	 * Override to start listening to the list holder if necessary.
-	 */
-	@Override
-	public void addCollectionChangeListener(String collectionName, CollectionChangeListener listener) {
-		if (collectionName == VALUES && this.hasNoListeners()) {
-			this.engageModel();
-		}
-		super.addCollectionChangeListener(collectionName, listener);
-	}
-
-	/**
-	 * Override to stop listening to the list holder if appropriate.
-	 */
-	@Override
-	public void removeCollectionChangeListener(CollectionChangeListener listener) {
-		super.removeCollectionChangeListener(listener);
-		if (this.hasNoListeners()) {
-			this.disengageModel();
-		}
-	}
-
-	/**
-	 * Override to stop listening to the list holder if appropriate.
-	 */
-	@Override
-	public void removeCollectionChangeListener(String collectionName, CollectionChangeListener listener) {
-		super.removeCollectionChangeListener(collectionName, listener);
-		if (collectionName == VALUES && this.hasNoListeners()) {
-			this.disengageModel();
-		}
-	}
-
-
-	// ********** queries **********
-
-	protected boolean hasListeners() {
-		return this.hasAnyCollectionChangeListeners(VALUES);
-	}
-
-	protected boolean hasNoListeners() {
-		return ! this.hasListeners();
-	}
-
-	/**
-	 * Return the index of the specified item, using object
-	 * identity instead of equality.
-	 */
-	protected int lastIdentityIndexOf(Object o) {
-		return this.lastIdentityIndexOf(o, this.collection.size());
-	}
-	
-	/**
-	 * Return the last index of the specified item, starting just before the
-	 * the specified endpoint, and using object identity instead of equality.
-	 */
-	protected int lastIdentityIndexOf(Object o, int end) {
-		for (int i = end; i-- > 0; ) {
-			if (this.collection.get(i) == o) {
-				return i;
-			}
-		}
-		return -1;
-	}
-	
-
-	// ********** behavior **********
-
-	protected void buildCollection() {
-		Iterator<? extends E> stream = this.listHolder.iterator();
-		// if the new list is empty, do nothing
-		if (stream.hasNext()) {
-			this.collection.ensureCapacity(this.listHolder.size());
-			while (stream.hasNext()) {
-				this.collection.add(stream.next());
-			}
-		}
-	}
-
-	protected void engageModel() {
-		this.listHolder.addListChangeListener(ListValueModel.LIST_VALUES, this.listChangeListener);
-		// synch our collection *after* we start listening to the list holder,
-		// since its value might change when a listener is added
-		this.buildCollection();
-	}
-
-	protected void disengageModel() {
-		this.listHolder.removeListChangeListener(ListValueModel.LIST_VALUES, this.listChangeListener);
-		// clear out the collection when we are not listening to the list holder
-		this.collection.clear();
-	}
-
-	// minimize suppressed warnings
-	@SuppressWarnings("unchecked")
-	protected ListIterator<E> items(ListChangeEvent event) {
-		return (ListIterator<E>) event.items();
-	}
-
-	// minimize suppressed warnings
-	@SuppressWarnings("unchecked")
-	protected ListIterator<E> replacedItems(ListChangeEvent event) {
-		return (ListIterator<E>) event.replacedItems();
-	}
-
-	protected void itemsAdded(ListChangeEvent event) {
-		this.addItemsToCollection(this.items(event), this.collection, VALUES);
-	}
-
-	protected void removeInternalItems(Iterator<E> items) {
-		// we have to remove the items individually,
-		// since they are probably not in sequence
-		while (items.hasNext()) {
-			Object removedItem = items.next();
-			int index = this.lastIdentityIndexOf(removedItem);
-			this.collection.remove(index);
-			this.fireItemRemoved(VALUES, removedItem);
-		}
-	}
-
-	protected void itemsRemoved(ListChangeEvent event) {
-		this.removeInternalItems(this.items(event));
-	}
-
-	protected void itemsReplaced(ListChangeEvent event) {
-		this.removeInternalItems(this.replacedItems(event));
-		this.addItemsToCollection(this.items(event), this.collection, VALUES);
-	}
-
-	protected void itemsMoved(ListChangeEvent event) {
-		// do nothing? moving items in a list has no net effect on a collection...
-	}
-
-	protected void listCleared(ListChangeEvent event) {
-		// put in empty check so we don't fire events unnecessarily
-		if ( ! this.collection.isEmpty()) {
-			this.collection.clear();
-			this.fireCollectionCleared(VALUES);
-		}
-	}
-
-	/**
-	 * synchronize our internal collection with the wrapped list
-	 * and fire the appropriate events
-	 */
-	protected void listChanged(ListChangeEvent event) {
-		// put in empty check so we don't fire events unnecessarily
-		if ( ! this.collection.isEmpty()) {
-			@SuppressWarnings("unchecked")
-			ArrayList<E> removedItems = (ArrayList<E>) this.collection.clone();
-			this.collection.clear();
-			this.fireItemsRemoved(VALUES, removedItems);
-		}
-
-		this.buildCollection();
-		// put in empty check so we don't fire events unnecessarily
-		if ( ! this.collection.isEmpty()) {
-			this.fireItemsAdded(VALUES, this.collection);
-		}
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.listHolder);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListCurator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListCurator.java
deleted file mode 100644
index f04821ad82..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListCurator.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.ReadOnlyListIterator;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.StateChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ChangeListener;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.utility.model.listener.StateChangeListener;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-
-/**
- * This extension of AspectAdapter provides ListChange support
- * by adapting a subject's state change events to a minimum set
- * of list change events.
- */
-public abstract class ListCurator<S extends Model, E>
-	extends AspectAdapter<S>
-	implements ListValueModel<E>
-{
-	/** How the list looked before the last state change */
-	private final ArrayList<E> record;
-
-	/** A listener that listens for the subject's state to change */
-	private final StateChangeListener stateChangeListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a Curator for the specified subject.
-	 */
-	protected ListCurator(S subject) {
-		this(new StaticPropertyValueModel<S>(subject));
-	}
-
-	/**
-	 * Construct a curator for the specified subject holder.
-	 * The subject holder cannot be null.
-	 */
-	protected ListCurator(PropertyValueModel<? extends S> subjectHolder) {
-		super(subjectHolder);
-		this.record = new ArrayList<E>();
-		this.stateChangeListener = this.buildStateChangeListener();
-	}
-
-
-	// ********** initialization **********
-
-	/**
-	 * The subject's state has changed, do inventory and report to listeners.
-	 */
-	protected StateChangeListener buildStateChangeListener() {
-		return new StateChangeListener() {
-			public void stateChanged(StateChangeEvent event) {
-				ListCurator.this.submitInventoryReport();
-			}
-			@Override
-			public String toString() {
-				return "state change listener";
-			}
-		};
-	}
-
-
-	// ********** ListValueModel implementation **********
-
-	public Iterator<E> iterator() {
-		return this.listIterator();
-	}
-
-	public ListIterator<E> listIterator() {
-		return new ReadOnlyListIterator<E>(this.record);
-	}
-
-	/**
-	 * Return the item at the specified index of the subject's list aspect.
-	 */
-	public E get(int index) {
-		return this.record.get(index);
-	}
-
-	/**
-	 * Return the size of the subject's list aspect.
-	 */
-	public int size() {
-		return this.record.size();
-	}
-
-	/**
-	 * Return an array manifestation of the subject's list aspect.
-	 */
-	public Object[] toArray() {
-		return this.record.toArray();
-	}
-
-
-	// ********** AspectAdapter implementation **********
-
-	@Override
-	protected Object getValue() {
-		return this.iterator();
-	}
-
-	@Override
-	protected Class<? extends ChangeListener> getListenerClass() {
-		return ListChangeListener.class;
-	}
-
-	@Override
-	protected String getListenerAspectName() {
-		return LIST_VALUES;
-	}
-
-	@Override
-	protected boolean hasListeners() {
-		return this.hasAnyListChangeListeners(LIST_VALUES);
-	}
-
-	/**
-	 * The aspect has changed, notify listeners appropriately.
-	 */
-	@Override
-	protected void fireAspectChange(Object oldValue, Object newValue) {
-		this.fireListChanged(LIST_VALUES);
-	}
-
-	/**
-	 * The subject is not null - add our listener.
-	 */
-	@Override
-	protected void engageSubject_() {
-		((Model) this.subject).addStateChangeListener(this.stateChangeListener);
-		// synch our list *after* we start listening to the subject,
-		// since its value might change when a listener is added
-		CollectionTools.addAll(this.record, this.iteratorForRecord());
-	}
-
-	/**
-	 * The subject is not null - remove our listener.
-	 */
-	@Override
-	protected void disengageSubject_() {
-		((Model) this.subject).removeStateChangeListener(this.stateChangeListener);
-		// clear out the list when we are not listening to the subject
-		this.record.clear();
-	}
-
-
-	// ********** ListCurator protocol **********
-
-	/**
-	 * This is intended to be different from #ListValueModel.iterator().
-	 * It is intended to be used only when the subject changes or the
-	 * subject's "state" changes (as signified by a state change event).
-	 */
-	protected abstract Iterator<E> iteratorForRecord();
-
-
-	// ********** behavior **********
-
-	void submitInventoryReport() {
-		List<E> newRecord = CollectionTools.list(this.iteratorForRecord());
-		int recordIndex = 0;
-
-		// add items from the new record
-		for (E newItem : newRecord) {
-			this.inventoryNewItem(recordIndex, newItem);
-			recordIndex++;
-		}
-
-		// clean out items that are no longer in the new record
-		for (recordIndex = 0; recordIndex < this.record.size(); ) {
-			E item = this.record.get(recordIndex);
-
-			if (newRecord.contains(item)) {
-				recordIndex++;
-			} else {
-				this.removeItemFromInventory(recordIndex, item);
-			}
-		}
-	}
-
-	private void inventoryNewItem(int recordIndex, E newItem) {
-		List<E> rec = new ArrayList<E>(this.record);
-
-		if ((recordIndex < rec.size()) && rec.get(recordIndex).equals(newItem)) {
-			return;
-		}
-		if (rec.contains(newItem)) {
-			this.removeItemFromInventory(recordIndex, rec.get(recordIndex));
-			this.inventoryNewItem(recordIndex, newItem);
-		} else {
-			this.addItemToInventory(recordIndex, newItem);
-		}
-	}
-
-	private void addItemToInventory(int index, E item) {
-		this.addItemToList(index, item, this.record, LIST_VALUES);
-	}
-
-	private void removeItemFromInventory(int index, E item) {
-		this.removeItemFromList(index, this.record, LIST_VALUES);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListPropertyValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListPropertyValueModelAdapter.java
deleted file mode 100644
index 6c78b4fd62..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListPropertyValueModelAdapter.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * This abstract class provides the infrastructure needed to wrap
- * a list value model, "lazily" listen to it, and convert
- * its change notifications into property value model change
- * notifications.
- * 
- * Subclasses must override:
- * - #buildValue()
- *     to return the current property value, as derived from the
- *     current list value
- * 
- * Subclasses might want to override:
- * - #itemsAdded(ListChangeEvent event)
- * - #itemsRemoved(ListChangeEvent event)
- * - #itemsReplaced(ListChangeEvent event)
- * - #itemsMoved(ListChangeEvent event)
- * - #listCleared(ListChangeEvent event)
- * - #listChanged(ListChangeEvent event)
- *     to improve performance (by not recalculating the value, if possible)
- */
-public abstract class ListPropertyValueModelAdapter<T>
-	extends AspectPropertyValueModelAdapter<T>
-{
-	/** The wrapped list value model. */
-	protected final ListValueModel<?> listHolder;
-
-	/** A listener that allows us to synch with changes to the wrapped list holder. */
-	protected final ListChangeListener listChangeListener;
-
-
-	// ********** constructor/initialization **********
-
-	/**
-	 * Construct a property value model with the specified wrapped
-	 * list value model.
-	 */
-	protected ListPropertyValueModelAdapter(ListValueModel<?> listHolder) {
-		super();
-		this.listHolder = listHolder;
-		this.listChangeListener = this.buildListChangeListener();
-	}
-
-	protected ListChangeListener buildListChangeListener() {
-		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent event) {
-				ListPropertyValueModelAdapter.this.itemsAdded(event);
-			}		
-			public void itemsRemoved(ListChangeEvent event) {
-				ListPropertyValueModelAdapter.this.itemsRemoved(event);
-			}
-			public void itemsReplaced(ListChangeEvent event) {
-				ListPropertyValueModelAdapter.this.itemsReplaced(event);
-			}
-			public void itemsMoved(ListChangeEvent event) {
-				ListPropertyValueModelAdapter.this.itemsMoved(event);
-			}
-			public void listCleared(ListChangeEvent event) {
-				ListPropertyValueModelAdapter.this.listCleared(event);
-			}
-			public void listChanged(ListChangeEvent event) {
-				ListPropertyValueModelAdapter.this.listChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "list change listener";
-			}
-		};
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Start listening to the list holder.
-	 */
-	@Override
-	protected void engageModel_() {
-		this.listHolder.addListChangeListener(ListValueModel.LIST_VALUES, this.listChangeListener);
-	}
-
-	/**
-	 * Stop listening to the list holder.
-	 */
-	@Override
-	protected void disengageModel_() {
-		this.listHolder.removeListChangeListener(ListValueModel.LIST_VALUES, this.listChangeListener);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.listHolder);
-	}
-
-	
-	// ********** collection change support **********
-
-	/**
-	 * Items were added to the wrapped list holder;
-	 * propagate the change notification appropriately.
-	 */
-	protected void itemsAdded(ListChangeEvent event) {
-		// by default, simply recalculate the value and fire an event
-		this.propertyChanged();
-	}
-
-	/**
-	 * Items were removed from the wrapped list holder;
-	 * propagate the change notification appropriately.
-	 */
-	protected void itemsRemoved(ListChangeEvent event) {
-		// by default, simply recalculate the value and fire an event
-		this.propertyChanged();
-	}
-
-	/**
-	 * Items were replaced in the wrapped list holder;
-	 * propagate the change notification appropriately.
-	 */
-	protected void itemsReplaced(ListChangeEvent event) {
-		// by default, simply recalculate the value and fire an event
-		this.propertyChanged();
-	}
-
-	/**
-	 * Items were moved in the wrapped list holder;
-	 * propagate the change notification appropriately.
-	 */
-	protected void itemsMoved(ListChangeEvent event) {
-		// by default, simply recalculate the value and fire an event
-		this.propertyChanged();
-	}
-
-	/**
-	 * The wrapped list holder was cleared;
-	 * propagate the change notification appropriately.
-	 */
-	protected void listCleared(ListChangeEvent event) {
-		// by default, simply recalculate the value and fire an event
-		this.propertyChanged();
-	}
-
-	/**
-	 * The value of the wrapped list holder has changed;
-	 * propagate the change notification appropriately.
-	 */
-	protected void listChanged(ListChangeEvent event) {
-		// by default, simply recalculate the value and fire an event
-		this.propertyChanged();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListValueModelWrapper.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListValueModelWrapper.java
deleted file mode 100644
index 06f5a072e5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListValueModelWrapper.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.internal.model.ChangeSupport;
-import org.eclipse.jpt.utility.internal.model.SingleAspectChangeSupport;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * This abstract class provides the infrastructure needed to wrap
- * another list value model, "lazily" listen to it, and propagate
- * its change notifications.
- */
-public abstract class ListValueModelWrapper<E>
-	extends AbstractModel
-{
-
-	/** The wrapped list value model. */
-	protected final ListValueModel<? extends E> listHolder;
-
-	/** A listener that allows us to synch with changes to the wrapped list holder. */
-	protected final ListChangeListener listChangeListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a list value model with the specified wrapped
-	 * list value model.
-	 */
-	protected ListValueModelWrapper(ListValueModel<? extends E> listHolder) {
-		super();
-		if (listHolder == null) {
-			throw new NullPointerException();
-		}
-		this.listHolder = listHolder;
-		this.listChangeListener = this.buildListChangeListener();
-	}
-	
-
-	// ********** initialization **********
-
-	@Override
-	protected ChangeSupport buildChangeSupport() {
-		return new SingleAspectChangeSupport(this, ListChangeListener.class, ListValueModel.LIST_VALUES);
-	}
-
-	protected ListChangeListener buildListChangeListener() {
-		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent event) {
-				ListValueModelWrapper.this.itemsAdded(event);
-			}
-			public void itemsRemoved(ListChangeEvent event) {
-				ListValueModelWrapper.this.itemsRemoved(event);
-			}
-			public void itemsReplaced(ListChangeEvent event) {
-				ListValueModelWrapper.this.itemsReplaced(event);
-			}
-			public void itemsMoved(ListChangeEvent event) {
-				ListValueModelWrapper.this.itemsMoved(event);
-			}
-			public void listCleared(ListChangeEvent event) {
-				ListValueModelWrapper.this.listCleared(event);
-			}
-			public void listChanged(ListChangeEvent event) {
-				ListValueModelWrapper.this.listChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "list change listener";
-			}
-		};
-	}
-
-
-	// ********** extend change support **********
-
-	/**
-	 * Extend to start listening to the nested model if necessary.
-	 */
-	@Override
-	public synchronized void addListChangeListener(ListChangeListener listener) {
-		if (this.hasNoListChangeListeners(ListValueModel.LIST_VALUES)) {
-			this.engageModel();
-		}
-		super.addListChangeListener(listener);
-	}
-	
-	/**
-	 * Extend to start listening to the nested model if necessary.
-	 */
-	@Override
-	public synchronized void addListChangeListener(String listName, ListChangeListener listener) {
-		if (listName == ListValueModel.LIST_VALUES && this.hasNoListChangeListeners(ListValueModel.LIST_VALUES)) {
-			this.engageModel();
-		}
-		super.addListChangeListener(listName, listener);
-	}
-	
-	/**
-	 * Extend to stop listening to the nested model if necessary.
-	 */
-	@Override
-	public synchronized void removeListChangeListener(ListChangeListener listener) {
-		super.removeListChangeListener(listener);
-		if (this.hasNoListChangeListeners(ListValueModel.LIST_VALUES)) {
-			this.disengageModel();
-		}
-	}
-	
-	/**
-	 * Extend to stop listening to the nested model if necessary.
-	 */
-	@Override
-	public synchronized void removeListChangeListener(String listName, ListChangeListener listener) {
-		super.removeListChangeListener(listName, listener);
-		if (listName == ListValueModel.LIST_VALUES && this.hasNoListChangeListeners(ListValueModel.LIST_VALUES)) {
-			this.disengageModel();
-		}
-	}
-	
-
-	// ********** behavior **********
-
-	/**
-	 * Start listening to the list holder.
-	 */
-	protected void engageModel() {
-		this.listHolder.addListChangeListener(ListValueModel.LIST_VALUES, this.listChangeListener);
-	}
-
-	/**
-	 * Stop listening to the list holder.
-	 */
-	protected void disengageModel() {
-		this.listHolder.removeListChangeListener(ListValueModel.LIST_VALUES, this.listChangeListener);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.listHolder);
-	}
-
-	// minimize suppressed warnings
-	@SuppressWarnings("unchecked")
-	protected ListIterator<E> items(ListChangeEvent event) {
-		return (ListIterator<E>) event.items();
-	}
-
-	// minimize suppressed warnings
-	@SuppressWarnings("unchecked")
-	protected ListIterator<E> replacedItems(ListChangeEvent event) {
-		return (ListIterator<E>) event.replacedItems();
-	}
-
-
-	// ********** list change support **********
-
-	/**
-	 * Items were added to the wrapped list holder;
-	 * propagate the change notification appropriately.
-	 */
-	protected abstract void itemsAdded(ListChangeEvent event);
-
-	/**
-	 * Items were removed from the wrapped list holder;
-	 * propagate the change notification appropriately.
-	 */
-	protected abstract void itemsRemoved(ListChangeEvent event);
-
-	/**
-	 * Items were replaced in the wrapped list holder;
-	 * propagate the change notification appropriately.
-	 */
-	protected abstract void itemsReplaced(ListChangeEvent event);
-
-	/**
-	 * Items were moved in the wrapped list holder;
-	 * propagate the change notification appropriately.
-	 */
-	protected abstract void itemsMoved(ListChangeEvent event);
-
-	/**
-	 * The wrapped list holder was cleared;
-	 * propagate the change notification appropriately.
-	 */
-	protected abstract void listCleared(ListChangeEvent event);
-
-	/**
-	 * The value of the wrapped list holder has changed;
-	 * propagate the change notification appropriately.
-	 */
-	protected abstract void listChanged(ListChangeEvent event);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/NullCollectionValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/NullCollectionValueModel.java
deleted file mode 100644
index db6447c94b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/NullCollectionValueModel.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Iterator;
-import org.eclipse.jpt.utility.internal.ClassTools;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-
-/**
- * A read-only collection value model for when you
- * don't need to support a collection. In particular, this
- * is useful for the leaf nodes of a tree that never have
- * children.
- * 
- * We don't use a singleton because we hold on to listeners.
- */
-public final class NullCollectionValueModel<E>
-	extends AbstractModel
-	implements CollectionValueModel<E>
-{
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Default constructor.
-	 */
-	public NullCollectionValueModel() {
-		super();
-	}
-	
-
-	// ********** CollectionValueModel implementation **********
-
-	public int size() {
-		return 0;
-	}
-
-	public Iterator<E> iterator() {
-		return EmptyIterator.instance();
-	}
-
-
-	// ********** Object overrides **********
-
-    @Override
-	public String toString() {
-    	return ClassTools.shortClassNameForObject(this);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/NullListValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/NullListValueModel.java
deleted file mode 100644
index 7bdb3ab3a3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/NullListValueModel.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.internal.ClassTools;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * An empty list value model for when you don't
- * need to support a list.
- * 
- * We don't use a singleton because we hold on to listeners.
- */
-public final class NullListValueModel<E>
-	extends AbstractModel
-	implements ListValueModel<E>
-{
-	private static final Object[] EMPTY_ARRAY = new Object[0];
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Default constructor.
-	 */
-	public NullListValueModel() {
-		super();
-	}
-
-
-	// ********** ListValueModel implementation **********
-
-	public Iterator<E> iterator() {
-		return EmptyIterator.instance();
-	}
-
-	public ListIterator<E> listIterator() {
-		return EmptyListIterator.instance();
-	}
-
-	public int size() {
-		return 0;
-	}
-
-	public E get(int index) {
-		throw new IndexOutOfBoundsException("Index: " + index + ", Size: 0");
-	}
-
-	public Object[] toArray() {
-		return EMPTY_ARRAY;
-	}
-
-
-	// ********** Object overrides **********
-
-	@Override
-	public String toString() {
-		return ClassTools.shortClassNameForObject(this);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/NullPropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/NullPropertyValueModel.java
deleted file mode 100644
index 12c9b670e8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/NullPropertyValueModel.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.internal.ClassTools;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-
-/**
- * A property value model for when you
- * don't need to support a value.
- * 
- * We don't use a singleton because we hold on to listeners.
- */
-public class NullPropertyValueModel<T>
-	extends AbstractModel
-	implements PropertyValueModel<T>
-{
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Default constructor.
-	 */
-	public NullPropertyValueModel() {
-		super();
-	}
-	
-
-	// ********** PropertyValueModel implementation **********
-
-	public T getValue() {
-		return null;
-	}
-
-
-	// ********** Object overrides **********
-
-    @Override
-	public String toString() {
-		return ClassTools.shortClassNameForObject(this);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/NullTreeValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/NullTreeValueModel.java
deleted file mode 100644
index b035c29811..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/NullTreeValueModel.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Iterator;
-import org.eclipse.jpt.utility.internal.ClassTools;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.model.value.TreeValueModel;
-
-/**
- * A tree value model for when you
- * don't need to support any nodes.
- * 
- * We don't use a singleton because we hold on to listeners.
- */
-public class NullTreeValueModel<E>
-	extends AbstractModel
-	implements TreeValueModel<E>
-{
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Default constructor.
-	 */
-	public NullTreeValueModel() {
-		super();
-	}
-	
-
-	// ********** TreeValueModel implementation **********
-
-	public Iterator<E> nodes() {
-		return EmptyIterator.instance();
-	}
-
-
-	// ********** Object overrides **********
-
-    @Override
-	public String toString() {
-		return ClassTools.shortClassNameForObject(this);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyAspectAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyAspectAdapter.java
deleted file mode 100644
index eb2b4f8b43..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyAspectAdapter.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Arrays;
-import java.util.Collection;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ChangeListener;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * This AspectAdapter provides basic PropertyChange support.
- * This allows us to convert a set of one or more properties into
- * a single property, VALUE.
- * 
- * The typical subclass will override the following methods:
- * #buildValue_()
- *     at the very minimum, override this method to return the value of the
- *     subject's property (or "virtual" property); it does not need to be
- *     overridden if #buildValue() is overridden and its behavior changed
- * #setValue_(Object)
- *     override this method if the client code needs to *set* the value of
- *     the subject's property; oftentimes, though, the client code (e.g. UI)
- *     will need only to *get* the value; it does not need to be
- *     overridden if #setValue(Object) is overridden and its behavior changed
- * #buildValue()
- *     override this method only if returning a null value when the subject is null
- *     is unacceptable
- * #setValue(Object)
- *     override this method only if something must be done when the subject
- *     is null (e.g. throw an exception)
- */
-public abstract class PropertyAspectAdapter<S extends Model, T>
-	extends AspectAdapter<S>
-	implements WritablePropertyValueModel<T>
-{
-	/**
-	 * Cache the current value of the aspect so we
-	 * can pass an "old value" when we fire a property change event.
-	 * We need this because the value may be calculated and may
-	 * not be in the property change event fired by the subject,
-	 * especially when dealing with multiple aspects.
-	 */
-	protected T value;
-
-	/** The name of the subject's properties that we use for the value. */
-	protected final String[] propertyNames;
-		protected static final String[] EMPTY_PROPERTY_NAMES = new String[0];
-
-	/** A listener that listens to the appropriate properties of the subject. */
-	protected final PropertyChangeListener propertyChangeListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a PropertyAspectAdapter for the specified subject
-	 * and property.
-	 */
-	protected PropertyAspectAdapter(String propertyName, S subject) {
-		this(new String[] {propertyName}, subject);
-	}
-
-	/**
-	 * Construct a PropertyAspectAdapter for the specified subject
-	 * and properties.
-	 */
-	protected PropertyAspectAdapter(String[] propertyNames, S subject) {
-		this(new StaticPropertyValueModel<S>(subject), propertyNames);
-	}
-
-	/**
-	 * Construct a PropertyAspectAdapter for the specified subject holder
-	 * and properties.
-	 */
-	protected PropertyAspectAdapter(PropertyValueModel<? extends S> subjectHolder, String... propertyNames) {
-		super(subjectHolder);
-		this.propertyNames = propertyNames;
-		this.propertyChangeListener = this.buildPropertyChangeListener();
-		// our value is null when we are not listening to the subject
-		this.value = null;
-	}
-
-	/**
-	 * Construct a PropertyAspectAdapter for the specified subject holder
-	 * and properties.
-	 */
-	protected PropertyAspectAdapter(PropertyValueModel<? extends S> subjectHolder, Collection<String> propertyNames) {
-		this(subjectHolder, propertyNames.toArray(new String[propertyNames.size()]));
-	}
-
-	/**
-	 * Construct a PropertyAspectAdapter for an "unchanging" property in
-	 * the specified subject. This is useful for a property aspect that does not
-	 * change for a particular subject; but the subject will change, resulting in
-	 * a new property. (A TransformationPropertyValueModel could also be
-	 * used in this situation.)
-	 */
-	protected PropertyAspectAdapter(PropertyValueModel<? extends S> subjectHolder) {
-		this(subjectHolder, EMPTY_PROPERTY_NAMES);
-	}
-
-
-	// ********** initialization **********
-
-	/**
-	 * The subject's property has changed, notify the listeners.
-	 */
-	protected PropertyChangeListener buildPropertyChangeListener() {
-		// transform the subject's property change events into VALUE property change events
-		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent event) {
-				PropertyAspectAdapter.this.propertyChanged();
-			}
-			@Override
-			public String toString() {
-				return "property change listener: " + Arrays.asList(PropertyAspectAdapter.this.propertyNames); //$NON-NLS-1$
-			}
-		};
-	}
-
-
-	// ********** PropertyValueModel implementation **********
-
-	/**
-	 * Return the value of the subject's property.
-	 */
-	@Override
-	public final T getValue() {
-		return this.value;
-	}
-
-
-	// ********** WritablePropertyValueModel implementation **********
-
-	/**
-	 * Set the value of the subject's property.
-	 */
-	public void setValue(T value) {
-		if (this.subject != null) {
-			this.setValue_(value);
-		}
-	}
-
-	/**
-	 * Set the value of the subject's property.
-	 * At this point we can be sure that the subject is not null.
-	 * @see #setValue(Object)
-	 */
-	protected void setValue_(@SuppressWarnings("unused") T value) {
-		throw new UnsupportedOperationException();
-	}
-
-
-	// ********** AspectAdapter implementation **********
-
-	@Override
-	protected Class<? extends ChangeListener> getListenerClass() {
-		return PropertyChangeListener.class;
-	}
-
-	@Override
-	protected String getListenerAspectName() {
-		return VALUE;
-	}
-
-    @Override
-	protected boolean hasListeners() {
-		return this.hasAnyPropertyChangeListeners(VALUE);
-	}
-
-    @Override
-	protected void fireAspectChange(Object oldValue, Object newValue) {
-		this.firePropertyChanged(VALUE, oldValue, newValue);
-	}
-
-    @Override
-	protected void engageSubject() {
-		super.engageSubject();
-		// synch our value *after* we start listening to the subject,
-		// since its value might change when a listener is added
-		this.value = this.buildValue();
-	}
-
-    @Override
-	protected void engageSubject_() {
-    	for (String propertyName : this.propertyNames) {
-			((Model) this.subject).addPropertyChangeListener(propertyName, this.propertyChangeListener);
-		}
-	}
-
-    @Override
-	protected void disengageSubject() {
-		super.disengageSubject();
-		// clear out our value when we are not listening to the subject
-		this.value = null;
-	}
-
-    @Override
-	protected void disengageSubject_() {
-    	for (String propertyName : this.propertyNames) {
-			((Model) this.subject).removePropertyChangeListener(propertyName, this.propertyChangeListener);
-		}
-	}
-
-
-	// ********** AbstractModel implementation **********
-
-	@Override
-	public void toString(StringBuilder sb) {
-		for (int i = 0; i < this.propertyNames.length; i++) {
-			if (i != 0) {
-				sb.append(", "); //$NON-NLS-1$
-			}
-			sb.append(this.propertyNames[i]);
-		}
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Return the aspect's value.
-	 * At this point the subject may be null.
-	 */
-	protected T buildValue() {
-		return (this.subject == null) ? null : this.buildValue_();
-	}
-
-	/**
-	 * Return the value of the subject's property.
-	 * At this point we can be sure that the subject is not null.
-	 * @see #buildValue()
-	 */
-	protected T buildValue_() {
-		throw new UnsupportedOperationException();
-	}
-
-	protected void propertyChanged() {
-		T old = this.value;
-		this.value = this.buildValue();
-		this.fireAspectChange(old, this.value);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyCollectionValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyCollectionValueModelAdapter.java
deleted file mode 100644
index 5b09ad161e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyCollectionValueModelAdapter.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Iterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.SingleElementIterator;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.internal.model.ChangeSupport;
-import org.eclipse.jpt.utility.internal.model.SingleAspectChangeSupport;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-
-/**
- * An adapter that allows us to make a PropertyValueModel behave like
- * a read-only, single-element CollectionValueModel, sorta.
- * 
- * If the property's value is null, an empty iterator is returned
- * (i.e. you can't have a collection with a null element).
- */
-public class PropertyCollectionValueModelAdapter<E>
-	extends AbstractModel
-	implements CollectionValueModel<E>
-{
-	/** The wrapped property value model. */
-	protected final PropertyValueModel<? extends E> valueHolder;
-
-	/** A listener that forwards any events fired by the value holder. */
-	protected final PropertyChangeListener propertyChangeListener;
-
-	/** Cache the value. */
-	protected E value;
-
-
-	// ********** constructors/initialization **********
-
-	/**
-	 * Wrap the specified ListValueModel.
-	 */
-	public PropertyCollectionValueModelAdapter(PropertyValueModel<? extends E> valueHolder) {
-		super();
-		if (valueHolder == null) {
-			throw new NullPointerException();
-		}
-		this.valueHolder = valueHolder;
-		this.propertyChangeListener = this.buildPropertyChangeListener();
-		// postpone building the value and listening to the underlying value
-		// until we have listeners ourselves...
-	}
-
-	@Override
-	protected ChangeSupport buildChangeSupport() {
-		return new SingleAspectChangeSupport(this, CollectionChangeListener.class, VALUES);
-	}
-
-	/**
-	 * The wrapped value has changed, forward an equivalent
-	 * collection change event to our listeners.
-	 */
-	protected PropertyChangeListener buildPropertyChangeListener() {
-		return new PropertyChangeListener() {
-			@SuppressWarnings("unchecked")
-			public void propertyChanged(PropertyChangeEvent event) {
-				PropertyCollectionValueModelAdapter.this.valueChanged((E) event.getNewValue());
-			}
-			@Override
-			public String toString() {
-				return "property change listener";
-			}
-		};
-	}
-
-
-	// ********** CollectionValueModel implementation **********
-
-	public Iterator<E> iterator() {
-		return (this.value == null) ?
-					EmptyIterator.<E>instance()
-				:
-					new SingleElementIterator<E>(this.value);
-	}
-
-	public int size() {
-		return (this.value == null) ? 0 : 1;
-	}
-
-
-	// ********** extend change support **********
-
-	/**
-	 * Override to start listening to the value holder if necessary.
-	 */
-	@Override
-	public void addCollectionChangeListener(CollectionChangeListener listener) {
-		if (this.hasNoListeners()) {
-			this.engageModel();
-		}
-		super.addCollectionChangeListener(listener);
-	}
-
-	/**
-	 * Override to start listening to the value holder if necessary.
-	 */
-	@Override
-	public void addCollectionChangeListener(String collectionName, CollectionChangeListener listener) {
-		if (collectionName == VALUES && this.hasNoListeners()) {
-			this.engageModel();
-		}
-		super.addCollectionChangeListener(collectionName, listener);
-	}
-
-	/**
-	 * Override to stop listening to the value holder if appropriate.
-	 */
-	@Override
-	public void removeCollectionChangeListener(CollectionChangeListener listener) {
-		super.removeCollectionChangeListener(listener);
-		if (this.hasNoListeners()) {
-			this.disengageModel();
-		}
-	}
-
-	/**
-	 * Override to stop listening to the value holder if appropriate.
-	 */
-	@Override
-	public void removeCollectionChangeListener(String collectionName, CollectionChangeListener listener) {
-		super.removeCollectionChangeListener(collectionName, listener);
-		if (collectionName == VALUES && this.hasNoListeners()) {
-			this.disengageModel();
-		}
-	}
-
-
-	// ********** queries **********
-
-	protected boolean hasListeners() {
-		return this.hasAnyCollectionChangeListeners(VALUES);
-	}
-
-	protected boolean hasNoListeners() {
-		return ! this.hasListeners();
-	}
-
-
-	// ********** behavior **********
-
-	protected void engageModel() {
-		this.valueHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.propertyChangeListener);
-		// synch our value *after* we start listening to the value holder,
-		// since its value might change when a listener is added
-		this.value = this.valueHolder.getValue();
-	}
-
-	protected void disengageModel() {
-		this.valueHolder.removePropertyChangeListener(PropertyValueModel.VALUE, this.propertyChangeListener);
-		// clear out the value when we are not listening to the value holder
-		this.value = null;
-	}
-
-	/**
-	 * synchronize our internal value with the wrapped value
-	 * and fire the appropriate events
-	 */
-	protected void valueChanged(E newValue) {
-		// put in "empty" check so we don't fire events unnecessarily
-		if (this.value != null) {
-			E oldValue = this.value;
-			this.value = null;
-			this.fireItemRemoved(VALUES, oldValue);
-		}
-		this.value = newValue;
-		// put in "empty" check so we don't fire events unnecessarily
-		if (this.value != null) {
-			this.fireItemAdded(VALUES, this.value);
-		}
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.valueHolder);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyListValueModelAdapter.java
deleted file mode 100644
index 96afe29e1f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyListValueModelAdapter.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.internal.model.ChangeSupport;
-import org.eclipse.jpt.utility.internal.model.SingleAspectChangeSupport;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-
-/**
- * An adapter that allows us to make a PropertyValueModel behave like
- * a read-only, single-element ListValueModel, sorta.
- * 
- * If the property's value is null, an empty iterator is returned
- * (i.e. you can't have a list with a null element).
- */
-public class PropertyListValueModelAdapter<E>
-	extends AbstractModel
-	implements ListValueModel<E>
-{
-
-	/** The wrapped property value model. */
-	protected final PropertyValueModel<? extends E> valueHolder;
-
-	/** A listener that forwards any events fired by the value holder. */
-	protected final PropertyChangeListener propertyChangeListener;
-
-	/** Cache the value. */
-	protected E value;
-
-
-	// ********** constructors/initialization **********
-
-	/**
-	 * Wrap the specified property value model.
-	 */
-	public PropertyListValueModelAdapter(PropertyValueModel<? extends E> valueHolder) {
-		super();
-		if (valueHolder == null) {
-			throw new NullPointerException();
-		}
-		this.valueHolder = valueHolder;
-		this.propertyChangeListener = this.buildPropertyChangeListener();
-		// postpone building the value and listening to the underlying value
-		// until we have listeners ourselves...
-	}
-
-	@Override
-	protected ChangeSupport buildChangeSupport() {
-		return new SingleAspectChangeSupport(this, ListChangeListener.class, LIST_VALUES);
-	}
-
-	/**
-	 * The wrapped value has changed, forward an equivalent
-	 * list change event to our listeners.
-	 */
-	protected PropertyChangeListener buildPropertyChangeListener() {
-		return new PropertyChangeListener() {
-			@SuppressWarnings("unchecked")
-			public void propertyChanged(PropertyChangeEvent event) {
-				PropertyListValueModelAdapter.this.valueChanged((E) event.getNewValue());
-			}
-			@Override
-			public String toString() {
-				return "property change listener";
-			}
-		};
-	}
-
-
-	// ********** ListValueModel implementation **********
-
-	public Iterator<E> iterator() {
-		return this.listIterator();
-	}
-
-	public ListIterator<E> listIterator() {
-		return (this.value == null) ?
-					EmptyListIterator.<E>instance()
-				:
-					new SingleElementListIterator<E>(this.value);
-	}
-
-	public int size() {
-		return (this.value == null) ? 0 : 1;
-	}
-
-	public E get(int index) {
-		if (this.value == null) {
-			throw this.ioobe(index, 0);
-		}
-		if (index > 0) {
-			throw this.ioobe(index, 1);
-		}
-		return this.value;
-	}
-
-	protected static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
-	public Object[] toArray() {
-		return (this.value == null) ? EMPTY_OBJECT_ARRAY : new Object[] {this.value};
-	}
-
-
-	// ********** extend change support **********
-
-	/**
-	 * Override to start listening to the value holder if necessary.
-	 */
-	@Override
-	public void addListChangeListener(ListChangeListener listener) {
-		if (this.hasNoListeners()) {
-			this.engageModel();
-		}
-		super.addListChangeListener(listener);
-	}
-
-	/**
-	 * Override to start listening to the value holder if necessary.
-	 */
-	@Override
-	public void addListChangeListener(String listName, ListChangeListener listener) {
-		if (listName == LIST_VALUES && this.hasNoListeners()) {
-			this.engageModel();
-		}
-		super.addListChangeListener(listName, listener);
-	}
-
-	/**
-	 * Override to stop listening to the value holder if appropriate.
-	 */
-	@Override
-	public void removeListChangeListener(ListChangeListener listener) {
-		super.removeListChangeListener(listener);
-		if (this.hasNoListeners()) {
-			this.disengageModel();
-		}
-	}
-
-	/**
-	 * Override to stop listening to the value holder if appropriate.
-	 */
-	@Override
-	public void removeListChangeListener(String listName, ListChangeListener listener) {
-		super.removeListChangeListener(listName, listener);
-		if (listName == LIST_VALUES && this.hasNoListeners()) {
-			this.disengageModel();
-		}
-	}
-
-
-	// ********** queries **********
-
-	protected boolean hasListeners() {
-		return this.hasAnyListChangeListeners(LIST_VALUES);
-	}
-
-	protected boolean hasNoListeners() {
-		return ! this.hasListeners();
-	}
-
-
-	// ********** behavior **********
-
-	protected IndexOutOfBoundsException ioobe(int index, int size) {
-		return new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
-	}
-
-	protected void engageModel() {
-		this.valueHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.propertyChangeListener);
-		// synch our value *after* we start listening to the value holder,
-		// since its value might change when a listener is added
-		this.value = this.valueHolder.getValue();
-	}
-
-	protected void disengageModel() {
-		this.valueHolder.removePropertyChangeListener(PropertyValueModel.VALUE, this.propertyChangeListener);
-		// clear out the value when we are not listening to the value holder
-		this.value = null;
-	}
-
-	/**
-	 * synchronize our internal value with the wrapped value
-	 * and fire the appropriate events
-	 */
-	protected void valueChanged(E newValue) {
-		E oldValue = this.value;
-		this.value = newValue;
-		if (oldValue == null) {
-			this.fireItemAdded(LIST_VALUES, 0, newValue);
-		} else {
-			if (newValue == null) {
-				this.fireItemRemoved(LIST_VALUES, 0, oldValue);
-			} else {
-				this.fireItemReplaced(LIST_VALUES, 0, newValue, oldValue);
-			}
-		}
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.valueHolder);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyValueModelWrapper.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyValueModelWrapper.java
deleted file mode 100644
index c5195af061..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyValueModelWrapper.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.internal.model.ChangeSupport;
-import org.eclipse.jpt.utility.internal.model.SingleAspectChangeSupport;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-
-/**
- * This abstract class provides the infrastructure needed to wrap
- * another property value model, "lazily" listen to it, and propagate
- * its change notifications.
- */
-public abstract class PropertyValueModelWrapper<T>
-	extends AbstractModel
-{
-
-	/** The wrapped property value model. */
-	protected final PropertyValueModel<? extends T> valueHolder;
-
-	/** A listener that allows us to synch with changes to the wrapped value holder. */
-	protected final PropertyChangeListener valueChangeListener;
-
-
-	// ********** constructors/initialization **********
-
-	/**
-	 * Construct a property value model with the specified wrapped
-	 * property value model. The value holder is required.
-	 */
-	protected PropertyValueModelWrapper(PropertyValueModel<? extends T> valueHolder) {
-		super();
-		if (valueHolder == null) {
-			throw new NullPointerException();
-		}
-		this.valueHolder = valueHolder;
-		this.valueChangeListener = this.buildValueChangeListener();
-	}
-	
-	@Override
-	protected ChangeSupport buildChangeSupport() {
-		return new SingleAspectChangeSupport(this, PropertyChangeListener.class, PropertyValueModel.VALUE);
-	}
-
-	protected PropertyChangeListener buildValueChangeListener() {
-		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent event) {
-				PropertyValueModelWrapper.this.valueChanged(event);
-			}
-		    @Override
-			public String toString() {
-				return "value change listener"; //$NON-NLS-1$
-			}
-		};
-	}
-	
-
-	// ********** extend change support **********
-
-	/**
-	 * Extend to start listening to the nested model if necessary.
-	 */
-    @Override
-	public synchronized void addPropertyChangeListener(PropertyChangeListener listener) {
-		if (this.hasNoPropertyChangeListeners(PropertyValueModel.VALUE)) {
-			this.engageValueHolder();
-		}
-		super.addPropertyChangeListener(listener);
-	}
-	
-	/**
-	 * Extend to start listening to the nested model if necessary.
-	 */
-    @Override
-	public synchronized void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) {
-		if (propertyName == PropertyValueModel.VALUE && this.hasNoPropertyChangeListeners(PropertyValueModel.VALUE)) {
-			this.engageValueHolder();
-		}
-		super.addPropertyChangeListener(propertyName, listener);
-	}
-	
-	/**
-	 * Extend to stop listening to the nested model if necessary.
-	 */
-    @Override
-	public synchronized void removePropertyChangeListener(PropertyChangeListener listener) {
-		super.removePropertyChangeListener(listener);
-		if (this.hasNoPropertyChangeListeners(PropertyValueModel.VALUE)) {
-			this.disengageValueHolder();
-		}
-	}
-	
-	/**
-	 * Extend to stop listening to the nested model if necessary.
-	 */
-    @Override
-	public synchronized void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) {
-		super.removePropertyChangeListener(propertyName, listener);
-		if (propertyName == PropertyValueModel.VALUE && this.hasNoPropertyChangeListeners(PropertyValueModel.VALUE)) {
-			this.disengageValueHolder();
-		}
-	}
-	
-
-	// ********** behavior **********
-	
-	/**
-	 * Begin listening to the value holder.
-	 */
-	protected void engageValueHolder() {
-		this.valueHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.valueChangeListener);
-	}
-	
-	/**
-	 * Stop listening to the value holder.
-	 */
-	protected void disengageValueHolder() {
-		this.valueHolder.removePropertyChangeListener(PropertyValueModel.VALUE, this.valueChangeListener);
-	}
-	
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.valueHolder);
-	}
-
-
-	// ********** property change support **********
-
-	/**
-	 * The value of the wrapped value holder has changed;
-	 * propagate the change notification appropriately.
-	 */
-	protected abstract void valueChanged(PropertyChangeEvent event);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SimpleCollectionValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SimpleCollectionValueModel.java
deleted file mode 100644
index e61c51136d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SimpleCollectionValueModel.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Collection;
-import java.util.Iterator;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.HashBag;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.internal.model.ChangeSupport;
-import org.eclipse.jpt.utility.internal.model.SingleAspectChangeSupport;
-import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-
-/**
- * Implementation of CollectionValueModel and Collection that simply holds a
- * collection and notifies listeners of any changes.
- */
-public class SimpleCollectionValueModel<E>
-	extends AbstractModel
-	implements CollectionValueModel<E>, Collection<E>
-{
-	/** The collection. */
-	protected Collection<E> collection;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a CollectionValueModel for the specified collection.
-	 */
-	public SimpleCollectionValueModel(Collection<E> collection) {
-		super();
-		if (collection == null) {
-			throw new NullPointerException();
-		}
-		this.collection = collection;
-	}
-
-	/**
-	 * Construct a CollectionValueModel with an empty initial collection.
-	 */
-	public SimpleCollectionValueModel() {
-		this(new HashBag<E>());
-	}
-
-	@Override
-	protected ChangeSupport buildChangeSupport() {
-		return new SingleAspectChangeSupport(this, CollectionChangeListener.class, VALUES);
-	}
-
-
-	// ********** CollectionValueModel implementation **********
-
-	public Iterator<E> iterator() {
-		return new LocalIterator<E>(this.collection.iterator());
-	}
-
-	public int size() {
-		return this.collection.size();
-	}
-
-
-	// ********** Collection implementation **********
-
-	public boolean isEmpty() {
-		return this.collection.isEmpty();
-	}
-
-	public boolean contains(Object o) {
-		return this.collection.contains(o);
-	}
-
-	public Object[] toArray() {
-		return this.collection.toArray();
-	}
-
-	public <T extends Object> T[] toArray(T[] a) {
-		return this.collection.toArray(a);
-	}
-
-	public boolean add(E o) {
-		return this.addItemToCollection(o, this.collection, VALUES);
-	}
-
-	public boolean remove(Object o) {
-		return this.removeItemFromCollection(o, this.collection, VALUES);
-	}
-
-	public boolean containsAll(Collection<?> c) {
-		return this.collection.containsAll(c);
-	}
-
-	public boolean addAll(Collection<? extends E> c) {
-		return this.addItemsToCollection(c, this.collection, VALUES);
-	}
-
-	public boolean removeAll(Collection<?> c) {
-		return this.removeItemsFromCollection(c, this.collection, VALUES);
-	}
-
-	public boolean retainAll(Collection<?> c) {
-		return this.retainItemsInCollection(c, this.collection, VALUES);
-	}
-
-	public void clear() {
-		this.clearCollection(this.collection, VALUES);
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (o == this) {
-			return true;
-		}
-		if ((o instanceof Collection) && (o instanceof CollectionValueModel)) {
-			Collection<E> c1 = CollectionTools.collection(this.collection);
-			@SuppressWarnings("unchecked")
-			Collection<E> c2 = CollectionTools.collection(((Collection<E>) o).iterator());
-			return c1.equals(c2);
-		}
-		return false;
-	}
-
-	@Override
-	public int hashCode() {
-		return CollectionTools.collection(this.collection).hashCode();
-	}
-
-
-	// ********** additional behavior **********
-
-	/**
-	 * Allow the collection to be replaced.
-	 */
-	public void setCollection(Collection<E> collection) {
-		if (collection == null) {
-			throw new NullPointerException();
-		}
-		this.collection = collection;
-		this.fireCollectionChanged(VALUES);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.collection);
-	}
-
-
-	// ********** iterator **********
-
-	private class LocalIterator<T> implements Iterator<T> {
-		private final Iterator<T> iterator;
-		private T next;
-
-		LocalIterator(Iterator<T> iterator) {
-			super();
-			this.iterator = iterator;
-		}
-
-		public boolean hasNext() {
-			return this.iterator.hasNext();
-		}
-
-		public T next() {
-			return this.next = this.iterator.next();
-		}
-
-		@SuppressWarnings("synthetic-access")
-		public void remove() {
-			this.iterator.remove();
-			SimpleCollectionValueModel.this.fireItemRemoved(VALUES, this.next);
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SimpleListValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SimpleListValueModel.java
deleted file mode 100644
index e6aca61c50..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SimpleListValueModel.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.internal.model.ChangeSupport;
-import org.eclipse.jpt.utility.internal.model.SingleAspectChangeSupport;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * Implementation of ListValueModel and List that simply holds a
- * collection and notifies listeners of any changes.
- */
-public class SimpleListValueModel<E>
-	extends AbstractModel
-	implements ListValueModel<E>, List<E>
-{
-	/** The list. */
-	protected List<E> list;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a ListValueModel for the specified list.
-	 */
-	public SimpleListValueModel(List<E> list) {
-		super();
-		if (list == null) {
-			throw new NullPointerException();
-		}
-		this.list = list;
-	}
-
-	/**
-	 * Construct a ListValueModel with an empty initial list.
-	 */
-	public SimpleListValueModel() {
-		this(new ArrayList<E>());
-	}
-
-	@Override
-	protected ChangeSupport buildChangeSupport() {
-		return new SingleAspectChangeSupport(this, ListChangeListener.class, LIST_VALUES);
-	}
-
-
-	// ********** ListValueModel implementation **********
-
-	public Iterator<E> iterator() {
-		return new LocalIterator<E>(this.list.iterator());
-	}
-
-	public ListIterator<E> listIterator() {
-		return new LocalListIterator<E>(this.list.listIterator());
-	}
-
-	public int size() {
-		return this.list.size();
-	}
-
-	public E get(int index) {
-		return this.list.get(index);
-	}
-
-
-	// ********** List implementation **********
-
-	public boolean isEmpty() {
-		return this.list.isEmpty();
-	}
-
-	public boolean contains(Object o) {
-		return this.list.contains(o);
-	}
-
-	public Object[] toArray() {
-		return this.list.toArray();
-	}
-
-	public <T extends Object> T[] toArray(T[] a) {
-		return this.list.toArray(a);
-	}
-
-	public boolean add(E o) {
-		return this.addItemToList(o, this.list, LIST_VALUES);
-	}
-
-	public boolean remove(Object o) {
-		return this.removeItemFromList(o, this.list, LIST_VALUES);
-	}
-
-	public boolean containsAll(Collection<?> c) {
-		return this.list.containsAll(c);
-	}
-
-	public boolean addAll(Collection<? extends E> c) {
-		return this.addItemsToList(c, this.list, LIST_VALUES);
-	}
-
-	public boolean addAll(int index, Collection<? extends E> c) {
-		return this.addItemsToList(index, c, this.list, LIST_VALUES);
-	}
-
-	public boolean removeAll(Collection<?> c) {
-		return this.removeItemsFromList(c, this.list, LIST_VALUES);
-	}
-
-	public boolean retainAll(Collection<?> c) {
-		return this.retainItemsInList(c, this.list, LIST_VALUES);
-	}
-
-	public void clear() {
-		this.clearList(this.list, LIST_VALUES);
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (o == this) {
-			return true;
-		}
-		if ((o instanceof List) && (o instanceof ListValueModel)) {
-			List<E> l1 = CollectionTools.list(this.list);
-			@SuppressWarnings("unchecked")
-			List<E> l2 = CollectionTools.list(((List<E>) o).iterator());
-			return l1.equals(l2);
-		}
-		return false;
-	}
-
-	@Override
-	public int hashCode() {
-		return this.list.hashCode();
-	}
-
-	public E set(int index, E element) {
-		return this.setItemInList(index, element, this.list, LIST_VALUES);
-	}
-
-	public void add(int index, E element) {
-		this.addItemToList(index, element, this.list, LIST_VALUES);
-	}
-
-	public E remove(int index) {
-		return this.removeItemFromList(index, this.list, LIST_VALUES);
-	}
-
-	public int indexOf(Object o) {
-		return this.list.indexOf(o);
-	}
-
-	public int lastIndexOf(Object o) {
-		return this.list.lastIndexOf(o);
-	}
-
-	public ListIterator<E> listIterator(int index) {
-		return new LocalListIterator<E>(this.list.listIterator(index));
-	}
-
-	public List<E> subList(int fromIndex, int toIndex) {
-		// TODO hmmm  ~bjv
-		throw new UnsupportedOperationException();
-	}
-
-
-	// ********** additional behavior **********
-
-	/**
-	 * Allow the list to be replaced.
-	 */
-	public void setList(List<E> list) {
-		if (list == null) {
-			throw new NullPointerException();
-		}
-		this.list = list;
-		this.fireListChanged(LIST_VALUES);
-	}
-
-	/**
-	 * Move a single element.
-	 */
-	public void move(int targetIndex, int sourceIndex) {
-		this.moveItemInList(targetIndex, sourceIndex, this.list, LIST_VALUES);
-	}
-
-	/**
-	 * Move a sub-list of elements.
-	 */
-	public void move(int targetIndex, int sourceIndex, int length) {
-		this.moveItemsInList(targetIndex, sourceIndex, length, this.list, LIST_VALUES);
-	}
-
-	/**
-	 * Remove a range of elements.
-	 */
-	public void remove(int index, int length) {
-		this.removeItemsFromList(index, length, this.list, LIST_VALUES);
-	}
-
-	/**
-	 * Set a range of elements.
-	 */
-	public void set(int index, List<E> elements) {
-		this.setItemsInList(index, elements, this.list, LIST_VALUES);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.list);
-	}
-
-
-	// ********** iterators **********
-
-	private class LocalIterator<T> implements Iterator<T> {
-		private final Iterator<T> iterator;
-		private int index = -1;
-		private T next;
-
-		LocalIterator(Iterator<T> iterator) {
-			super();
-			this.iterator = iterator;
-		}
-
-		public boolean hasNext() {
-			return this.iterator.hasNext();
-		}
-
-		public T next() {
-			this.next = this.iterator.next();
-			this.index++;
-			return this.next;
-		}
-
-		@SuppressWarnings("synthetic-access")
-		public void remove() {
-			this.iterator.remove();
-			SimpleListValueModel.this.fireItemRemoved(LIST_VALUES, this.index, this.next);
-		}
-
-	}
-
-	private class LocalListIterator<T> implements ListIterator<T> {
-		private final ListIterator<T> iterator;
-		private int last = -1;
-		private int next = 0;
-		private T current;
-
-		LocalListIterator(ListIterator<T> iterator) {
-			super();
-			this.iterator = iterator;
-		}
-
-		public boolean hasNext() {
-			return this.iterator.hasNext();
-		}
-
-		public T next() {
-			this.current = this.iterator.next();
-			this.last = this.next++;
-			return this.current;
-		}
-
-		public int nextIndex() {
-			return this.iterator.nextIndex();
-		}
-
-		public boolean hasPrevious() {
-			return this.iterator.hasPrevious();
-		}
-
-		public T previous() {
-			this.current = this.iterator.previous();
-			this.last = --this.next;
-			return this.current;
-		}
-
-		public int previousIndex() {
-			return this.iterator.previousIndex();
-		}
-
-		@SuppressWarnings("synthetic-access")
-		public void set(T o) {
-			this.iterator.set(o);
-			SimpleListValueModel.this.fireItemReplaced(LIST_VALUES, this.last, o, this.current);
-		}
-
-		@SuppressWarnings("synthetic-access")
-		public void add(T o) {
-			this.iterator.add(o);
-			SimpleListValueModel.this.fireItemAdded(LIST_VALUES, this.next, o);
-		}
-
-		@SuppressWarnings("synthetic-access")
-		public void remove() {
-			this.iterator.remove();
-			SimpleListValueModel.this.fireItemRemoved(LIST_VALUES, this.last, this.current);
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SimplePropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SimplePropertyValueModel.java
deleted file mode 100644
index e7248e65c5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SimplePropertyValueModel.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.internal.model.ChangeSupport;
-import org.eclipse.jpt.utility.internal.model.SingleAspectChangeSupport;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * Implementation of WritablePropertyValueModel that simply holds on to an
- * object and uses it as the value.
- */
-public class SimplePropertyValueModel<T>
-	extends AbstractModel
-	implements WritablePropertyValueModel<T>
-{
-	/** The value. */
-	protected T value;
-
-
-	/**
-	 * Construct a PropertyValueModel for the specified value.
-	 */
-	public SimplePropertyValueModel(T value) {
-		super();
-		this.value = value;
-	}
-
-	/**
-	 * Construct a PropertyValueModel with a starting value of null.
-	 */
-	public SimplePropertyValueModel() {
-		this(null);
-	}
-
-	@Override
-	protected ChangeSupport buildChangeSupport() {
-		return new SingleAspectChangeSupport(this, PropertyChangeListener.class, VALUE);
-	}
-
-
-	public T getValue() {
-		return this.value;
-	}
-
-	public void setValue(T value) {
-		T old = this.value;
-		this.value = value;
-		this.firePropertyChanged(VALUE, old, value);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.value);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SortedListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SortedListValueModelAdapter.java
deleted file mode 100644
index 2194ba4cb2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SortedListValueModelAdapter.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.Range;
-import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * An adapter that allows us to make a <code>CollectionValueModel</code>
- * (or <code>ListValueModel</code>) behave like a <code>ListValueModel</code>
- * that keeps its contents sorted and notifies listeners appropriately.
- * <p>
- * The comparator can be changed at any time; allowing the same
- * adapter to be used with different sort criteria (e.g. when the user
- * wants to sort a list of files first by name, then by date, then by size).
- * <p>
- * NB: Since we only listen to the wrapped collection when we have
- * listeners ourselves and we can only stay in synch with the wrapped
- * collection while we are listening to it, results to various methods
- * (e.g. <code>#size()</code>, <code>#getItem(int)</code>) will be
- * unpredictable whenever
- * we do not have any listeners. This should not be too painful since,
- * most likely, client objects will also be listeners.
- */
-public class SortedListValueModelAdapter<E>
-	extends CollectionListValueModelAdapter<E>
-{
-	/**
-	 * A comparator used for sorting the elements;
-	 * if it is null, we use "natural ordering".
-	 */
-	protected Comparator<E> comparator;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Wrap the specified collection value model and sort its contents
-	 * using the specified comparator.
-	 */
-	public SortedListValueModelAdapter(CollectionValueModel<? extends E> collectionHolder, Comparator<E> comparator) {
-		super(collectionHolder);
-		this.comparator = comparator;
-	}
-
-	/**
-	 * Wrap the specified collection value model and sort its contents
-	 * based on the elements' "natural ordering".
-	 */
-	public SortedListValueModelAdapter(CollectionValueModel<? extends E> collectionHolder) {
-		this(collectionHolder, null);
-	}
-
-	/**
-	 * Wrap the specified list value model and sort its contents
-	 * using the specified comparator.
-	 */
-	public SortedListValueModelAdapter(ListValueModel<? extends E> listHolder, Comparator<E> comparator) {
-		this(new ListCollectionValueModelAdapter<E>(listHolder), comparator);
-	}
-
-	/**
-	 * Wrap the specified list value model and sort its contents
-	 * based on the elements' "natural ordering".
-	 */
-	public SortedListValueModelAdapter(ListValueModel<? extends E> listHolder) {
-		this(listHolder, null);
-	}
-
-
-	// ********** accessors **********
-
-	public void setComparator(Comparator<E> comparator) {
-		this.comparator = comparator;
-		this.sortList();
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Sort the internal list before
-	 * sending out change notification.
-	 */
-	@Override
-	protected void postBuildList() {
-		super.postBuildList();
-		Collections.sort(this.list, this.comparator);
-	}
-
-	/**
-	 * the list will need to be sorted after the item is added
-	 */
-	@Override
-	protected void itemsAdded(CollectionChangeEvent event) {
-		// first add the items and notify our listeners...
-		super.itemsAdded(event);
-		// ...then sort the list
-		this.sortList();
-	}
-
-	/**
-	 * sort the list and notify our listeners, if necessary;
-	 */
-	protected void sortList() {
-		// save the unsorted state of the sorted list so we can minimize the number of "replaced" items
-		@SuppressWarnings("unchecked")
-		ArrayList<E> unsortedList = (ArrayList<E>) this.list.clone();
-		Collections.sort(this.list, this.comparator);
-		Range diffRange = CollectionTools.identityDiffRange(unsortedList, this.list);
-		if (diffRange.size > 0) {
-			List<E> unsortedItems = unsortedList.subList(diffRange.start, diffRange.end + 1);
-			List<E> sortedItems = this.list.subList(diffRange.start, diffRange.end + 1);
-			this.fireItemsReplaced(LIST_VALUES, diffRange.start, sortedItems, unsortedItems);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StatePropertyValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StatePropertyValueModelAdapter.java
deleted file mode 100644
index db6c0c916f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StatePropertyValueModelAdapter.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.StateChangeEvent;
-import org.eclipse.jpt.utility.model.listener.StateChangeListener;
-
-/**
- * This abstract class provides the infrastructure needed to wrap
- * a model, "lazily" listen to it, and convert
- * its state change notifications into property value model change
- * notifications.
- * 
- * Subclasses must override:
- * - #buildValue()
- *     to return the current property value, as derived from the
- *     current model
- * 
- * Subclasses might want to override:
- * - #stateChanged(StateChangeEvent event)
- *     to improve performance (by not recalculating the value, if possible)
- */
-public abstract class StatePropertyValueModelAdapter<T>
-	extends AspectPropertyValueModelAdapter<T>
-{
-	/** The wrapped model. */
-	protected final Model model;
-
-	/** A listener that allows us to synch with changes to the wrapped model. */
-	protected final StateChangeListener stateChangeListener;
-
-
-	// ********** constructor/initialization **********
-
-	/**
-	 * Construct a property value model with the specified wrapped model.
-	 */
-	protected StatePropertyValueModelAdapter(Model model) {
-		super();
-		this.model = model;
-		this.stateChangeListener = this.buildStateChangeListener();
-	}
-
-	protected StateChangeListener buildStateChangeListener() {
-		return new StateChangeListener() {
-			public void stateChanged(StateChangeEvent event) {
-				StatePropertyValueModelAdapter.this.stateChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "state change listener";
-			}
-		};
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Start listening to the model.
-	 */
-	@Override
-	protected void engageModel_() {
-		this.model.addStateChangeListener(this.stateChangeListener);
-	}
-
-	/**
-	 * Stop listening to the model.
-	 */
-	@Override
-	protected void disengageModel_() {
-		this.model.removeStateChangeListener(this.stateChangeListener);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.model);
-	}
-
-	
-	// ********** state change support **********
-
-	/**
-	 * The model's state changed;
-	 * propagate the change notification appropriately.
-	 */
-	protected void stateChanged(StateChangeEvent event) {
-		// by default, simply recalculate the value and fire an event
-		this.propertyChanged();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StaticCollectionValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StaticCollectionValueModel.java
deleted file mode 100644
index 136783b08b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StaticCollectionValueModel.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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.utility.internal.model.value;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.ReadOnlyIterator;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-
-/**
- * Implementation of CollectionValueModel that can be used for
- * returning an iterator on a static collection, but still allows listeners to be added.
- * Listeners will NEVER be notified of any changes, because there should be none.
- */
-public class StaticCollectionValueModel<E>
-	extends AbstractModel
-	implements CollectionValueModel<E>
-{
-	/** The collection. */
-	protected final Collection<? extends E> collection;
-
-	private static final long serialVersionUID = 1L;
-
-
-	/**
-	 * Construct a static CollectionValueModel for the specified array.
-	 */
-	public StaticCollectionValueModel(E[] array) {
-		this(CollectionTools.list(array));
-	}
-
-	/**
-	 * Construct a static CollectionValueModel for the specified collection.
-	 */
-	public StaticCollectionValueModel(Collection<? extends E> collection) {
-		super();
-		if (collection == null) {
-			throw new NullPointerException();
-		}
-		this.collection = collection;
-	}
-
-	// ********** CollectionValueModel implementation **********
-
-	public int size() {
-		return this.collection.size();
-	}
-
-	public Iterator<E> iterator() {
-		return new ReadOnlyIterator<E>(this.collection.iterator());
-	}
-
-
-	// ********** Object overrides **********
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.collection);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StaticListValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StaticListValueModel.java
deleted file mode 100644
index 01bc2fb1b9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StaticListValueModel.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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.utility.internal.model.value;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.ReadOnlyIterator;
-import org.eclipse.jpt.utility.internal.iterators.ReadOnlyListIterator;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * Implementation of ListValueModel that can be used for
- * returning a list iterator on a static list, but still allows listeners to be added.
- * Listeners will NEVER be notified of any changes, because there should be none.
- */
-public class StaticListValueModel<E>
-	extends AbstractModel
-	implements ListValueModel<E>
-{
-	/** The value. */
-	protected final List<? extends E> list;
-
-	private static final long serialVersionUID = 1L;
-
-
-	/**
-	 * Construct a static ListValueModel for the specified array.
-	 */
-	public StaticListValueModel(E[] array) {
-		this(CollectionTools.list(array));
-	}
-
-	/**
-	 * Construct a static ListValueModel for the specified list.
-	 */
-	public StaticListValueModel(List<? extends E> list) {
-		super();
-		if (list == null) {
-			throw new NullPointerException();
-		}
-		this.list = list;
-	}
-
-
-	// ********** ListValueModel implementation **********
-
-	public Iterator<E> iterator() {
-		return new ReadOnlyIterator<E>(this.list.iterator());
-	}
-
-	public ListIterator<E> listIterator() {
-		return new ReadOnlyListIterator<E>(this.list.listIterator());
-	}
-
-	public int size() {
-		return this.list.size();
-	}
-
-	public E get(int index) {
-		return this.list.get(index);
-	}
-
-	public Object[] toArray() {
-		return this.list.toArray();
-	}
-
-
-	// ********** Object overrides **********
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.list);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StaticPropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StaticPropertyValueModel.java
deleted file mode 100644
index e5eccf3ae2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StaticPropertyValueModel.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-
-/**
- * Implementation of PropertyValueModel that can be used for
- * returning a static value, but still allows listeners to be added.
- * Listeners will NEVER be notified of any changes, because there should be none.
- */
-public class StaticPropertyValueModel<T>
-	extends AbstractModel
-	implements PropertyValueModel<T>
-{
-	/** The value. */
-	protected final T value;
-
-	private static final long serialVersionUID = 1L;
-
-
-	/**
-	 * Construct a static PropertyValueModel for the specified value.
-	 */
-	public StaticPropertyValueModel(T value) {
-		super();
-		this.value = value;
-	}
-
-
-	// ********** PropertyValueModel implementation **********
-
-	public T getValue() {
-		return this.value;
-	}
-
-
-	// ********** Object overrides **********
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.value);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StaticTreeValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StaticTreeValueModel.java
deleted file mode 100644
index 6c435a3238..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StaticTreeValueModel.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Iterator;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.ReadOnlyIterator;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.model.value.TreeValueModel;
-
-/**
- * Implementation of TreeValueModel that can be used for
- * returning an iterator on a static tree, but still allows listeners to be added.
- * Listeners will NEVER be notified of any changes, because there should be none.
- */
-public class StaticTreeValueModel<E>
-	extends AbstractModel
-	implements TreeValueModel<E>
-{
-	/** The tree's nodes. */
-	protected final Iterable<? extends E> nodes;
-
-	private static final long serialVersionUID = 1L;
-
-
-	/**
-	 * Construct a read-only TreeValueModel for the specified nodes.
-	 */
-	public StaticTreeValueModel(Iterable<? extends E> nodes) {
-		super();
-		if (nodes == null) {
-			throw new NullPointerException();
-		}
-		this.nodes = nodes;
-	}
-
-	// ********** TreeValueModel implementation **********
-
-	public Iterator<E> nodes() {
-		return new ReadOnlyIterator<E>(this.nodes.iterator());
-	}
-
-
-	// ********** Object overrides **********
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, CollectionTools.collection(this.nodes()));
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TransformationListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TransformationListValueModelAdapter.java
deleted file mode 100644
index f1a7c1f877..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TransformationListValueModelAdapter.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.internal.Transformer;
-import org.eclipse.jpt.utility.internal.iterators.ReadOnlyListIterator;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * An adapter that allows us to transform a ListValueModel
- * (or CollectionValueModel) into a read-only ListValueModel
- * whose items are tranformations of the items in the wrapped
- * ListValueModel. It will keep its contents in synch with
- * the contents of the wrapped ListValueModel and notifies its
- * listeners of any changes.
- * <p>
- * The transformer can be changed at any time; allowing the same
- * adapter to be used with different transformations.
- * <p>
- * NB: Since we only listen to the wrapped list when we have
- * listeners ourselves and we can only stay in synch with the wrapped
- * list while we are listening to it, results to various methods
- * (e.g. #size(), #getItem(int)) will be unpredictable whenever
- * we do not have any listeners. This should not be too painful since,
- * most likely, client objects will also be listeners.
- */
-public class TransformationListValueModelAdapter<E1, E2>
-	extends ListValueModelWrapper<E1>
-	implements ListValueModel<E2>
-{
-
-	/** This transforms the items, unless the subclass overrides #transformItem(Object). */
-	protected Transformer<E1, E2> transformer;
-
-	/** The list of transformed items. */
-	protected final List<E2> transformedList;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Constructor - the list holder is required.
-	 */
-	public TransformationListValueModelAdapter(ListValueModel<? extends E1> listHolder, Transformer<E1, E2> transformer) {
-		super(listHolder);
-		this.transformer = transformer;
-		this.transformedList = new ArrayList<E2>();
-	}
-
-	/**
-	 * Constructor - the list holder is required.
-	 */
-	public TransformationListValueModelAdapter(ListValueModel<? extends E1> listHolder) {
-		this(listHolder, Transformer.Null.<E1, E2>instance());
-	}
-
-	/**
-	 * Constructor - the collection holder is required.
-	 */
-	public TransformationListValueModelAdapter(CollectionValueModel<? extends E1> collectionHolder, Transformer<E1, E2> transformer) {
-		this(new CollectionListValueModelAdapter<E1>(collectionHolder), transformer);
-	}
-
-	/**
-	 * Constructor - the collection holder is required.
-	 */
-	public TransformationListValueModelAdapter(CollectionValueModel<? extends E1> collectionHolder) {
-		this(new CollectionListValueModelAdapter<E1>(collectionHolder));
-	}
-
-
-	// ********** ListValueModel implementation **********
-
-	public Iterator<E2> iterator() {
-		return this.listIterator();
-	}
-
-	public ListIterator<E2> listIterator() {
-		return new ReadOnlyListIterator<E2>(this.transformedList);
-	}
-
-	public E2 get(int index) {
-		return this.transformedList.get(index);
-	}
-
-	public int size() {
-		return this.transformedList.size();
-	}
-
-	public Object[] toArray() {
-		return this.transformedList.toArray();
-	}
-
-	// ********** behavior **********
-
-    @Override
-	protected void engageModel() {
-		super.engageModel();
-		// synch the transformed list *after* we start listening to the list holder,
-		// since its value might change when a listener is added
-		this.transformedList.addAll(this.transformItems(this.listHolder));
-	}
-
-    @Override
-	protected void disengageModel() {
-		super.disengageModel();
-		// clear out the list when we are not listening to the collection holder
-		this.transformedList.clear();
-	}
-
-	/**
-	 * Transform the items associated with the specified event.
-	 */
-	protected List<E2> transformItems(ListChangeEvent event) {
-		return this.transformItems(this.items(event), event.itemsSize());
-	}
-
-	/**
-	 * Transform the items in the specified list value model.
-	 */
-	protected List<E2> transformItems(ListValueModel<? extends E1> lvm) {
-		return this.transformItems(lvm.listIterator(), lvm.size());
-	}
-
-	/**
-	 * Transform the replaced items associated with the specified event.
-	 */
-	protected List<E2> transformReplacedItems(ListChangeEvent event) {
-		return this.transformItems(this.replacedItems(event), event.itemsSize());
-	}
-
-	/**
-	 * Transform the specified items.
-	 */
-	protected List<E2> transformItems(ListIterator<? extends E1> items, int size) {
-		List<E2> result = new ArrayList<E2>(size);
-		while (items.hasNext()) {
-			result.add(this.transformItem(items.next()));
-		}
-		return result;
-	}
-
-	/**
-	 * Transform the specified item.
-	 */
-	protected E2 transformItem(E1 item) {
-		return this.transformer.transform(item);
-	}
-
-	/**
-	 * Change the transformer and rebuild the collection.
-	 */
-	public void setTransformer(Transformer<E1, E2> transformer) {
-		this.transformer = transformer;
-		this.rebuildTransformedList();
-	}
-
-	/**
-	 * Synchronize our cache with the wrapped collection.
-	 */
-	protected void rebuildTransformedList() {
-		this.transformedList.clear();
-		this.transformedList.addAll(this.transformItems(this.listHolder));
-		this.fireListChanged(LIST_VALUES);
-	}
-
-
-	// ********** list change support **********
-
-	/**
-	 * Items were added to the wrapped list holder.
-	 * Transform them, add them to our transformation list,
-	 * and notify our listeners.
-	 */
-    @Override
-	protected void itemsAdded(ListChangeEvent event) {
-		this.addItemsToList(event.getIndex(), this.transformItems(event), this.transformedList, LIST_VALUES);
-	}
-
-	/**
-	 * Items were removed from the wrapped list holder.
-	 * Remove the corresponding items from our transformation list
-	 * and notify our listeners.
-	 */
-    @Override
-	protected void itemsRemoved(ListChangeEvent event) {
-		this.removeItemsFromList(event.getIndex(), event.itemsSize(), this.transformedList, LIST_VALUES);
-	}
-
-	/**
-	 * Items were replaced in the wrapped list holder.
-	 * Replace the corresponding items in our transformation list
-	 * and notify our listeners.
-	 */
-    @Override
-	protected void itemsReplaced(ListChangeEvent event) {
-		this.setItemsInList(event.getIndex(), this.transformItems(event), this.transformedList, LIST_VALUES);
-	}
-
-	/**
-	 * Items were moved in the wrapped list holder.
-	 * Move the corresponding items in our transformation list
-	 * and notify our listeners.
-	 */
-    @Override
-	protected void itemsMoved(ListChangeEvent event) {
-    	this.moveItemsInList(event.getTargetIndex(), event.getSourceIndex(), event.getMoveLength(), this.transformedList, LIST_VALUES);
-	}
-
-	/**
-	 * The wrapped list holder was cleared.
-	 * Clear our transformation list and notify our listeners.
-	 */
-    @Override
-	protected void listCleared(ListChangeEvent event) {
-    	this.clearList(this.transformedList, LIST_VALUES);
-	}
-
-	/**
-	 * The wrapped list holder has changed in some dramatic fashion.
-	 * Rebuild our transformation list and notify our listeners.
-	 */
-    @Override
-	protected void listChanged(ListChangeEvent event) {
-		this.rebuildTransformedList();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TransformationPropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TransformationPropertyValueModel.java
deleted file mode 100644
index ba878e5c19..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TransformationPropertyValueModel.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.internal.Transformer;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-
-/**
- * A <code>TransformationPropertyValueModel</code> wraps another
- * <code>PropertyValueModel</code> and uses a <code>Transformer</code>
- * to transform the wrapped value before it is returned by <code>value()</code>.
- * <p>
- * As an alternative to building a <code>Transformer</code>,
- * a subclass of <code>TransformationPropertyValueModel</code> can
- * either override the <code>transform_(Object)</code> method or,
- * if something other than null should be returned when the wrapped value
- * is null, override the <code>transform(Object)</code> method.
- */
-public class TransformationPropertyValueModel<T1, T2>
-	extends PropertyValueModelWrapper<T1>
-	implements PropertyValueModel<T2>
-{
-	protected final Transformer<T1, T2> transformer;
-
-
-	// ********** constructors/initialization **********
-
-	/**
-	 * Construct a property value model with the specified nested
-	 * property value model and the default transformer.
-	 * Use this constructor if you want to override the
-	 * <code>transform_(Object)</code> or <code>transform(Object)</code>
-	 * method instead of building a <code>Transformer</code>.
-	 */
-	public TransformationPropertyValueModel(PropertyValueModel<? extends T1> valueHolder) {
-		super(valueHolder);
-		this.transformer = this.buildTransformer();
-	}
-
-	/**
-	 * Construct an property value model with the specified nested
-	 * property value model and transformer.
-	 */
-	public TransformationPropertyValueModel(PropertyValueModel<? extends T1> valueHolder, Transformer<T1, T2> transformer) {
-		super(valueHolder);
-		this.transformer = transformer;
-	}
-
-	protected Transformer<T1, T2> buildTransformer() {
-		return new DefaultTransformer();
-	}
-
-
-	// ********** PropertyValueModel implementation **********
-
-	public T2 getValue() {
-		// transform the object returned by the nested value model before returning it
-		return this.transform(this.valueHolder.getValue());
-	}
-
-
-	// ********** PropertyValueModelWrapper implementation **********
-
-	@Override
-	protected void valueChanged(PropertyChangeEvent event) {
-		// transform the values before propagating the change event
-	    @SuppressWarnings("unchecked")
-		Object oldValue = this.transformOld((T1) event.getOldValue());
-	    @SuppressWarnings("unchecked")
-		Object newValue = this.transformNew((T1) event.getNewValue());
-		this.firePropertyChanged(VALUE, oldValue, newValue);
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Transform the specified value and return the result.
-	 * This is called by #value() and #valueChanged(PropertyChangeEvent).
-	 */
-	protected T2 transform(T1 value) {
-		return this.transformer.transform(value);
-	}
-
-	/**
-	 * Transform the specified, non-null, value and return the result.
-	 */
-	protected T2 transform_(@SuppressWarnings("unused") T1 value) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Transform the specified old value and return the result.
-	 * By default, call {@link #transform(Object)}.
-	 * This is called by {@link #valueChanged(PropertyChangeEvent)}.
-	 */
-	protected T2 transformOld(T1 value) {
-		return this.transform(value);
-	}
-	
-	/**
-	 * Transform the specified new value and return the result.
-	 * By default, call {@link #transform(Object)}.
-	 * This is called by {@link #valueChanged(PropertyChangeEvent)}.
-	 */
-	protected T2 transformNew(T1 value) {
-		return this.transform(value);
-	}
-
-	// ********** default transformer **********
-
-	/**
-	 * The default transformer will return null if the wrapped value is null.
-	 * If the wrapped value is not null, it is transformed by a subclass
-	 * implementation of #transform_(Object).
-	 */
-	protected class DefaultTransformer implements Transformer<T1, T2> {
-		public T2 transform(T1 value) {
-			return (value == null) ? null : TransformationPropertyValueModel.this.transform_(value);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TransformationWritablePropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TransformationWritablePropertyValueModel.java
deleted file mode 100644
index 1299097bf7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TransformationWritablePropertyValueModel.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.internal.BidiTransformer;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * A <code>TransformationWritablePropertyValueModel</code> wraps another
- * <code>WritablePropertyValueModel</code> and uses a <code>BidiTransformer</code>
- * to:<ul>
- * <li>transform the wrapped value before it is returned by <code>value()</code>
- * <li>"reverse-transform" the new value that comes in via
- * <code>setValue(Object)</code>
- * </ul>
- * As an alternative to building a <code>BidiTransformer</code>,
- * a subclass of <code>TransformationWritablePropertyValueModel</code> can
- * override the <code>transform_(Object)</code> and 
- * <code>reverseTransform_(Object)</code> methods; or,
- * if something other than null should be returned when the wrapped value
- * is null or the new value is null, override the <code>transform(Object)</code>
- * and <code>reverseTransform(Object)</code> methods.
- */
-public class TransformationWritablePropertyValueModel<T1, T2>
-	extends TransformationPropertyValueModel<T1, T2>
-	implements WritablePropertyValueModel<T2>
-{
-
-	// ********** constructors/initialization **********
-
-	/**
-	 * Construct a writable property value model with the specified nested
-	 * writable property value model and the default bidi transformer.
-	 * Use this constructor if you want to override the
-	 * <code>transform_(Object)</code> and <code>reverseTransform_(Object)</code>
-	 * (or <code>transform(Object)</code> and <code>reverseTransform(Object)</code>)
-	 * methods instead of building a <code>BidiTransformer</code>.
-	 */
-	public TransformationWritablePropertyValueModel(WritablePropertyValueModel<T1> valueHolder) {
-		super(valueHolder);
-	}
-
-	/**
-	 * Construct a writable property value model with the specified nested
-	 * writable property value model and bidi transformer.
-	 */
-	public TransformationWritablePropertyValueModel(WritablePropertyValueModel<T1> valueHolder, BidiTransformer<T1, T2> transformer) {
-		super(valueHolder, transformer);
-	}
-
-	@Override
-	protected BidiTransformer<T1, T2> buildTransformer() {
-		return new DefaultBidiTransformer();
-	}
-
-
-	// ********** WritablePropertyValueModel implementation **********
-
-	public void setValue(T2 value) {
-		// "reverse-transform" the object before passing it to the the nested value model
-		this.valueHolder().setValue(this.reverseTransform(value));
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * "Reverse-transform" the specified value and return the result.
-	 * This is called by #setValue(Object).
-	 */
-	protected T1 reverseTransform(T2 value) {
-		return this.transformer().reverseTransform(value);
-	}
-
-	/**
-	 * "Reverse-transform" the specified, non-null, value and return the result.
-	 */
-	protected T1 reverseTransform_(@SuppressWarnings("unused") T2 value) {
-		throw new UnsupportedOperationException();
-	}
-
-
-	// ********** queries **********
-
-	/**
-	 * Our constructors accept only a WritablePropertyValueModel<T1>.
-	 */
-	@SuppressWarnings("unchecked")
-	protected WritablePropertyValueModel<T1> valueHolder() {
-		return (WritablePropertyValueModel<T1>) this.valueHolder;
-	}
-
-	/**
-	 * Our constructors accept only a bidirectional transformer.
-	 */
-	protected BidiTransformer<T1, T2> transformer() {
-		return (BidiTransformer<T1, T2>) this.transformer;
-	}
-
-
-	// ********** default bidi transformer **********
-
-	/**
-	 * The default bidi transformer will return null if the wrapped value is null.
-	 * If the wrapped value is not null, it is transformed by a subclass
-	 * implementation of #transform_(Object).
-	 * The default bidi transformer will also return null if the new value is null.
-	 * If the new value is not null, it is reverse-transformed by a subclass
-	 * implementation of #reverseTransform_(Object).
-	 */
-	protected class DefaultBidiTransformer
-		extends DefaultTransformer
-		implements BidiTransformer<T1, T2>
-	{
-		public T1 reverseTransform(T2 value) {
-			return (value == null) ? null : TransformationWritablePropertyValueModel.this.reverseTransform_(value);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TreeAspectAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TreeAspectAdapter.java
deleted file mode 100644
index 739bb97012..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TreeAspectAdapter.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.TreeChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ChangeListener;
-import org.eclipse.jpt.utility.model.listener.TreeChangeListener;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.utility.model.value.TreeValueModel;
-
-/**
- * This extension of PropertyAdapter provides TreeChange support.
- * This allows us to convert a set of one or more trees into
- * a single tree, NODES.
- * 
- * The typical subclass will override the following methods:
- * #nodes_()
- *     at the very minimum, override this method to return an iterator
- *     on the subject's tree aspect; it does not need to be overridden if
- *     #nodes() is overridden and its behavior changed
- * #nodes()
- *     override this method only if returning an empty iterator when the
- *     subject is null is unacceptable
- */
-public abstract class TreeAspectAdapter<S extends Model, E>
-	extends AspectAdapter<S>
-	implements TreeValueModel<E>
-{
-	/**
-	 * The name of the subject's trees that we use for the value.
-	 */
-	protected final String[] treeNames;
-		protected static final String[] EMPTY_TREE_NAMES = new String[0];
-
-	/** A listener that listens to the subject's tree aspect. */
-	protected final TreeChangeListener treeChangeListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a TreeAspectAdapter for the specified subject
-	 * and tree.
-	 */
-	protected TreeAspectAdapter(String treeName, S subject) {
-		this(new String[] {treeName}, subject);
-	}
-
-	/**
-	 * Construct a TreeAspectAdapter for the specified subject
-	 * and trees.
-	 */
-	protected TreeAspectAdapter(String[] treeNames, S subject) {
-		this(new StaticPropertyValueModel<S>(subject), treeNames);
-	}
-
-	/**
-	 * Construct a TreeAspectAdapter for the specified subject holder
-	 * and trees.
-	 */
-	protected TreeAspectAdapter(PropertyValueModel<? extends S> subjectHolder, String... treeNames) {
-		super(subjectHolder);
-		this.treeNames = treeNames;
-		this.treeChangeListener = this.buildTreeChangeListener();
-	}
-
-	/**
-	 * Construct a TreeAspectAdapter for the specified subject holder
-	 * and trees.
-	 */
-	protected TreeAspectAdapter(PropertyValueModel<? extends S> subjectHolder, Collection<String> treeNames) {
-		this(subjectHolder, treeNames.toArray(new String[treeNames.size()]));
-	}
-
-	/**
-	 * Construct a TreeAspectAdapter for an "unchanging" tree in
-	 * the specified subject. This is useful for a tree aspect that does not
-	 * change for a particular subject; but the subject will change, resulting in
-	 * a new tree.
-	 */
-	protected TreeAspectAdapter(PropertyValueModel<? extends S> subjectHolder) {
-		this(subjectHolder, EMPTY_TREE_NAMES);
-	}
-
-
-	// ********** initialization **********
-
-	/**
-	 * The subject's tree aspect has changed, notify the listeners.
-	 */
-	protected TreeChangeListener buildTreeChangeListener() {
-		// transform the subject's tree change events into VALUE tree change events
-		return new TreeChangeListener() {
-			public void nodeAdded(TreeChangeEvent event) {
-				TreeAspectAdapter.this.nodeAdded(event);
-			}
-			public void nodeRemoved(TreeChangeEvent event) {
-				TreeAspectAdapter.this.nodeRemoved(event);
-			}
-			public void treeCleared(TreeChangeEvent event) {
-				TreeAspectAdapter.this.treeCleared(event);
-			}
-			public void treeChanged(TreeChangeEvent event) {
-				TreeAspectAdapter.this.treeChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "tree change listener: " + Arrays.asList(TreeAspectAdapter.this.treeNames);
-			}
-		};
-	}
-
-
-	// ********** TreeValueModel implementation **********
-
-	/**
-	 * Return the nodes of the subject's tree aspect.
-	 */
-	public Iterator<E> nodes() {
-		return (this.subject == null) ? EmptyIterator.<E>instance() : this.nodes_();
-	}
-
-	/**
-	 * Return the nodes of the subject's tree aspect.
-	 * At this point we can be sure that the subject is not null.
-	 * @see #nodes()
-	 */
-	protected Iterator<E> nodes_() {
-		throw new UnsupportedOperationException();
-	}
-
-
-	// ********** AspectAdapter implementation **********
-
-	@Override
-	protected Object getValue() {
-		return this.nodes();
-	}
-
-	@Override
-	protected Class<? extends ChangeListener> getListenerClass() {
-		return TreeChangeListener.class;
-	}
-
-	@Override
-	protected String getListenerAspectName() {
-		return NODES;
-	}
-
-    @Override
-	protected boolean hasListeners() {
-		return this.hasAnyTreeChangeListeners(NODES);
-	}
-
-    @Override
-	protected void fireAspectChange(Object oldValue, Object newValue) {
-		this.fireTreeChanged(NODES);
-	}
-
-    @Override
-	protected void engageSubject_() {
-    	for (String treeName : this.treeNames) {
-			((Model) this.subject).addTreeChangeListener(treeName, this.treeChangeListener);
-		}
-	}
-
-    @Override
-	protected void disengageSubject_() {
-    	for (String treeName : this.treeNames) {
-			((Model) this.subject).removeTreeChangeListener(treeName, this.treeChangeListener);
-		}
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		for (int i = 0; i < this.treeNames.length; i++) {
-			if (i != 0) {
-				sb.append(", ");
-			}
-			sb.append(this.treeNames[i]);
-		}
-	}
-
-
-	// ********** behavior **********
-
-	protected void nodeAdded(TreeChangeEvent event) {
-		this.fireNodeAdded(NODES, event.getPath());
-	}
-
-	protected void nodeRemoved(TreeChangeEvent event) {
-		this.fireNodeRemoved(NODES, event.getPath());
-	}
-
-	protected void treeCleared(TreeChangeEvent event) {
-		this.fireTreeCleared(NODES);
-	}
-
-	protected void treeChanged(TreeChangeEvent event) {
-		this.fireTreeChanged(NODES, event.getPath());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TreePropertyValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TreePropertyValueModelAdapter.java
deleted file mode 100644
index 11b6f1a2b9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TreePropertyValueModelAdapter.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.model.event.TreeChangeEvent;
-import org.eclipse.jpt.utility.model.listener.TreeChangeListener;
-import org.eclipse.jpt.utility.model.value.TreeValueModel;
-
-/**
- * This abstract class provides the infrastructure needed to wrap
- * a tree value model, "lazily" listen to it, and convert
- * its change notifications into property value model change
- * notifications.
- * 
- * Subclasses must override:
- * - #buildValue()
- *     to return the current property value, as derived from the
- *     current collection value
- * 
- * Subclasses might want to override:
- * - #stateChanged(StateChangeEvent event)
- *     to improve performance (by not recalculating the value, if possible)
- */
-public abstract class TreePropertyValueModelAdapter<T>
-	extends AspectPropertyValueModelAdapter<T>
-{
-	/** The wrapped tree value model. */
-	protected final TreeValueModel<?> treeHolder;
-
-	/** A listener that allows us to synch with changes to the wrapped tree holder. */
-	protected final TreeChangeListener treeChangeListener;
-
-
-	// ********** constructor/initialization **********
-
-	/**
-	 * Construct a property value model with the specified wrapped
-	 * tree value model.
-	 */
-	protected TreePropertyValueModelAdapter(TreeValueModel<?> treeHolder) {
-		super();
-		this.treeHolder = treeHolder;
-		this.treeChangeListener = this.buildTreeChangeListener();
-	}
-
-	protected TreeChangeListener buildTreeChangeListener() {
-		return new TreeChangeListener() {
-			public void nodeAdded(TreeChangeEvent event) {
-				TreePropertyValueModelAdapter.this.nodeAdded(event);
-			}
-			public void nodeRemoved(TreeChangeEvent event) {
-				TreePropertyValueModelAdapter.this.nodeRemoved(event);
-			}
-			public void treeCleared(TreeChangeEvent event) {
-				TreePropertyValueModelAdapter.this.treeCleared(event);
-			}
-			public void treeChanged(TreeChangeEvent event) {
-				TreePropertyValueModelAdapter.this.treeChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "tree change listener";
-			}
-		};
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Start listening to the tree holder.
-	 */
-	@Override
-	protected void engageModel_() {
-		this.treeHolder.addTreeChangeListener(this.treeChangeListener);
-	}
-
-	/**
-	 * Stop listening to the tree holder.
-	 */
-	@Override
-	protected void disengageModel_() {
-		this.treeHolder.removeTreeChangeListener(this.treeChangeListener);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.treeHolder);
-	}
-
-	
-	// ********** state change support **********
-
-	/**
-	 * Nodes were added to the wrapped tree holder;
-	 * propagate the change notification appropriately.
-	 */
-	protected void nodeAdded(TreeChangeEvent event) {
-		// by default, simply recalculate the value and fire an event
-		this.propertyChanged();
-	}
-
-	/**
-	 * Nodes were removed from the wrapped tree holder;
-	 * propagate the change notification appropriately.
-	 */
-	protected void nodeRemoved(TreeChangeEvent event) {
-		// by default, simply recalculate the value and fire an event
-		this.propertyChanged();
-	}
-
-	/**
-	 * The wrapped tree holder was cleared;
-	 * propagate the change notification appropriately.
-	 */
-	protected void treeCleared(TreeChangeEvent event) {
-		// by default, simply recalculate the value and fire an event
-		this.propertyChanged();
-	}
-
-	/**
-	 * The wrapped tree holder changed;
-	 * propagate the change notification appropriately.
-	 */
-	protected void treeChanged(TreeChangeEvent event) {
-		// by default, simply recalculate the value and fire an event
-		this.propertyChanged();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueAspectAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueAspectAdapter.java
deleted file mode 100644
index 6fea2e865f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueAspectAdapter.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.internal.model.ChangeSupport;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.StateChangeListener;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * Abstract model that provides behavior for wrapping a property
- * value model and listening for changes to aspects of the *value* contained
- * by the property value model. Changes to the actual value are also monitored.
- * 
- * This is useful if you have a value that may change, but whose aspects can also
- * change in a fashion that might be of interest to the client.
- * 
- * NB: Clients will need to listen for two different change notifications: a property
- * change event will be be fired when the value changes; a state change event
- * will be fired when an aspect of the value changes.
- * 
- * Subclasses need to override two methods:
- * 
- * #engageValue_()
- *     begin listening to the appropriate aspect of the value and call
- *     #valueAspectChanged(Object) whenever the aspect changes
- * 
- * #disengageValue_()
- *     stop listening to the appropriate aspect of the value
- */
-public abstract class ValueAspectAdapter<T>
-	extends PropertyValueModelWrapper<T>
-	implements WritablePropertyValueModel<T>
-{
-	/** Cache the value so we can disengage. Null until we have a listener*/
-	protected T value;
-
-
-	// ********** constructors/initialization **********
-
-	/**
-	 * Constructor - the value holder is required.
-	 */
-	protected ValueAspectAdapter(WritablePropertyValueModel<T> valueHolder) {
-		super(valueHolder);
-	}
-
-	/**
-	 * Override to allow both property value model change and state change
-	 * listeners.
-	 */
-	@Override
-	protected ChangeSupport buildChangeSupport() {
-		return new ChangeSupport(this);
-	}
-
-
-	// ********** PropertyValueModel implementation **********
-
-	public T getValue() {
-		return this.value;
-	}
-
-
-	// ********** WritablePropertyValueModel implementation **********
-
-	public void setValue(T value) {
-		this.valueHolder().setValue(value);
-	}
-
-
-	// ********** PropertyValueModelWrapper implementation **********
-
-	@Override
-	protected void valueChanged(PropertyChangeEvent event) {
-		this.disengageValue();
-		this.engageValue();
-		this.firePropertyChanged(event.cloneWithSource(this));
-	}
-
-
-	// ********** extend change support **********
-
-	@Override
-	public synchronized void addStateChangeListener(StateChangeListener listener) {
-		if (this.hasNoStateChangeListeners()) {
-			this.engageValue();
-		}
-		super.addStateChangeListener(listener);
-	}
-
-	@Override
-	public synchronized void removeStateChangeListener(StateChangeListener listener) {
-		super.removeStateChangeListener(listener);
-		if (this.hasNoStateChangeListeners()) {
-			this.disengageValue();
-		}
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Start listening to the current value.
-	 */
-	protected void engageValue() {
-		this.value = this.valueHolder.getValue();
-		if (this.value != null) {
-			this.engageValue_();
-		}
-	}
-
-	/**
-	 * Start listening to the current value.
-	 * At this point we can be sure that the value is not null.
-	 */
-	protected abstract void engageValue_();
-
-	/**
-	 * Stop listening to the current value.
-	 */
-	protected void disengageValue() {
-		if (this.value != null) {
-			this.disengageValue_();
-			this.value = null;
-		}
-	}
-
-	/**
-	 * Stop listening to the current value.
-	 * At this point we can be sure that the value is not null.
-	 */
-	protected abstract void disengageValue_();
-
-	/**
-	 * Subclasses should call this method whenever the value's aspect changes.
-	 */
-	protected void valueAspectChanged() {
-		this.fireStateChanged();
-	}
-
-	/**
-	 * Our constructors accept only a WritablePropertyValueModel<T1>.
-	 */
-	@SuppressWarnings("unchecked")
-	protected WritablePropertyValueModel<T> valueHolder() {
-		return (WritablePropertyValueModel<T>) this.valueHolder;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueCollectionAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueCollectionAdapter.java
deleted file mode 100644
index 069fc0e2e0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueCollectionAdapter.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Arrays;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
-import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * Extend ValueAspectAdapter to listen to one or more collection
- * aspects of the value in the wrapped value model.
- */
-public class ValueCollectionAdapter<T extends Model>
-	extends ValueAspectAdapter<T>
-{
-
-	/** The names of the value's collections that we listen to. */
-	protected final String[] collectionNames;
-
-	/** Listener that listens to the value. */
-	protected final CollectionChangeListener valueCollectionListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct an adapter for the specified value collections.
-	 */
-	public ValueCollectionAdapter(WritablePropertyValueModel<T> valueHolder, String... collectionNames) {
-		super(valueHolder);
-		this.collectionNames = collectionNames;
-		this.valueCollectionListener = this.buildValueCollectionListener();
-	}
-
-
-	// ********** initialization **********
-
-	/**
-	 * All we really care about is the fact that a Collection aspect has 
-	 * changed. Do the same thing no matter which event occurs.
-	 */
-	protected CollectionChangeListener buildValueCollectionListener() {
-		return new CollectionChangeListener() {
-			public void itemsAdded(CollectionChangeEvent event) {
-				ValueCollectionAdapter.this.valueAspectChanged();
-			}
-			public void itemsRemoved(CollectionChangeEvent event) {
-				ValueCollectionAdapter.this.valueAspectChanged();
-			}
-			public void collectionCleared(CollectionChangeEvent event) {
-				ValueCollectionAdapter.this.valueAspectChanged();
-			}
-			public void collectionChanged(CollectionChangeEvent event) {
-				ValueCollectionAdapter.this.valueAspectChanged();
-			}
-			@Override
-			public String toString() {
-				return "value collection listener: " + Arrays.asList(ValueCollectionAdapter.this.collectionNames);
-			}
-		};
-	}
-
-	@Override
-	protected void engageValue_() {
-		for (String collectionName : this.collectionNames) {
-			this.value.addCollectionChangeListener(collectionName, this.valueCollectionListener);
-		}
-	}
-
-	@Override
-	protected void disengageValue_() {
-		for (String collectionName : this.collectionNames) {
-			this.value.removeCollectionChangeListener(collectionName, this.valueCollectionListener);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueListAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueListAdapter.java
deleted file mode 100644
index 85cb429f8f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueListAdapter.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Arrays;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * Extend ValueAspectAdapter to listen to one or more list
- * aspects of the value in the wrapped value model.
- */
-public class ValueListAdapter<T extends Model>
-	extends ValueAspectAdapter<T>
-{
-
-	/** The names of the value's lists that we listen to. */
-	protected final String[] listNames;
-
-	/** Listener that listens to the value. */
-	protected final ListChangeListener valueListListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct an adapter for the specified value lists.
-	 */
-	public ValueListAdapter(WritablePropertyValueModel<T> valueHolder, String... listNames) {
-		super(valueHolder);
-		this.listNames = listNames;
-		this.valueListListener = this.buildValueListListener();
-	}
-
-
-	// ********** initialization **********
-
-	/**
-	 * All we really care about is the fact that a List aspect has 
-	 * changed. Do the same thing no matter which event occurs.
-	 */
-	protected ListChangeListener buildValueListListener() {
-		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent event) {
-				ValueListAdapter.this.valueAspectChanged();
-			}
-			public void itemsRemoved(ListChangeEvent event) {
-				ValueListAdapter.this.valueAspectChanged();
-			}
-			public void itemsReplaced(ListChangeEvent event) {
-				ValueListAdapter.this.valueAspectChanged();
-			}
-			public void itemsMoved(ListChangeEvent event) {
-				ValueListAdapter.this.valueAspectChanged();
-			}
-			public void listCleared(ListChangeEvent event) {
-				ValueListAdapter.this.valueAspectChanged();
-			}
-			public void listChanged(ListChangeEvent event) {
-				ValueListAdapter.this.valueAspectChanged();
-			}
-			@Override
-			public String toString() {
-				return "value list listener: " + Arrays.asList(ValueListAdapter.this.listNames);
-			}
-		};
-	}
-
-	@Override
-	protected void engageValue_() {
-		for (String listName : this.listNames) {
-			this.value.addListChangeListener(listName, this.valueListListener);
-		}
-	}
-
-	@Override
-	protected void disengageValue_() {
-		for (String listName : this.listNames) {
-			this.value.removeListChangeListener(listName, this.valueListListener);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValuePropertyAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValuePropertyAdapter.java
deleted file mode 100644
index a3d7e01731..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValuePropertyAdapter.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Arrays;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * Extend ValueAspectAdapter to listen to one or more
- * properties of the value in the wrapped value model.
- */
-public class ValuePropertyAdapter<T extends Model>
-	extends ValueAspectAdapter<T>
-{
-	/** The names of the value's properties that we listen to. */
-	protected final String[] propertyNames;
-
-	/** Listener that listens to the value. */
-	protected final PropertyChangeListener valuePropertyListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct an adapter for the specified value properties.
-	 */
-	public ValuePropertyAdapter(WritablePropertyValueModel<T> valueHolder, String... propertyNames) {
-		super(valueHolder);
-		this.propertyNames = propertyNames;
-		this.valuePropertyListener = this.buildValuePropertyListener();
-	}
-
-
-	// ********** initialization **********
-
-	protected PropertyChangeListener buildValuePropertyListener() {
-		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent event) {
-				ValuePropertyAdapter.this.valueAspectChanged();
-			}
-			@Override
-			public String toString() {
-				return "value property listener: " + Arrays.asList(ValuePropertyAdapter.this.propertyNames);
-			}
-		};
-	}
-	
-
-	// ********** behavior **********
-
-	@Override
-	protected void engageValue_() {
-		for (String propertyName : this.propertyNames) {
-			this.value.addPropertyChangeListener(propertyName, this.valuePropertyListener);
-		}
-	}
-
-	@Override
-	protected void disengageValue_() {
-		for (String propertyName : this.propertyNames) {
-			this.value.removePropertyChangeListener(propertyName, this.valuePropertyListener);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueStateAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueStateAdapter.java
deleted file mode 100644
index d516fdbf1b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueStateAdapter.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.StateChangeEvent;
-import org.eclipse.jpt.utility.model.listener.StateChangeListener;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * Extend ValueAspectAdapter to listen to the
- * "state" of the value in the wrapped value model.
- */
-public class ValueStateAdapter<T extends Model>
-	extends ValueAspectAdapter<T>
-{
-	/** Listener that listens to value. */
-	protected final StateChangeListener valueStateListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct an adapter for the value state.
-	 */
-	public ValueStateAdapter(WritablePropertyValueModel<T> valueHolder) {
-		super(valueHolder);
-		this.valueStateListener = this.buildValueStateListener();
-	}
-
-
-	// ********** initialization **********
-
-	protected StateChangeListener buildValueStateListener() {
-		return new StateChangeListener() {
-			public void stateChanged(StateChangeEvent event) {
-				ValueStateAdapter.this.valueAspectChanged();
-			}
-			@Override
-			public String toString() {
-				return "value state listener";
-			}
-		};
-	}
-	
-
-	// ********** behavior **********
-
-	@Override
-	protected void engageValue_() {
-		this.value.addStateChangeListener(this.valueStateListener);
-	}
-
-	@Override
-	protected void disengageValue_() {
-		this.value.removeStateChangeListener(this.valueStateListener);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueTreeAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueTreeAdapter.java
deleted file mode 100644
index 41361ed37a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueTreeAdapter.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value;
-
-import java.util.Arrays;
-import org.eclipse.jpt.utility.model.Model;
-import org.eclipse.jpt.utility.model.event.TreeChangeEvent;
-import org.eclipse.jpt.utility.model.listener.TreeChangeListener;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * Extend ValueAspectAdapter to listen to one or more
- * tree aspects of the value in the wrapped value model.
- */
-public class ValueTreeAdapter<T extends Model>
-	extends ValueAspectAdapter<T>
-{
-	/** The names of the value's trees that we listen to. */
-	protected final String[] treeNames;
-
-	/** Listener that listens to the value. */
-	protected final TreeChangeListener valueTreeListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct an adapter for the specified value trees.
-	 */
-	public ValueTreeAdapter(WritablePropertyValueModel<T> valueHolder, String... treeNames) {
-		super(valueHolder);
-		this.treeNames = treeNames;
-		this.valueTreeListener = this.buildValueTreeListener();
-	}
-
-
-	// ********** initialization **********
-
-	protected TreeChangeListener buildValueTreeListener() {
-		return new TreeChangeListener() {
-			public void nodeAdded(TreeChangeEvent event) {
-				ValueTreeAdapter.this.valueAspectChanged();
-			}
-			public void nodeRemoved(TreeChangeEvent event) {
-				ValueTreeAdapter.this.valueAspectChanged();
-			}
-			public void treeCleared(TreeChangeEvent event) {
-				ValueTreeAdapter.this.valueAspectChanged();
-			}
-			public void treeChanged(TreeChangeEvent event) {
-				ValueTreeAdapter.this.valueAspectChanged();
-			}
-			@Override
-			public String toString() {
-				return "value tree listener: " + Arrays.asList(ValueTreeAdapter.this.treeNames);
-			}
-		};
-	}
-
-
-	// ********** behavior **********
-
-	@Override
-	protected void engageValue_() {
-		for (String treeName : this.treeNames) {
-			this.value.addTreeChangeListener(treeName, this.valueTreeListener);
-		}
-	}
-
-	@Override
-	protected void disengageValue_() {
-		for (String treeName : this.treeNames) {
-			this.value.removeTreeChangeListener(treeName, this.valueTreeListener);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/prefs/PreferencePropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/prefs/PreferencePropertyValueModel.java
deleted file mode 100644
index 44a9d56e11..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/prefs/PreferencePropertyValueModel.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value.prefs;
-
-import java.util.prefs.PreferenceChangeEvent;
-import java.util.prefs.PreferenceChangeListener;
-import java.util.prefs.Preferences;
-import org.eclipse.jpt.utility.internal.BidiStringConverter;
-import org.eclipse.jpt.utility.internal.model.value.AspectAdapter;
-import org.eclipse.jpt.utility.internal.model.value.StaticPropertyValueModel;
-import org.eclipse.jpt.utility.model.listener.ChangeListener;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * This adapter wraps a Preference and converts it into a PropertyValueModel.
- * It listens for the appropriate "preference" changes and converts them into
- * VALUE property changes. It also allows the specification of a default value
- * for the Preference, which, by default, is null (and is probably *not* a very
- * good default).
- * 
- * You can configure whether the preference's value is returned,
- * unchanged, as a string or as some other object (e.g. an Integer) by
- * setting the adapter's converter. Internally, the preference's value
- * is stored as the converted object; and the conversions take place
- * when reading or writing from the preferences node or retrieving the
- * value from an event fired by the preferences node.
- * 
- * This adapter is a bit different from most other adapters because the
- * change events fired off by a Preferences node are asynchronous from
- * the change itself. (AbstractPreferences uses an event dispatch daemon.)
- * As a result, a client can set our value with #setValue(Object) and we
- * will return from that method before we ever receive notification from
- * the Preferences node that *it* has changed. This means we cannot
- * rely on that event to keep our internally cached value in synch.
- */
-public class PreferencePropertyValueModel<P>
-	extends AspectAdapter<Preferences>
-	implements WritablePropertyValueModel<P>
-{
-	/** The key to the preference we use for the value. */
-	protected final String key;
-
-	/**
-	 * Cache the current (object) value of the preference so we
-	 * can pass an "old value" when we fire a property change event.
-	 */
-	protected P value;
-
-	/**
-	 * The default (object) value returned if there is no value
-	 * associated with the preference.
-	 */
-	protected final P defaultValue;
-
-	/**
-	 * This converter is used to convert the preference's
-	 * string value to and from an object.
-	 */
-	protected final BidiStringConverter<P> converter;
-
-	/** A listener that listens to the appropriate preference. */
-	protected final PreferenceChangeListener preferenceChangeListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct an adapter for the specified preference.
-	 * The default value of the preference will be null.
-	 */
-	public PreferencePropertyValueModel(Preferences preferences, String key) {
-		this(preferences, key, null);
-	}
-
-	/**
-	 * Construct an adapter for the specified preference with
-	 * the specified default value for the preference.
-	 */
-	public PreferencePropertyValueModel(Preferences preferences, String key, P defaultValue) {
-		this(preferences, key, defaultValue, BidiStringConverter.Default.<P>instance());
-	}
-
-	/**
-	 * Construct an adapter for the specified preference with
-	 * the specified default value for the preference.
-	 */
-	public PreferencePropertyValueModel(Preferences preferences, String key, P defaultValue, BidiStringConverter<P> converter) {
-		this(new StaticPropertyValueModel<Preferences>(preferences), key, defaultValue, converter);
-	}
-
-	/**
-	 * Construct an adapter for the specified preference with
-	 * the specified default value for the preference.
-	 */
-	public static PreferencePropertyValueModel<Boolean> forBoolean(Preferences preferences, String key, boolean defaultValue) {
-		return new PreferencePropertyValueModel<Boolean>(
-				preferences,
-				key,
-				defaultValue ? Boolean.TRUE : Boolean.FALSE,
-				BidiStringConverter.BooleanConverter.instance()
-			);
-	}
-
-	/**
-	 * Construct an adapter for the specified preference with
-	 * the specified default value for the preference.
-	 */
-	public static PreferencePropertyValueModel<Integer> forInteger(Preferences preferences, String key, int defaultValue) {
-		return new PreferencePropertyValueModel<Integer>(
-				preferences,
-				key,
-				new Integer(defaultValue),
-				BidiStringConverter.IntegerConverter.instance()
-			);
-	}
-
-	/**
-	 * Construct an adapter for the specified preference.
-	 * The default value of the preference will be null.
-	 */
-	public PreferencePropertyValueModel(PropertyValueModel<? extends Preferences> preferencesHolder, String key) {
-		this(preferencesHolder, key, null);
-	}
-
-	/**
-	 * Construct an adapter for the specified preference with
-	 * the specified default value for the preference.
-	 */
-	public PreferencePropertyValueModel(PropertyValueModel<? extends Preferences> preferencesHolder, String key, P defaultValue) {
-		this(preferencesHolder, key, defaultValue, BidiStringConverter.Default.<P>instance());
-	}
-
-	/**
-	 * Construct an adapter for the specified preference with
-	 * the specified default value for the preference.
-	 */
-	public PreferencePropertyValueModel(PropertyValueModel<? extends Preferences> preferencesHolder, String key, P defaultValue, BidiStringConverter<P> converter) {
-		super(preferencesHolder);
-		this.key = key;
-		this.defaultValue = defaultValue;
-		this.converter = converter;
-		this.preferenceChangeListener = this.buildPreferenceChangeListener();
-		// our value is null when we are not listening to the preference
-		this.value = null;
-	}
-
-
-	// ********** initialization **********
-
-	/**
-	 * A preference has changed, notify the listeners if necessary.
-	 */
-	protected PreferenceChangeListener buildPreferenceChangeListener() {
-		// transform the preference change events into VALUE property change events
-		return new PreferenceChangeListener() {
-			public void preferenceChange(PreferenceChangeEvent event) {
-				PreferencePropertyValueModel.this.preferenceChanged(event.getKey(), event.getNewValue());
-			}
-			@Override
-			public String toString() {
-				return "preference change listener";
-			}
-		};
-	}
-
-
-	// ********** ValueModel implementation **********
-
-	/**
-	 * Return the cached (converted) value.
-	 */
-	@Override
-	public synchronized P getValue() {
-		return this.value;
-	}
-
-
-	// ********** PropertyValueModel implementation **********
-
-	/**
-	 * Set the cached value, then set the appropriate preference value.
-	 */
-	public synchronized void setValue(P value) {
-		if (this.hasNoListeners()) {
-			return;		// no changes allowed when we have no listeners
-		}
-
-		Object old = this.value;
-		this.value = value;
-		this.fireAspectChange(old, value);
-
-		if ((this.subject != null) && this.shouldSetPreference(old, value)) {
-			this.setValue_(value);
-		}
-	}
-
-
-	// ********** AspectAdapter implementation **********
-
-	@Override
-	protected Class<? extends ChangeListener> getListenerClass() {
-		return PropertyChangeListener.class;
-	}
-
-	@Override
-	protected String getListenerAspectName() {
-		return VALUE;
-	}
-
-	@Override
-	protected boolean hasListeners() {
-		return this.hasAnyPropertyChangeListeners(VALUE);
-	}
-
-	@Override
-	protected void fireAspectChange(Object oldValue, Object newValue) {
-		this.firePropertyChanged(VALUE, oldValue, newValue);
-	}
-
-	@Override
-	protected void engageSubject_() {
-		this.subject.addPreferenceChangeListener(this.preferenceChangeListener);
-		this.value = this.buildValue();
-	}
-
-	@Override
-	protected void disengageSubject_() {
-		try {
-			this.subject.removePreferenceChangeListener(this.preferenceChangeListener);
-		} catch (IllegalStateException ex) {
-			// for some odd reason, we are not allowed to remove a listener from a "dead"
-			// preferences node; so handle the exception that gets thrown here
-			if ( ! ex.getMessage().equals("Node has been removed.")) {
-				// if it is not the expected exception, re-throw it
-				throw ex;
-			}
-		}
-		this.value = null;
-	}
-
-
-	// ********** AbstractModel implementation **********
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.key);
-		sb.append(" => ");
-		sb.append(this.value);
-	}
-
-
-	// ********** public API **********
-
-	/**
-	 * Return the preference's key.
-	 */
-	public String getKey() {
-		return this.key;
-	}
-
-
-	// ********** internal methods **********
-
-	/**
-	 * Return the preference's value.
-	 * At this point the subject may be null.
-	 */
-	protected P buildValue() {
-		return (this.subject == null) ? null : this.buildValue_();
-	}
-
-	/**
-	 * Return the appropriate preference, converted to the appropriate object.
-	 * At this point we can be sure that the subject is not null.
-	 */
-	protected P buildValue_() {
-		return this.convertToObject(this.subject.get(this.key, this.convertToString(this.defaultValue)));
-	}
-
-	/**
-	 * Set the appropriate preference after converting the value to a string.
-	 * At this point we can be sure that the subject is not null.
-	 */
-	protected void setValue_(P value) {
-		this.subject.put(this.key, this.convertToString(value));
-	}
-
-	/**
-	 * Return whether the specified new value should be passed
-	 * through to the preference. By default, only if the value has changed,
-	 * will it be passed through to the preference. This also has the
-	 * effect of not creating new preferences in the "backing store"
-	 * if the new value is the same as the default value.
-	 * 
-	 * Subclasses can override this method to return true if they
-	 * would like to ALWAYS pass through the new value to the preference.
-	 */
-	protected boolean shouldSetPreference(Object oldValue, Object newValue) {
-		return this.attributeValueHasChanged(oldValue, newValue);
-	}
-
-	/**
-	 * Convert the specified object to a string that can be stored as
-	 * the value of the preference.
-	 */
-	protected String convertToString(P o) {
-		return this.converter.convertToString(o);
-	}
-
-	/**
-	 * Convert the specified preference value string to an
-	 * appropriately-typed object to be returned to the client.
-	 */
-	protected P convertToObject(String s) {
-		return this.converter.convertToObject(s);
-	}
-
-	protected void preferenceChanged(String prefKey, String newValue) {
-		if (prefKey.equals(this.key)) {
-			this.preferenceChanged();
-		}
-	}
-
-	/**
-	 * The underlying preference changed; either because we changed it
-	 * in #setValue_(Object) or a third-party changed it.
-	 * If this is called because of our own change, the event will be
-	 * swallowed because the old and new values are the same.
-	 */
-	protected synchronized void preferenceChanged() {
-		Object old = this.value;
-		this.value = this.buildValue();
-		this.fireAspectChange(old, this.value);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/prefs/PreferencesCollectionValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/prefs/PreferencesCollectionValueModel.java
deleted file mode 100644
index 546a6686d2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/prefs/PreferencesCollectionValueModel.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value.prefs;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.prefs.BackingStoreException;
-import java.util.prefs.PreferenceChangeEvent;
-import java.util.prefs.PreferenceChangeListener;
-import java.util.prefs.Preferences;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-import org.eclipse.jpt.utility.internal.model.value.AspectAdapter;
-import org.eclipse.jpt.utility.internal.model.value.StaticPropertyValueModel;
-import org.eclipse.jpt.utility.model.listener.ChangeListener;
-import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-
-/**
- * This adapter wraps a Preferences node and converts its preferences into a
- * CollectionValueModel of PreferencePropertyValueModels. It listens for
- * "preference" changes and converts them into VALUE collection changes.
- */
-public class PreferencesCollectionValueModel<P>
-	extends AspectAdapter<Preferences>
-	implements CollectionValueModel<PreferencePropertyValueModel<P>>
-{
-
-	/** Cache the current preferences, stored in models and keyed by name. */
-	protected final HashMap<String, PreferencePropertyValueModel<P>> preferences;
-
-	/** A listener that listens to the preferences node for added or removed preferences. */
-	protected final PreferenceChangeListener preferenceChangeListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct an adapter for the specified preferences node.
-	 */
-	public PreferencesCollectionValueModel(Preferences preferences) {
-		this(new StaticPropertyValueModel<Preferences>(preferences));
-	}
-
-	/**
-	 * Construct an adapter for the specified preferences node.
-	 */
-	public PreferencesCollectionValueModel(PropertyValueModel<? extends Preferences> preferencesHolder) {
-		super(preferencesHolder);
-		this.preferences = new HashMap<String, PreferencePropertyValueModel<P>>();
-		this.preferenceChangeListener = this.buildPreferenceChangeListener();
-	}
-
-
-	// ********** initialization **********
-
-	/**
-	 * A preferences have changed, notify the listeners.
-	 */
-	protected PreferenceChangeListener buildPreferenceChangeListener() {
-		// transform the preference change events into VALUE collection change events
-		return new PreferenceChangeListener() {
-			public void preferenceChange(PreferenceChangeEvent event) {
-				PreferencesCollectionValueModel.this.preferenceChanged(event.getKey(), event.getNewValue());
-			}
-			@Override
-			public String toString() {
-				return "preference change listener";
-			}
-		};
-	}
-
-
-	// ********** CollectionValueModel implementation **********
-
-	/**
-	 * Return an iterator on the preference models.
-	 */
-	public synchronized Iterator<PreferencePropertyValueModel<P>> iterator() {
-		return this.preferences.values().iterator();
-	}
-
-	public synchronized int size() {
-		return this.preferences.size();
-	}
-
-
-	// ********** AspectAdapter implementation **********
-
-	@Override
-	protected Object getValue() {
-		return this.iterator();
-	}
-
-	@Override
-	protected Class<? extends ChangeListener> getListenerClass() {
-		return CollectionChangeListener.class;
-	}
-
-	@Override
-	protected String getListenerAspectName() {
-		return VALUES;
-	}
-
-    @Override
-	protected boolean hasListeners() {
-		return this.hasAnyCollectionChangeListeners(VALUES);
-	}
-
-    @Override
-	protected void fireAspectChange(Object oldValue, Object newValue) {
-		this.fireCollectionChanged(VALUES);
-	}
-
-    @Override
-	protected void engageSubject_() {
-		this.subject.addPreferenceChangeListener(this.preferenceChangeListener);
-		for (Iterator<PreferencePropertyValueModel<P>> stream = this.preferenceModels(); stream.hasNext(); ) {
-			PreferencePropertyValueModel<P> preferenceModel = stream.next();
-			this.preferences.put(preferenceModel.getKey(), preferenceModel);
-		}
-	}
-
-    @Override
-	protected void disengageSubject_() {
-		try {
-			this.subject.removePreferenceChangeListener(this.preferenceChangeListener);
-		} catch (IllegalStateException ex) {
-			// for some odd reason, we are not allowed to remove a listener from a "dead"
-			// preferences node; so handle the exception that gets thrown here
-			if ( ! ex.getMessage().equals("Node has been removed.")) {
-				// if it is not the expected exception, re-throw it
-				throw ex;
-			}
-		}
-		this.preferences.clear();
-	}
-
-
-	// ********** AbstractModel implementation **********
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.subject);
-	}
-
-
-	// ********** internal methods **********
-
-	/**
-	 * Return an iterator on the preference models.
-	 * At this point we can be sure that the subject is not null.
-	 */
-	protected Iterator<PreferencePropertyValueModel<P>> preferenceModels() {
-		String[] keys;
-		try {
-			keys = this.subject.keys();
-		} catch (BackingStoreException ex) {
-			throw new RuntimeException(ex);
-		}
-		return new TransformationIterator<String, PreferencePropertyValueModel<P>>(new ArrayIterator<String>(keys)) {
-			@Override
-			protected PreferencePropertyValueModel<P> transform(String key) {
-				return PreferencesCollectionValueModel.this.buildPreferenceModel(key);
-			}
-		};
-	}
-
-	/**
-	 * Override this method to tweak the model used to wrap the
-	 * specified preference (e.g. to customize the model's converter).
-	 */
-	protected PreferencePropertyValueModel<P> buildPreferenceModel(String key) {
-		return new PreferencePropertyValueModel<P>(this.subjectHolder, key);
-	}
-
-	protected synchronized void preferenceChanged(String key, String newValue) {
-		if (newValue == null) {
-			// a preference was removed
-			PreferencePropertyValueModel<P> preferenceModel = this.preferences.remove(key);
-			this.fireItemRemoved(VALUES, preferenceModel);
-		} else if ( ! this.preferences.containsKey(key)) {
-			// a preference was added
-			PreferencePropertyValueModel<P> preferenceModel = this.buildPreferenceModel(key);
-			this.preferences.put(key, preferenceModel);
-			this.fireItemAdded(VALUES, preferenceModel);
-		} else {
-			// a preference's value changed - do nothing
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/AbstractTreeModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/AbstractTreeModel.java
deleted file mode 100644
index 302a83f1dd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/AbstractTreeModel.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value.swing;
-
-import java.io.Serializable;
-import javax.swing.event.EventListenerList;
-import javax.swing.event.TreeModelEvent;
-import javax.swing.event.TreeModelListener;
-import javax.swing.tree.TreeModel;
-
-/**
- * Abstract class that should have been provided by the JDK
- * (à la javax.swing.AbstractListModel). This class provides:
- * - support for a collection of listeners
- * - a number of convenience methods for firing events for those listeners
- */
-public abstract class AbstractTreeModel
-	implements TreeModel, Serializable
-{
-	/** Our listeners. */
-	protected final EventListenerList listenerList;
-
-
-	// ********** constructors/initialization **********
-
-	protected AbstractTreeModel() {
-		super();
-		this.listenerList = new EventListenerList();
-	}
-
-
-	// ********** partial TreeModel implementation **********
-
-	public void addTreeModelListener(TreeModelListener l) {
-		this.listenerList.add(TreeModelListener.class, l);
-	}
-
-	public void removeTreeModelListener(TreeModelListener l) {
-		this.listenerList.remove(TreeModelListener.class, l);
-	}
-
-
-	// ********** queries **********
-
-	/**
-	 * Return the model's current collection of listeners.
-	 * (There seems to be a pattern of making this type of method public;
-	 * although it should probably be protected....)
-	 */
-	public TreeModelListener[] treeModelListeners() {
- 		return this.listenerList.getListeners(TreeModelListener.class);
-	}
-
-	/**
-	 * Return whether this model has no listeners.
-	 */
-	protected boolean hasNoTreeModelListeners() {
-		return this.listenerList.getListenerCount(TreeModelListener.class) == 0;
-	}
-
-	/**
-	 * Return whether this model has any listeners.
-	 */
-	protected boolean hasTreeModelListeners() {
-		return ! this.hasNoTreeModelListeners();
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Notify listeners of a model change.
-	 * A significant property of the nodes changed, but the nodes themselves
-	 * are still the same objects.
-	 * @see javax.swing.event.TreeModelEvent
-	 * @see javax.swing.event.TreeModelListener
-	 */
-	protected void fireTreeNodesChanged(Object[] path, int[] childIndices, Object[] children) {
-		// guaranteed to return a non-null array
-		Object[] listeners = this.listenerList.getListenerList();
-		TreeModelEvent event = null;
-		// process the listeners last to first, notifying
-		// those that are interested in this event
-		for (int i = listeners.length-2; i>=0; i-=2) {
-			if (listeners[i]==TreeModelListener.class) {
-				// lazily create the event
-				if (event == null) {
-					event = new TreeModelEvent(this, path, childIndices, children);
-				}
-				((TreeModelListener) listeners[i+1]).treeNodesChanged(event);
-			}
-		}
-	}
-
-
-	/**
-	 * Notify listeners of a model change.
-	 * A significant property of the node changed, but the node itself is the same object.
-	 * @see javax.swing.event.TreeModelEvent
-	 * @see javax.swing.event.TreeModelListener
-	 */
-	protected void fireTreeNodeChanged(Object[] path, int childIndex, Object child) {
-		this.fireTreeNodesChanged(path, new int[] {childIndex}, new Object[] {child});
-	}
-
-	/**
-	 * Notify listeners of a model change.
-	 * A significant property of the root changed, but the root itself is the same object.
-	 * @see javax.swing.event.TreeModelEvent
-	 * @see javax.swing.event.TreeModelListener
-	 */
-	protected void fireTreeRootChanged(Object root) {
-		this.fireTreeNodesChanged(new Object[] {root}, null, null);
-	}
-
-	/**
-	 * Notify listeners of a model change.
-	 * @see javax.swing.event.TreeModelEvent
-	 * @see javax.swing.event.TreeModelListener
-	 */
-	protected void fireTreeNodesInserted(Object[] path, int[] childIndices, Object[] children) {
-		// guaranteed to return a non-null array
-		Object[] listeners = this.listenerList.getListenerList();
-		TreeModelEvent event = null;
-		// process the listeners last to first, notifying
-		// those that are interested in this event
-		for (int i = listeners.length-2; i>=0; i-=2) {
-			if (listeners[i]==TreeModelListener.class) {
-				// lazily create the event
-				if (event == null) {
-					event = new TreeModelEvent(this, path, childIndices, children);
-				}
-				((TreeModelListener) listeners[i+1]).treeNodesInserted(event);
-			}
-		}
-	}
-
-	/**
-	 * Notify listeners of a model change.
-	 * @see javax.swing.event.TreeModelEvent
-	 * @see javax.swing.event.TreeModelListener
-	 */
-	protected void fireTreeNodeInserted(Object[] path, int childIndex, Object child) {
-		this.fireTreeNodesInserted(path, new int[] {childIndex}, new Object[] {child});
-	}
-
-	/**
-	 * Notify listeners of a model change.
-	 * @see javax.swing.event.TreeModelEvent
-	 * @see javax.swing.event.TreeModelListener
-	 */
-	protected void fireTreeNodesRemoved(Object[] path, int[] childIndices, Object[] children) {
-		// guaranteed to return a non-null array
-		Object[] listeners = this.listenerList.getListenerList();
-		TreeModelEvent event = null;
-		// process the listeners last to first, notifying
-		// those that are interested in this event
-		for (int i = listeners.length-2; i>=0; i-=2) {
-			if (listeners[i]==TreeModelListener.class) {
-				// lazily create the event
-				if (event == null) {
-					event = new TreeModelEvent(this, path, childIndices, children);
-				}
-				((TreeModelListener) listeners[i+1]).treeNodesRemoved(event);
-			}
-		}
-	}
-
-	/**
-	 * Notify listeners of a model change.
-	 * @see javax.swing.event.TreeModelEvent
-	 * @see javax.swing.event.TreeModelListener
-	 */
-	protected void fireTreeNodeRemoved(Object[] path, int childIndex, Object child) {
-		this.fireTreeNodesRemoved(path, new int[] {childIndex}, new Object[] {child});
-	}
-
-	/**
-	 * Notify listeners of a model change.
-	 * @see javax.swing.event.TreeModelEvent
-	 * @see javax.swing.event.TreeModelListener
-	 */
-	protected void fireTreeStructureChanged(Object[] path) {
-		// guaranteed to return a non-null array
-		Object[] listeners = this.listenerList.getListenerList();
-		TreeModelEvent event = null;
-		// process the listeners last to first, notifying
-		// those that are interested in this event
-		for (int i = listeners.length-2; i>=0; i-=2) {
-			if (listeners[i]==TreeModelListener.class) {
-				// lazily create the event
-				if (event == null) {
-					event = new TreeModelEvent(this, path);
-				}
-				((TreeModelListener) listeners[i+1]).treeStructureChanged(event);
-			}
-		}
-	}
-
-	/**
-	 * Notify listeners of a model change.
-	 * @see javax.swing.event.TreeModelEvent
-	 * @see javax.swing.event.TreeModelListener
-	 */
-	protected void fireTreeRootReplaced(Object newRoot) {
-		this.fireTreeStructureChanged(new Object[] {newRoot});
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/CheckBoxModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/CheckBoxModelAdapter.java
deleted file mode 100644
index 126cbfa561..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/CheckBoxModelAdapter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value.swing;
-
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * This javax.swing.ButtonModel can be used to keep a listener
- * (e.g. a JCheckBox) in synch with a PropertyValueModel that
- * holds a boolean.
- * 
- * Maybe not the richest class in our toolbox, but it was the
- * victim of refactoring....  ~bjv
- */
-public class CheckBoxModelAdapter
-	extends ToggleButtonModelAdapter
-{
-
-	// ********** constructors **********
-
-	/**
-	 * Constructor - the boolean holder is required.
-	 */
-	public CheckBoxModelAdapter(WritablePropertyValueModel<Boolean> booleanHolder, boolean defaultValue) {
-		super(booleanHolder, defaultValue);
-	}
-
-	/**
-	 * Constructor - the boolean holder is required.
-	 * The default value will be false.
-	 */
-	public CheckBoxModelAdapter(WritablePropertyValueModel<Boolean> booleanHolder) {
-		super(booleanHolder);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ColumnAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ColumnAdapter.java
deleted file mode 100644
index 482b5d2468..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ColumnAdapter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value.swing;
-
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-
-/**
- * This adapter is used by the table model adapter to
- * convert a model object into the models used for each of
- * the cells for the object's corresponding row in the table.
- */
-public interface ColumnAdapter {
-	/**
-	 * Return the number of columns in the table.
-	 * Typically this is static.
-	 */
-	int columnCount();
-
-	/**
-	 * Return the name of the specified column.
-	 */
-	String columnName(int index);
-
-	/**
-	 * Return the class of the specified column.
-	 */
-	Class<?> columnClass(int index);
-
-	/**
-	 * Return whether the specified column is editable.
-	 * Typically this is the same for every row.
-	 */
-	boolean columnIsEditable(int index);
-
-	/**
-	 * Return the cell models for the specified subject
-	 * that corresponds to a single row in the table.
-	 */
-	WritablePropertyValueModel<Object>[] cellModels(Object subject);
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ComboBoxModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ComboBoxModelAdapter.java
deleted file mode 100644
index b3e0c9269c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ComboBoxModelAdapter.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value.swing;
-
-import javax.swing.ComboBoxModel;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.model.listener.awt.AWTPropertyChangeListenerWrapper;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * This javax.swing.ComboBoxModel can be used to keep a ListDataListener
- * (e.g. a JComboBox) in synch with a ListValueModel (or a CollectionValueModel).
- * For combo boxes, the model object that holds the current selection is
- * typically a different model object than the one that holds the collection
- * of choices.
- * 
- * For example, a MWReference (the selectionOwner) has an attribute
- * "sourceTable" (the collectionOwner)
- * which holds on to a collection of MWDatabaseFields. When the selection
- * is changed this model will keep the listeners aware of the changes.
- * The inherited list model will keep its listeners aware of changes to the
- * collection model
- * 
- * In addition to the collection holder required by the superclass,
- * an instance of this ComboBoxModel must be supplied with a
- * selection holder, which is a PropertyValueModel that provides access
- * to the selection (typically a PropertyAspectAdapter).
- */
-public class ComboBoxModelAdapter
-	extends ListModelAdapter
-	implements ComboBoxModel
-{
-	protected final WritablePropertyValueModel<Object> selectionHolder;
-	protected final PropertyChangeListener selectionListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Constructor - the list holder and selection holder are required;
-	 */
-	public ComboBoxModelAdapter(ListValueModel<?> listHolder, WritablePropertyValueModel<Object> selectionHolder) {
-		super(listHolder);
-		if (selectionHolder == null) {
-			throw new NullPointerException();
-		}
-		this.selectionHolder = selectionHolder;
-		this.selectionListener = this.buildSelectionListener();
-	}
-
-	/**
-	 * Constructor - the collection holder and selection holder are required;
-	 */
-	public ComboBoxModelAdapter(CollectionValueModel<?> collectionHolder, WritablePropertyValueModel<Object> selectionHolder) {
-		super(collectionHolder);
-		if (selectionHolder == null) {
-			throw new NullPointerException();
-		}
-		this.selectionHolder = selectionHolder;
-		this.selectionListener = this.buildSelectionListener();
-	}
-
-
-	// ********** initialization **********
-
-	protected PropertyChangeListener buildSelectionListener() {
-		return new AWTPropertyChangeListenerWrapper(this.buildSelectionListener_());
-	}
-
-	protected PropertyChangeListener buildSelectionListener_() {
-		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent event) {
-				// notify listeners that the selection has changed
-				ComboBoxModelAdapter.this.fireSelectionChanged();
-			}
-			@Override
-			public String toString() {
-				return "selection listener";
-			}
-		};
-	}
-
-
-	// ********** ComboBoxModel implementation **********
-
-	public Object getSelectedItem() {
-		return this.selectionHolder.getValue();
-	}
-
-	public void setSelectedItem(Object selectedItem) {
-		this.selectionHolder.setValue(selectedItem);
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Extend to engage the selection holder.
-	 */
-	@Override
-	protected void engageModel() {
-		super.engageModel();
-		this.selectionHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.selectionListener);
-	}
-
-	/**
-	 * Extend to disengage the selection holder.
-	 */
-	@Override
-	protected void disengageModel() {
-		this.selectionHolder.removePropertyChangeListener(PropertyValueModel.VALUE, this.selectionListener);
-		super.disengageModel();
-	}
-
-	/**
-	 * Notify the listeners that the selection has changed.
-	 */
-	protected void fireSelectionChanged() {
-		// I guess this will work...
-		this.fireContentsChanged(this, -1, -1);
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.selectionHolder + ":" + this.listHolder);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/DateSpinnerModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/DateSpinnerModelAdapter.java
deleted file mode 100644
index 66d09d23ca..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/DateSpinnerModelAdapter.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value.swing;
-
-import java.util.Calendar;
-import java.util.Date;
-import javax.swing.SpinnerDateModel;
-import javax.swing.event.ChangeListener;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.model.listener.awt.AWTPropertyChangeListenerWrapper;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * This javax.swing.SpinnerDateModel can be used to keep a ChangeListener
- * (e.g. a JSpinner) in synch with a PropertyValueModel that holds a date.
- * 
- * This class must be a sub-class of SpinnerDateModel because of some
- * crappy jdk code....  ~bjv
- * @see javax.swing.JSpinner#createEditor(javax.swing.SpinnerModel)
- * 
- * If this class needs to be modified, it would behoove us to review the
- * other, similar classes:
- * @see ListSpinnerModelAdapter
- * @see NumberSpinnerModelAdapter
- */
-public class DateSpinnerModelAdapter
-	extends SpinnerDateModel
-{
-
-	/**
-	 * The default spinner value; used when the underlying model date value is null.
-	 * The default is the current date.
-	 */
-	private final Date defaultValue;
-
-	/** A value model on the underlying date. */
-	private final WritablePropertyValueModel<Object> dateHolder;
-
-	/** A listener that allows us to synchronize with changes made to the underlying date. */
-	private final PropertyChangeListener dateChangeListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Constructor - the date holder is required.
-	 * The default spinner value is the current date.
-	 */
-	public DateSpinnerModelAdapter(WritablePropertyValueModel<Object> dateHolder) {
-		this(dateHolder, new Date());
-	}
-
-	/**
-	 * Constructor - the date holder and default value are required.
-	 */
-	public DateSpinnerModelAdapter(WritablePropertyValueModel<Object> dateHolder, Date defaultValue) {
-		this(dateHolder, null, null, Calendar.DAY_OF_MONTH, defaultValue);
-	}
-
-	/**
-	 * Constructor - the date holder is required.
-	 * The default spinner value is the current date.
-	 */
-	public DateSpinnerModelAdapter(WritablePropertyValueModel<Object> dateHolder, Comparable<?> start, Comparable<?> end, int calendarField) {
-		this(dateHolder, start, end, calendarField, new Date());
-	}
-
-	/**
-	 * Constructor - the date holder is required.
-	 */
-	public DateSpinnerModelAdapter(WritablePropertyValueModel<Object> dateHolder, Comparable<?> start, Comparable<?> end, int calendarField, Date defaultValue) {
-		super(dateHolder.getValue() == null ? defaultValue : (Date) dateHolder.getValue(), start, end, calendarField);
-		this.dateHolder = dateHolder;
-		this.dateChangeListener = this.buildDateChangeListener();
-		// postpone listening to the underlying date
-		// until we have listeners ourselves...
-		this.defaultValue = defaultValue;
-	}
-
-
-	// ********** initialization **********
-
-	protected PropertyChangeListener buildDateChangeListener() {
-		return new AWTPropertyChangeListenerWrapper(this.buildDateChangeListener_());
-	}
-
-	protected PropertyChangeListener buildDateChangeListener_() {
-		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent event) {
-				DateSpinnerModelAdapter.this.synchronize(event.getNewValue());
-			}
-			@Override
-			public String toString() {
-				return "date listener";
-			}
-		};
-	}
-
-
-	// ********** SpinnerModel implementation **********
-
-	/**
-	 * Extend to check whether this method is being called before we 
-	 * have any listeners.
-	 * This is necessary because some crappy jdk code gets the value
-	 * from the model *before* listening to the model.  ~bjv
-	 * @see javax.swing.JSpinner.DefaultEditor(javax.swing.JSpinner)
-	 */
-    @Override
-	public Object getValue() {
-		if (this.getChangeListeners().length == 0) {
-			// sorry about this "lateral" call to super  ~bjv
-			super.setValue(this.spinnerValueOf(this.dateHolder.getValue()));
-		}
-		return super.getValue();
-	}
-
-	/**
-	 * Extend to update the underlying date directly.
-	 * The resulting event will be ignored: @see #synchronize(Object).
-	 */
-	@Override
-	public void setValue(Object value) {
-		super.setValue(value);
-		this.dateHolder.setValue(value);
-	}
-
-	/**
-	 * Extend to start listening to the underlying date if necessary.
-	 */
-	@Override
-	public void addChangeListener(ChangeListener listener) {
-		if (this.getChangeListeners().length == 0) {
-			this.dateHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.dateChangeListener);
-			this.synchronize(this.dateHolder.getValue());
-		}
-		super.addChangeListener(listener);
-	}
-
-	/**
-	 * Extend to stop listening to the underlying date if appropriate.
-	 */
-    @Override
-	public void removeChangeListener(ChangeListener listener) {
-		super.removeChangeListener(listener);
-		if (this.getChangeListeners().length == 0) {
-			this.dateHolder.removePropertyChangeListener(PropertyValueModel.VALUE, this.dateChangeListener);
-		}
-	}
-
-
-	// ********** queries **********
-
-	protected Date getDefaultValue() {
-		return this.defaultValue;
-	}
-
-	/**
-	 * Convert to a non-null value.
-	 */
-	protected Object spinnerValueOf(Object value) {
-		return (value == null) ? this.getDefaultValue() : value;
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Set the spinner value if it has changed.
-	 */
-	void synchronize(Object value) {
-		Object newValue = this.spinnerValueOf(value);
-		// check to see whether the spinner date has already been synchronized
-		// (via #setValue())
-		if ( ! this.getValue().equals(newValue)) {
-			this.setValue(newValue);
-		}
-	}
-
-
-	// ********** standard methods **********
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.dateHolder);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/DocumentAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/DocumentAdapter.java
deleted file mode 100644
index eeb65b4965..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/DocumentAdapter.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value.swing;
-
-import java.io.Serializable;
-import java.util.EventObject;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import javax.swing.event.EventListenerList;
-import javax.swing.event.UndoableEditEvent;
-import javax.swing.event.UndoableEditListener;
-import javax.swing.text.AttributeSet;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.Document;
-import javax.swing.text.Element;
-import javax.swing.text.PlainDocument;
-import javax.swing.text.Position;
-import javax.swing.text.Segment;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.model.listener.awt.AWTPropertyChangeListenerWrapper;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * This javax.swing.text.Document can be used to keep a DocumentListener
- * (e.g. a JTextField) in synch with a PropertyValueModel that holds a string.
- * 
- * NB: This model should only be used for "small" documents;
- * i.e. documents used by text fields, not text panes.
- * @see #synchronizeDelegate(String)
- */
-public class DocumentAdapter
-	implements Document, Serializable
-{
-
-	/** The delegate document whose behavior we "enhance". */
-	protected final Document delegate;
-
-	/** A listener that allows us to forward any changes made to the delegate document. */
-	protected final CombinedListener delegateListener;
-
-	/** A value model on the underlying model string. */
-	protected final WritablePropertyValueModel<String> stringHolder;
-
-	/** A listener that allows us to synchronize with changes made to the underlying model string. */
-	protected final PropertyChangeListener stringListener;
-
-    /** The event listener list for the document. */
-    protected final EventListenerList listenerList = new EventListenerList();
-
-
-	// ********** constructors **********
-
-	/**
-	 * Constructor - the string holder is required.
-	 * Wrap the specified document.
-	 */
-	public DocumentAdapter(WritablePropertyValueModel<String> stringHolder, Document delegate) {
-		super();
-		if (stringHolder == null || delegate == null) {
-			throw new NullPointerException();
-		}
-		this.stringHolder = stringHolder;
-		// postpone listening to the underlying model string
-		// until we have listeners ourselves...
-		this.delegate = delegate;
-		this.stringListener = this.buildStringListener();
-		this.delegateListener = this.buildDelegateListener();
-	}
-
-	/**
-	 * Constructor - the string holder is required.
-	 * Wrap a plain document.
-	 */
-	public DocumentAdapter(WritablePropertyValueModel<String> stringHolder) {
-		this(stringHolder, new PlainDocument());
-	}
-
-
-	// ********** initialization **********
-
-	protected PropertyChangeListener buildStringListener() {
-		return new AWTPropertyChangeListenerWrapper(this.buildStringListener_());
-	}
-
-	protected PropertyChangeListener buildStringListener_() {
-		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent event) {
-				DocumentAdapter.this.stringChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "string listener";
-			}
-		};
-	}
-
-	protected CombinedListener buildDelegateListener() {
-		return new InternalListener();
-	}
-
-
-	// ********** Document implementation **********
-
-	public int getLength() {
-		return this.delegate.getLength();
-	}
-
-	/**
-	 * Extend to start listening to the underlying models if necessary.
-	 */
-	public void addDocumentListener(DocumentListener listener) {
-		if (this.listenerList.getListenerCount(DocumentListener.class) == 0) {
-			this.delegate.addDocumentListener(this.delegateListener);
-			this.engageStringHolder();
-		}
-		this.listenerList.add(DocumentListener.class, listener);
-	}
-
-	/**
-	 * Extend to stop listening to the underlying models if appropriate.
-	 */
-	public void removeDocumentListener(DocumentListener listener) {
-		this.listenerList.remove(DocumentListener.class, listener);
-		if (this.listenerList.getListenerCount(DocumentListener.class) == 0) {
-			this.disengageStringHolder();
-			this.delegate.removeDocumentListener(this.delegateListener);
-		}
-	}
-
-	/**
-	 * Extend to start listening to the delegate document if necessary.
-	 */
-	public void addUndoableEditListener(UndoableEditListener listener) {
-		if (this.listenerList.getListenerCount(UndoableEditListener.class) == 0) {
-			this.delegate.addUndoableEditListener(this.delegateListener);
-		}
-		this.listenerList.add(UndoableEditListener.class, listener);
-	}
-
-	/**
-	 * Extend to stop listening to the delegate document if appropriate.
-	 */
-	public void removeUndoableEditListener(UndoableEditListener listener) {
-		this.listenerList.remove(UndoableEditListener.class, listener);
-		if (this.listenerList.getListenerCount(UndoableEditListener.class) == 0) {
-			this.delegate.removeUndoableEditListener(this.delegateListener);
-		}
-	}
-
-	public Object getProperty(Object key) {
-		return this.delegate.getProperty(key);
-	}
-
-	public void putProperty(Object key, Object value) {
-		this.delegate.putProperty(key, value);
-	}
-
-	/**
-	 * Extend to update the underlying model string directly.
-	 * The resulting event will be ignored: @see #synchronizeDelegate(String).
-	 */
-	public void remove(int offset, int len) throws BadLocationException {
-		this.delegate.remove(offset, len);
-		this.stringHolder.setValue(this.delegate.getText(0, this.delegate.getLength()));
-	}
-
-	/**
-	 * Extend to update the underlying model string directly.
-	 * The resulting event will be ignored: @see #synchronizeDelegate(String).
-	 */
-	public void insertString(int offset, String insertedString, AttributeSet a) throws BadLocationException {
-		this.delegate.insertString(offset, insertedString, a);
-		this.stringHolder.setValue(this.delegate.getText(0, this.delegate.getLength()));
-	}
-
-	public String getText(int offset, int length) throws BadLocationException {
-		return this.delegate.getText(offset, length);
-	}
-
-	public void getText(int offset, int length, Segment txt) throws BadLocationException {
-		this.delegate.getText(offset, length, txt);
-	}
-
-	public Position getStartPosition() {
-		return this.delegate.getStartPosition();
-	}
-
-	public Position getEndPosition() {
-		return this.delegate.getEndPosition();
-	}
-
-	public Position createPosition(int offs) throws BadLocationException {
-		return this.delegate.createPosition(offs);
-	}
-
-	public Element[] getRootElements() {
-		return this.delegate.getRootElements();
-	}
-
-	public Element getDefaultRootElement() {
-		return this.delegate.getDefaultRootElement();
-	}
-
-	public void render(Runnable r) {
-		this.delegate.render(r);
-	}
-
-
-	// ********** queries **********
-
-	public DocumentListener[] documentListeners() {
-		return this.listenerList.getListeners(DocumentListener.class);
-	}
-
-	public UndoableEditListener[] undoableEditListeners() {
-		return this.listenerList.getListeners(UndoableEditListener.class);
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * A third party has modified the underlying model string.
-	 * Synchronize the delegate document accordingly.
-	 */
-	protected void stringChanged(PropertyChangeEvent event) {
-		this.synchronizeDelegate((String) event.getNewValue());
-	}
-
-	/**
-	 * Replace the document's entire text string with the new string.
-	 */
-	protected void synchronizeDelegate(String s) {
-		try {
-			int len = this.delegate.getLength();
-			// check to see whether the delegate has already been synchronized
-			// (via #insertString() or #remove())
-			if ( ! this.delegate.getText(0, len).equals(s)) {
-				this.delegate.remove(0, len);
-				this.delegate.insertString(0, s, null);
-			}
-		} catch (BadLocationException ex) {
-			throw new IllegalStateException(ex.getMessage());	// this should not happen...
-		}
-	}
-
-	protected void engageStringHolder() {
-		this.stringHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.stringListener);
-		this.synchronizeDelegate(this.stringHolder.getValue());
-	}
-
-	protected void disengageStringHolder() {
-		this.stringHolder.removePropertyChangeListener(PropertyValueModel.VALUE, this.stringListener);
-	}
-
-	protected void delegateChangedUpdate(DocumentEvent event) {
-		// no need to lazy-initialize the event;
-		// we wouldn't get here if we did not have listeners...
-		DocumentEvent ee = new InternalDocumentEvent(this, event);
-		DocumentListener[] listeners = this.documentListeners();
-		for (int i = listeners.length; i-- > 0; ) {
-			listeners[i].changedUpdate(ee);
-		}
-	}
-
-	protected void delegateInsertUpdate(DocumentEvent event) {
-		// no need to lazy-initialize the event;
-		// we wouldn't get here if we did not have listeners...
-		DocumentEvent ee = new InternalDocumentEvent(this, event);
-		DocumentListener[] listeners = this.documentListeners();
-		for (int i = listeners.length; i-- > 0; ) {
-			listeners[i].insertUpdate(ee);
-		}
-	}
-
-	protected void delegateRemoveUpdate(DocumentEvent event) {
-		// no need to lazy-initialize the event;
-		// we wouldn't get here if we did not have listeners...
-		DocumentEvent ee = new InternalDocumentEvent(this, event);
-		DocumentListener[] listeners = this.documentListeners();
-		for (int i = listeners.length; i-- > 0; ) {
-			listeners[i].removeUpdate(ee);
-		}
-	}
-
-	protected void delegateUndoableEditHappened(UndoableEditEvent event) {
-		// no need to lazy-initialize the event;
-		// we wouldn't get here if we did not have listeners...
-		UndoableEditEvent ee = new UndoableEditEvent(this, event.getEdit());
-		UndoableEditListener[] listeners = this.undoableEditListeners();
-		for (int i = listeners.length; i-- > 0; ) {
-			listeners[i].undoableEditHappened(ee);
-		}
-	}
-
-	// ********** standard methods **********
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.stringHolder);
-	}
-
-
-// ********** inner class **********
-
-	protected interface CombinedListener extends DocumentListener, UndoableEditListener {
-		// just consolidate the two interfaces
-	}
-
-	protected class InternalListener implements CombinedListener {
-		public void changedUpdate(DocumentEvent event) {
-			DocumentAdapter.this.delegateChangedUpdate(event);
-		}
-		public void insertUpdate(DocumentEvent event) {
-			DocumentAdapter.this.delegateInsertUpdate(event);
-		}
-		public void removeUpdate(DocumentEvent event) {
-			DocumentAdapter.this.delegateRemoveUpdate(event);
-		}
-		public void undoableEditHappened(UndoableEditEvent event) {
-			DocumentAdapter.this.delegateUndoableEditHappened(event);
-		}
-	}
-	
-	protected static class InternalDocumentEvent
-		extends EventObject
-		implements DocumentEvent
-	{
-		protected DocumentEvent delegate;
-	
-		protected InternalDocumentEvent(Document document, DocumentEvent delegate) {
-			super(document);
-			this.delegate = delegate;
-		}
-		public ElementChange getChange(Element elem) {
-			return this.delegate.getChange(elem);
-		}
-		public Document getDocument() {
-			return (Document) this.source;
-		}
-		public int getLength() {
-			return this.delegate.getLength();
-		}
-		public int getOffset() {
-			return this.delegate.getOffset();
-		}
-		public EventType getType() {
-			return this.delegate.getType();
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ListModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ListModelAdapter.java
deleted file mode 100644
index 42e952f6b0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ListModelAdapter.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value.swing;
-
-import javax.swing.AbstractListModel;
-import javax.swing.event.ListDataListener;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.model.listener.awt.AWTListChangeListenerWrapper;
-import org.eclipse.jpt.utility.internal.model.value.CollectionListValueModelAdapter;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * This javax.swing.ListModel can be used to keep a ListDataListener
- * (e.g. a JList) in synch with a ListValueModel (or a CollectionValueModel).
- * 
- * An instance of this ListModel *must* be supplied with a value model,
- * which is a ListValueModel on the bound list or a CollectionValueModel
- * on the bound collection. This is required - the list (or collection)
- * itself can be null, but the value model that holds it cannot.
- */
-public class ListModelAdapter
-	extends AbstractListModel
-{
-	/** A value model on the underlying model list. */
-	protected ListValueModel<?> listHolder;
-
-	/**
-	 * Cache the size of the list for "dramatic" changes.
-	 * @see #listChanged(ListChangeEvent)
-	 */
-	protected int listSize;
-
-	/** A listener that allows us to forward changes made to the underlying model list. */
-	protected final ListChangeListener listChangeListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Default constructor - initialize stuff.
-	 */
-	private ListModelAdapter() {
-		super();
-		this.listSize = 0;
-		this.listChangeListener = this.buildListChangeListener();
-	}
-
-	/**
-	 * Constructor - the list holder is required.
-	 */
-	public ListModelAdapter(ListValueModel<?> listHolder) {
-		this();
-		this.setModel(listHolder);
-	}
-
-	/**
-	 * Constructor - the collection holder is required.
-	 */
-	public ListModelAdapter(CollectionValueModel<?> collectionHolder) {
-		this();
-		this.setModel(collectionHolder);
-	}
-
-
-	// ********** initialization **********
-
-	protected ListChangeListener buildListChangeListener() {
-		return new AWTListChangeListenerWrapper(this.buildListChangeListener_());
-	}
-
-	protected ListChangeListener buildListChangeListener_() {
-		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent event) {
-				ListModelAdapter.this.itemsAdded(event);
-			}
-			public void itemsRemoved(ListChangeEvent event) {
-				ListModelAdapter.this.itemsRemoved(event);
-			}
-			public void itemsReplaced(ListChangeEvent event) {
-				ListModelAdapter.this.itemsReplaced(event);
-			}
-			public void itemsMoved(ListChangeEvent event) {
-				ListModelAdapter.this.itemsMoved(event);
-			}
-			public void listCleared(ListChangeEvent event) {
-				ListModelAdapter.this.listCleared();
-			}
-			public void listChanged(ListChangeEvent event) {
-				ListModelAdapter.this.listChanged();
-			}
-			@Override
-			public String toString() {
-				return "list listener";
-			}
-		};
-	}
-
-
-	// ********** ListModel implementation **********
-
-	public int getSize() {
-		return this.listHolder.size();
-	}
-
-	public Object getElementAt(int index) {
-		return this.listHolder.get(index);
-	}
-
-	/**
-	 * Extend to start listening to the underlying model list if necessary.
-	 */
-    @Override
-	public void addListDataListener(ListDataListener l) {
-		if (this.hasNoListDataListeners()) {
-			this.engageModel();
-			this.listSize = this.listHolder.size();
-		}
-		super.addListDataListener(l);
-	}
-
-	/**
-	 * Extend to stop listening to the underlying model list if appropriate.
-	 */
-    @Override
-	public void removeListDataListener(ListDataListener l) {
-		super.removeListDataListener(l);
-		if (this.hasNoListDataListeners()) {
-			this.disengageModel();
-			this.listSize = 0;
-		}
-	}
-
-
-	// ********** public API **********
-
-	/**
-	 * Return the underlying list model.
-	 */
-	public ListValueModel<?> model() {
-		return this.listHolder;
-	}
-	
-	/**
-	 * Set the underlying list model.
-	 */
-	public void setModel(ListValueModel<?> listHolder) {
-		if (listHolder == null) {
-			throw new NullPointerException();
-		}
-		boolean hasListeners = this.hasListDataListeners();
-		if (hasListeners) {
-			this.disengageModel();
-		}
-		this.listHolder = listHolder;
-		if (hasListeners) {
-			this.engageModel();
-			this.listChanged();
-		}
-	}
-
-	/**
-	 * Set the underlying collection model.
-	 */
-	@SuppressWarnings("unchecked")
-	public void setModel(CollectionValueModel<?> collectionHolder) {
-		this.setModel(new CollectionListValueModelAdapter(collectionHolder));
-	}
-
-
-	// ********** queries **********
-
-	/**
-	 * Return whether this model has no listeners.
-	 */
-	protected boolean hasNoListDataListeners() {
-		return this.getListDataListeners().length == 0;
-	}
-
-	/**
-	 * Return whether this model has any listeners.
-	 */
-	protected boolean hasListDataListeners() {
-		return ! this.hasNoListDataListeners();
-	}
-
-
-	// ********** behavior **********
-
-	protected void engageModel() {
-		this.listHolder.addListChangeListener(ListValueModel.LIST_VALUES, this.listChangeListener);
-	}
-
-	protected void disengageModel() {
-		this.listHolder.removeListChangeListener(ListValueModel.LIST_VALUES, this.listChangeListener);
-	}
-
-
-
-	// ********** list change support **********
-
-	/**
-	 * Items were added to the underlying model list.
-	 * Notify listeners of the changes.
-	 */
-	protected void itemsAdded(ListChangeEvent event) {
-		int start = event.getIndex();
-		int end = start + event.itemsSize() - 1;
-		this.fireIntervalAdded(this, start, end);
-		this.listSize += event.itemsSize();
-	}
-
-	/**
-	 * Items were removed from the underlying model list.
-	 * Notify listeners of the changes.
-	 */
-	protected void itemsRemoved(ListChangeEvent event) {
-		int start = event.getIndex();
-		int end = start + event.itemsSize() - 1;
-		this.fireIntervalRemoved(this, start, end);
-		this.listSize -= event.itemsSize();
-	}
-
-	/**
-	 * Items were replaced in the underlying model list.
-	 * Notify listeners of the changes.
-	 */
-	protected void itemsReplaced(ListChangeEvent event) {
-		int start = event.getIndex();
-		int end = start + event.itemsSize() - 1;
-		this.fireContentsChanged(this, start, end);
-	}
-
-	/**
-	 * Items were moved in the underlying model list.
-	 * Notify listeners of the changes.
-	 */
-	protected void itemsMoved(ListChangeEvent event) {
-		int start = Math.min(event.getSourceIndex(), event.getTargetIndex());
-		int end = Math.max(event.getSourceIndex(), event.getTargetIndex()) + event.getMoveLength() - 1;
-		this.fireContentsChanged(this, start, end);
-	}
-
-	/**
-	 * The underlying model list was cleared.
-	 * Notify listeners of the changes.
-	 */
-	protected void listCleared() {
-		if (this.listSize != 0) {
-			this.fireIntervalRemoved(this, 0, this.listSize - 1);
-			this.listSize = 0;
-		}
-	}
-
-	/**
-	 * The underlying model list has changed "dramatically".
-	 * Notify listeners of the changes.
-	 */
-	protected void listChanged() {
-		if (this.listSize != 0) {
-			this.fireIntervalRemoved(this, 0, this.listSize - 1);
-		}
-		this.listSize = this.listHolder.size();
-		if (this.listSize != 0) {
-			this.fireIntervalAdded(this, 0, this.listSize - 1);
-		}
-	}
-
-
-	// ********** Object overrides **********
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.listHolder);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ListSpinnerModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ListSpinnerModelAdapter.java
deleted file mode 100644
index 527120367b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ListSpinnerModelAdapter.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value.swing;
-
-import java.util.Arrays;
-import java.util.List;
-import javax.swing.SpinnerListModel;
-import javax.swing.event.ChangeListener;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.model.listener.awt.AWTPropertyChangeListenerWrapper;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * This javax.swing.SpinnerListModel can be used to keep a ChangeListener
- * (e.g. a JSpinner) in synch with a PropertyValueModel that holds a value
- * in the list.
- * 
- * This class must be a sub-class of SpinnerListModel because of some
- * crappy jdk code....  ~bjv
- * @see javax.swing.JSpinner#createEditor(javax.swing.SpinnerModel)
- * 
- * NB: This model should only be used for values that have a reasonably
- * inexpensive #equals() implementation.
- * @see #synchronize(Object)
- * 
- * If this class needs to be modified, it would behoove us to review the
- * other, similar classes:
- * @see DateSpinnerModelAdapter
- * @see NumberSpinnerModelAdapter
- */
-public class ListSpinnerModelAdapter
-	extends SpinnerListModel
-{
-
-	/**
-	 * The default spinner value; used when the underlying model value is null.
-	 * The default is the first item on the list.
-	 */
-	private final Object defaultValue;
-
-	/** A value model on the underlying value. */
-	private final WritablePropertyValueModel<Object> valueHolder;
-
-	/** A listener that allows us to synchronize with changes made to the underlying value. */
-	private final PropertyChangeListener valueChangeListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Constructor - the value holder is required.
-	 * Use the model value itself as the default spinner value.
-	 */
-	public ListSpinnerModelAdapter(WritablePropertyValueModel<Object> valueHolder) {
-		this(valueHolder, valueHolder.getValue());
-	}
-
-	/**
-	 * Constructor - the value holder is required.
-	 */
-	public ListSpinnerModelAdapter(WritablePropertyValueModel<Object> valueHolder, Object defaultValue) {
-		this(valueHolder, new Object[] {defaultValue}, defaultValue);
-	}
-
-	/**
-	 * Constructor - the value holder is required.
-	 * Use the first item in the list of values as the default spinner value.
-	 */
-	public ListSpinnerModelAdapter(WritablePropertyValueModel<Object> valueHolder, Object[] values) {
-		this(valueHolder, values, values[0]);
-	}
-
-	/**
-	 * Constructor - the value holder is required.
-	 */
-	public ListSpinnerModelAdapter(WritablePropertyValueModel<Object> valueHolder, Object[] values, Object defaultValue) {
-		this(valueHolder, Arrays.asList(values), defaultValue);
-	}
-
-	/**
-	 * Constructor - the value holder is required.
-	 * Use the first item in the list of values as the default spinner value.
-	 */
-	public ListSpinnerModelAdapter(WritablePropertyValueModel<Object> valueHolder, List<Object> values) {
-		this(valueHolder, values, values.get(0));
-	}
-
-	/**
-	 * Constructor - the value holder is required.
-	 */
-	public ListSpinnerModelAdapter(WritablePropertyValueModel<Object> valueHolder, List<Object> values, Object defaultValue) {
-		super(values);
-		this.valueHolder = valueHolder;
-		this.valueChangeListener = this.buildValueChangeListener();
-		// postpone listening to the underlying value
-		// until we have listeners ourselves...
-		this.defaultValue = defaultValue;
-	}
-
-
-	// ********** initialization **********
-
-	protected PropertyChangeListener buildValueChangeListener() {
-		return new AWTPropertyChangeListenerWrapper(this.buildValueChangeListener_());
-	}
-
-	protected PropertyChangeListener buildValueChangeListener_() {
-		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent event) {
-				ListSpinnerModelAdapter.this.synchronize(event.getNewValue());
-			}
-			@Override
-			public String toString() {
-				return "value listener";
-			}
-		};
-	}
-
-
-	// ********** SpinnerModel implementation **********
-
-	/**
-	 * Extend to check whether this method is being called before we 
-	 * have any listeners.
-	 * This is necessary because some crappy jdk code gets the value
-	 * from the model *before* listening to the model.  ~bjv
-	 * @see javax.swing.JSpinner.DefaultEditor(javax.swing.JSpinner)
-	 */
-    @Override
-	public Object getValue() {
-		if (this.getChangeListeners().length == 0) {
-			// sorry about this "lateral" call to super  ~bjv
-			super.setValue(this.spinnerValueOf(this.valueHolder.getValue()));
-		}
-		return super.getValue();
-	}
-
-	/**
-	 * Extend to update the underlying value directly.
-	 * The resulting event will be ignored: @see #synchronize(Object).
-	 */
-    @Override
-	public void setValue(Object value) {
-		super.setValue(value);
-		this.valueHolder.setValue(value);
-	}
-
-	/**
-	 * Extend to start listening to the underlying value if necessary.
-	 */
-    @Override
-	public void addChangeListener(ChangeListener listener) {
-		if (this.getChangeListeners().length == 0) {
-			this.valueHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.valueChangeListener);
-			this.synchronize(this.valueHolder.getValue());
-		}
-		super.addChangeListener(listener);
-	}
-
-	/**
-	 * Extend to stop listening to the underlying value if appropriate.
-	 */
-    @Override
-	public void removeChangeListener(ChangeListener listener) {
-		super.removeChangeListener(listener);
-		if (this.getChangeListeners().length == 0) {
-			this.valueHolder.removePropertyChangeListener(PropertyValueModel.VALUE, this.valueChangeListener);
-		}
-	}
-
-
-	// ********** queries **********
-
-	protected Object getDefaultValue() {
-		return this.defaultValue;
-	}
-
-	/**
-	 * Convert to a non-null value.
-	 */
-	protected Object spinnerValueOf(Object value) {
-		return (value == null) ? this.getDefaultValue() : value;
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Set the spinner value if it has changed.
-	 */
-	void synchronize(Object value) {
-		Object newValue = this.spinnerValueOf(value);
-		// check to see whether the spinner value has already been synchronized
-		// (via #setValue())
-		if ( ! this.getValue().equals(newValue)) {
-			this.setValue(newValue);
-		}
-	}
-
-
-	// ********** standard methods **********
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.valueHolder);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/NumberSpinnerModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/NumberSpinnerModelAdapter.java
deleted file mode 100644
index 484ff33c3a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/NumberSpinnerModelAdapter.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value.swing;
-
-import javax.swing.SpinnerNumberModel;
-import javax.swing.event.ChangeListener;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.model.listener.awt.AWTPropertyChangeListenerWrapper;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * This javax.swing.SpinnerNumberModel can be used to keep a ChangeListener
- * (e.g. a JSpinner) in synch with a PropertyValueModel that holds a number.
- * 
- * This class must be a sub-class of SpinnerNumberModel because of some
- * crappy jdk code....  ~bjv
- * @see javax.swing.JSpinner#createEditor(javax.swing.SpinnerModel)
- * 
- * If this class needs to be modified, it would behoove us to review the
- * other, similar classes:
- * @see DateSpinnerModelAdapter
- * @see ListSpinnerModelAdapter
- */
-public class NumberSpinnerModelAdapter
-	extends SpinnerNumberModel
-{
-
-	/**
-	 * The default spinner value; used when the
-	 * underlying model number value is null.
-	 */
-	private final Number defaultValue;
-
-	/** A value model on the underlying number. */
-	private final WritablePropertyValueModel<Number> numberHolder;
-
-	/**
-	 * A listener that allows us to synchronize with
-	 * changes made to the underlying number.
-	 */
-	private final PropertyChangeListener numberChangeListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Constructor - the number holder is required.
-	 * The default spinner value is zero.
-	 * The step size is one.
-	 */
-	public NumberSpinnerModelAdapter(WritablePropertyValueModel<Number> numberHolder) {
-		this(numberHolder, 0);
-	}
-
-	/**
-	 * Constructor - the number holder is required.
-	 * The step size is one.
-	 */
-	public NumberSpinnerModelAdapter(WritablePropertyValueModel<Number> numberHolder, int defaultValue) {
-		this(numberHolder, null, null, new Integer(1), new Integer(defaultValue));
-	}
-
-	/**
-	 * Constructor - the number holder is required.
-	 * Use the minimum value as the default spinner value.
-	 */
-	public NumberSpinnerModelAdapter(WritablePropertyValueModel<Number> numberHolder, int minimum, int maximum, int stepSize) {
-		this(numberHolder, minimum, maximum, stepSize, minimum);
-	}
-
-	/**
-	 * Constructor - the number holder is required.
-	 */
-	public NumberSpinnerModelAdapter(WritablePropertyValueModel<Number> numberHolder, int minimum, int maximum, int stepSize, int defaultValue) {
-		this(numberHolder, new Integer(minimum), new Integer(maximum), new Integer(stepSize), new Integer(defaultValue));
-	}
-
-	/**
-	 * Constructor - the number holder is required.
-	 * Use the minimum value as the default spinner value.
-	 */
-	public NumberSpinnerModelAdapter(WritablePropertyValueModel<Number> numberHolder, double value, double minimum, double maximum, double stepSize) {
-		this(numberHolder, value, minimum, maximum, stepSize, minimum);
-	}
-
-	/**
-	 * Constructor - the number holder is required.
-	 */
-	public NumberSpinnerModelAdapter(WritablePropertyValueModel<Number> numberHolder, double value, double minimum, double maximum, double stepSize, double defaultValue) {
-		this(numberHolder, new Double(minimum), new Double(maximum), new Double(stepSize), new Double(defaultValue));
-	}
-
-	/**
-	 * Constructor - the number holder is required.
-	 */
-	public NumberSpinnerModelAdapter(WritablePropertyValueModel<Number> numberHolder, Comparable<?> minimum, Comparable<?> maximum, Number stepSize, Number defaultValue) {
-		super(numberHolder.getValue() == null ? defaultValue : (Number) numberHolder.getValue(), minimum, maximum, stepSize);
-		this.numberHolder = numberHolder;
-		this.numberChangeListener = this.buildNumberChangeListener();
-		// postpone listening to the underlying number
-		// until we have listeners ourselves...
-		this.defaultValue = defaultValue;
-	}
-
-
-	// ********** initialization **********
-
-	protected PropertyChangeListener buildNumberChangeListener() {
-		return new AWTPropertyChangeListenerWrapper(this.buildNumberChangeListener_());
-	}
-
-	protected PropertyChangeListener buildNumberChangeListener_() {
-		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent event) {
-				NumberSpinnerModelAdapter.this.synchronize(event.getNewValue());
-			}
-			@Override
-			public String toString() {
-				return "number listener";
-			}
-		};
-	}
-
-
-	// ********** SpinnerModel implementation **********
-
-	/**
-	 * Extend to check whether this method is being called before we 
-	 * have any listeners.
-	 * This is necessary because some crappy jdk code gets the value
-	 * from the model *before* listening to the model.  ~bjv
-	 * @see javax.swing.JSpinner.DefaultEditor(javax.swing.JSpinner)
-	 */
-    @Override
-	public Object getValue() {
-		if (this.getChangeListeners().length == 0) {
-			// sorry about this "lateral" call to super  ~bjv
-			super.setValue(this.spinnerValueOf(this.numberHolder.getValue()));
-		}
-		return super.getValue();
-	}
-
-	/**
-	 * Extend to update the underlying number directly.
-	 * The resulting event will be ignored: @see #synchronizeDelegate(Object).
-	 */
-    @Override
-	public void setValue(Object value) {
-		super.setValue(value);
-		this.numberHolder.setValue((Number) value);
-	}
-
-	/**
-	 * Extend to start listening to the underlying number if necessary.
-	 */
-    @Override
-	public void addChangeListener(ChangeListener listener) {
-		if (this.getChangeListeners().length == 0) {
-			this.numberHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.numberChangeListener);
-			this.synchronize(this.numberHolder.getValue());
-		}
-		super.addChangeListener(listener);
-	}
-
-	/**
-	 * Extend to stop listening to the underlying number if appropriate.
-	 */
-    @Override
-	public void removeChangeListener(ChangeListener listener) {
-		super.removeChangeListener(listener);
-		if (this.getChangeListeners().length == 0) {
-			this.numberHolder.removePropertyChangeListener(PropertyValueModel.VALUE, this.numberChangeListener);
-		}
-	}
-
-
-	// ********** queries **********
-
-	protected Number getDefaultValue() {
-		return this.defaultValue;
-	}
-
-	/**
-	 * Convert to a non-null value.
-	 */
-	protected Object spinnerValueOf(Object value) {
-		return (value == null) ? this.getDefaultValue() : value;
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Set the spinner value if it has changed.
-	 */
-	void synchronize(Object value) {
-		Object newValue = this.spinnerValueOf(value);
-		// check to see whether the date has already been synchronized
-		// (via #setValue())
-		if ( ! this.getValue().equals(newValue)) {
-			this.setValue(newValue);
-		}
-	}
-
-
-	// ********** standard methods **********
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.numberHolder);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ObjectListSelectionModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ObjectListSelectionModel.java
deleted file mode 100644
index 61d2e3701f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ObjectListSelectionModel.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value.swing;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import javax.swing.DefaultListSelectionModel;
-import javax.swing.ListModel;
-import javax.swing.event.ListDataEvent;
-import javax.swing.event.ListDataListener;
-import javax.swing.event.ListSelectionListener;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-
-/**
- * This ListSelectionModel is aware of the ListModel and
- * provides convenience methods to access and set the
- * selected *objects*, as opposed to the selected *indexes*.
- */
-public class ObjectListSelectionModel
-	extends DefaultListSelectionModel
-{
-	/** The list model referenced by the list selection model. */
-	private final ListModel listModel;
-
-	/** A listener that allows us to clear the selection when the list model has changed. */
-	private final ListDataListener listDataListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a list selection model for the specified list model.
-	 */
-	public ObjectListSelectionModel(ListModel listModel) {
-		super();
-		this.listModel = listModel;
-		this.listDataListener = this.buildListDataListener();
-	}
-
-
-	// ********** initialization **********
-
-	private ListDataListener buildListDataListener() {
-		return new ListDataListener() {
-			public void intervalAdded(ListDataEvent event) {
-				// this does not affect the selection
-			}
-			public void intervalRemoved(ListDataEvent event) {
-				// this does not affect the selection
-			}
-			public void contentsChanged(ListDataEvent event) {
-				ObjectListSelectionModel.this.listModelContentsChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "list data listener";
-			}
-		};
-	}
-
-	/**
-	 * Typically, the selection does not need to be cleared when the
-	 * contents of the list have changed. Most of the time this just
-	 * means an item has changed in a way that affects its display string
-	 * or icon. We typically only use the class for edits involving
-	 * single selection.
-	 * A subclass can override this method if the selection
-	 * should be cleared because a change could mean the selection is invalid.
-	 */
-	protected void listModelContentsChanged(ListDataEvent event) {
-		/**this.clearSelection();*/
-	}
-
-
-	// ********** ListSelectionModel implementation **********
-
-	@Override
-	public void addListSelectionListener(ListSelectionListener l) {
-		if (this.hasNoListSelectionListeners()) {
-			this.listModel.addListDataListener(this.listDataListener);
-		}
-		super.addListSelectionListener(l);
-	}
-
-	@Override
-	public void removeListSelectionListener(ListSelectionListener l) {
-		super.removeListSelectionListener(l);
-		if (this.hasNoListSelectionListeners()) {
-			this.listModel.removeListDataListener(this.listDataListener);
-		}
-	}
-
-
-	// ********** queries **********
-
-	/**
-	 * Return whether this model has no listeners.
-	 */
-	protected boolean hasNoListSelectionListeners() {	// private-protected
-		return this.getListSelectionListeners().length == 0;
-	}
-
-	/**
-	 * Return the list model referenced by the list selection model.
-	 */
-	public ListModel getListModel() {
-		return this.listModel;
-	}
-
-	public int selectedValuesSize() {
-		int min = this.getMinSelectionIndex();
-		int max = this.getMaxSelectionIndex();
-
-		if ((min < 0) || (max < 0)) {
-			return 0;
-		}
-
-		int n = 0;
-		int count = this.getListModel().getSize();
-		for (int i = min; i <= max; i++) {
-			if (this.isSelectedIndex(i) && (i < count)) {
-				n++;
-			}
-		}
-		return n;
-	}
-
-	/**
-	 * Return the first selected value.
-	 * Return null if the selection is empty.
-	 */
-	public Object selectedValue() {
-		int index = this.getMinSelectionIndex();
-		if (index == -1) {
-			return null;
-		}
-		if (this.getListModel().getSize() <= index) {
-			return null;
-		}
-		return this.getListModel().getElementAt(index);
-	}
-
-	/**
-	 * Return an array of the selected values.
-	 */
-	public Object[] selectedValues() {
-		int min = this.getMinSelectionIndex();
-		int max = this.getMaxSelectionIndex();
-
-		if ((min < 0) || (max < 0)) {
-			return new Object[0];
-		}
-
-		int maxSize = (max - min) + 1;
-		Object[] temp = new Object[maxSize];
-		int n = 0;
-		int count = this.getListModel().getSize();
-		for (int i = min; i <= max; i++) {
-			if (this.isSelectedIndex(i) && (i < count)) {
-				temp[n++] = this.getListModel().getElementAt(i);
-			}
-		}
-		if (n == maxSize) {
-			// all the elements in the range were selected
-			return temp;
-		}
-		// only some of the elements in the range were selected
-		Object[] result = new Object[n];
-		System.arraycopy(temp, 0, result, 0, n);
-		return result;
-	}
-
-	/**
-	 * Return an array of the selected indices in order.
-	 */
-	public int[] selectedIndices() {
-		int min = this.getMinSelectionIndex();
-		int max = this.getMaxSelectionIndex();
-
-		if ((min < 0) || (max < 0)) {
-			return new int[0];
-		}
-
-		int maxSize = (max - min) + 1;
-		int[] temp = new int[maxSize];
-		int n = 0;
-		int count = this.getListModel().getSize();
-		for (int i = min; i <= max; i++) {
-			if (this.isSelectedIndex(i) && (i < count)) {
-				temp[n++] = i;
-			}
-		}
-		if (n == maxSize) {
-			// all the elements in the range were selected
-			Arrays.sort(temp);
-			return temp;
-		}
-		// only some of the elements in the range were selected
-		int[] result = new int[n];
-		System.arraycopy(temp, 0, result, 0, n);
-		Arrays.sort(result);
-		return result;
-	}
-
-	/**
-	 * Set the selected value.
-	 */
-	public void setSelectedValue(Object object) {
-		this.setSelectedValues(CollectionTools.singletonIterator(object));
-	}
-
-	/**
-	 * Set the current set of selected objects to the specified objects.
-	 * @see javax.swing.ListSelectionModel#setSelectionInterval(int, int)
-	 */
-	public void setSelectedValues(Iterator<?> objects) {
-		this.setValueIsAdjusting(true);
-		this.clearSelection();
-		this.addSelectedValuesInternal(objects);
-		this.setValueIsAdjusting(false);
-	}
-
-	/**
-	 * Set the current set of selected objects to the specified objects.
-	 * @see javax.swing.ListSelectionModel#setSelectionInterval(int, int)
-	 */
-	public void setSelectedValues(Collection<?> objects) {
-		this.setSelectedValues(objects.iterator());
-	}
-
-	/**
-	 * Set the current set of selected objects to the specified objects.
-	 * @see javax.swing.ListSelectionModel#setSelectionInterval(int, int)
-	 */
-	public void setSelectedValues(Object[] objects) {
-		this.setSelectedValues(CollectionTools.iterator(objects));
-	}
-
-	/**
-	 * Add the specified object to the current set of selected objects.
-	 * @see javax.swing.ListSelectionModel#addSelectionInterval(int, int)
-	 */
-	public void addSelectedValue(Object object) {
-		this.addSelectedValues(CollectionTools.singletonIterator(object));
-	}
-
-	/**
-	 * Add the specified objects to the current set of selected objects.
-	 * @see javax.swing.ListSelectionModel#addSelectionInterval(int, int)
-	 */
-	public void addSelectedValues(Iterator<?> objects) {
-		this.setValueIsAdjusting(true);
-		this.addSelectedValuesInternal(objects);
-		this.setValueIsAdjusting(false);
-	}
-
-	/**
-	 * Add the specified objects to the current set of selected objects.
-	 * @see javax.swing.ListSelectionModel#addSelectionInterval(int, int)
-	 */
-	public void addSelectedValues(Collection<?> objects) {
-		this.addSelectedValues(objects.iterator());
-	}
-
-	/**
-	 * Add the specified objects to the current set of selected objects.
-	 * @see javax.swing.ListSelectionModel#addSelectionInterval(int, int)
-	 */
-	public void addSelectedValues(Object[] objects) {
-		this.addSelectedValues(CollectionTools.iterator(objects));
-	}
-
-	/**
-	 * Remove the specified object from the current set of selected objects.
-	 * @see javax.swing.ListSelectionModel#removeSelectionInterval(int, int)
-	 */
-	public void removeSelectedValue(Object object) {
-		this.removeSelectedValues(CollectionTools.singletonIterator(object));
-	}
-
-	/**
-	 * Remove the specified objects from the current set of selected objects.
-	 * @see javax.swing.ListSelectionModel#removeSelectionInterval(int, int)
-	 */
-	public void removeSelectedValues(Iterator<?> objects) {
-		this.setValueIsAdjusting(true);
-		ListModel lm = this.getListModel();
-		int lmSize = lm.getSize();
-		while (objects.hasNext()) {
-			int index = this.indexOf(objects.next(), lm, lmSize);
-			this.removeSelectionInterval(index, index);
-		}
-		this.setValueIsAdjusting(false);
-	}
-
-	/**
-	 * Remove the specified objects from the current set of selected objects.
-	 * @see javax.swing.ListSelectionModel#removeSelectionInterval(int, int)
-	 */
-	public void removeSelectedValues(Collection<?> objects) {
-		this.removeSelectedValues(objects.iterator());
-	}
-
-	/**
-	 * Remove the specified objects from the current set of selected objects.
-	 * @see javax.swing.ListSelectionModel#removeSelectionInterval(int, int)
-	 */
-	public void removeSelectedValues(Object[] objects) {
-		this.removeSelectedValues(CollectionTools.iterator(objects));
-	}
-
-	/**
-	 * @see javax.swing.ListSelectionModel#getAnchorSelectionIndex()
-	 * Return null if the anchor selection is empty.
-	 */
-	public Object getAnchorSelectedValue() {
-		int index = this.getAnchorSelectionIndex();
-		if (index == -1) {
-			return null;
-		}
-		return this.getListModel().getElementAt(index);
-	}
-
-	/**
-	 * @see javax.swing.ListSelectionModel#setAnchorSelectionIndex(int)
-	 */
-	public void setAnchorSelectedValue(Object object) {
-		this.setAnchorSelectionIndex(this.indexOf(object));
-	}
-
-	/**
-	 * @see javax.swing.ListSelectionModel#getLeadSelectionIndex()
-	 * Return null if the lead selection is empty.
-	 */
-	public Object getLeadSelectedValue() {
-		int index = this.getLeadSelectionIndex();
-		if (index == -1) {
-			return null;
-		}
-		return this.getListModel().getElementAt(index);
-	}
-
-	/**
-	 * @see javax.swing.ListSelectionModel#setLeadSelectionIndex(int)
-	 */
-	public void setLeadSelectedValue(Object object) {
-		this.setLeadSelectionIndex(this.indexOf(object));
-	}
-
-	/**
-	 * @see javax.swing.ListSelectionModel#getMaxSelectionIndex()
-	 * Return null if the max selection is empty.
-	 */
-	public Object getMaxSelectedValue() {
-		int index = this.getMaxSelectionIndex();
-		if (index == -1) {
-			return null;
-		}
-		return this.getListModel().getElementAt(index);
-	}
-
-	/**
-	 * @see javax.swing.ListSelectionModel#getMinSelectionIndex()
-	 * Return null if the min selection is empty.
-	 */
-	public Object getMinSelectedValue() {
-		int index = this.getMinSelectionIndex();
-		if (index == -1) {
-			return null;
-		}
-		return this.getListModel().getElementAt(index);
-	}
-
-	/**
-	 * @see javax.swing.ListSelectionModel#isSelectedIndex(int)
-	 */
-	public boolean valueIsSelected(Object object) {
-		return this.isSelectedIndex(this.indexOf(object));
-	}
-
-	/**
-	 * Add the specified objects to the current set of selected objects,
-	 * without wrapping the actions in "adjusting" events.
-	 */
-	private void addSelectedValuesInternal(Iterator<?> objects) {
-		ListModel lm = this.getListModel();
-		int listModelSize = lm.getSize();
-		while (objects.hasNext()) {
-			int index = this.indexOf(objects.next(), lm, listModelSize);
-			this.addSelectionInterval(index, index);
-		}
-	}
-
-	/**
-	 * Return the index in the list model of the specified object.
-	 * Return -1 if the object is not in the list model.
-	 */
-	private int indexOf(Object object) {
-		ListModel lm = this.getListModel();
-		return this.indexOf(object, lm, lm.getSize());
-	}
-
-	/**
-	 * Return the index in the list model of the specified object.
-	 * Return -1 if the object is not in the list model.
-	 */
-	// we're just jerking around with performance optimizations here
-	// (in memory of Phil...);
-	// call this method inside loops that do not modify the listModel
-	private int indexOf(Object object, ListModel lm, int listModelSize) {
-		for (int i = listModelSize; i-- > 0; ) {
-			if (lm.getElementAt(i) == object) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/PrimitiveListTreeModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/PrimitiveListTreeModel.java
deleted file mode 100644
index 2bc8a17734..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/PrimitiveListTreeModel.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value.swing;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.ListIterator;
-import javax.swing.event.TreeModelListener;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.MutableTreeNode;
-import javax.swing.tree.TreeNode;
-import javax.swing.tree.TreePath;
-import org.eclipse.jpt.utility.internal.model.listener.awt.AWTListChangeListenerWrapper;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-
-/**
- * This TreeModel implementation provides a tree with a "null" root that
- * has a set of "primitive" children. These "primitive" children do not have
- * children themselves, making the tree a maximum of 2 levels deep.
- * This model automatically synchronizes the root's children with a
- * ListValueModel that holds a collection of primitive (non-model) objects
- * (e.g. Strings).
- * 
- * This is useful for providing an "editable" list of primitives. Since the JDK
- * does not provide us with an editable listbox, we must use an editable tree.
- * We wrap everything in DefaultMutableTreeNodes.
- * 
- * Subclasses must implement #primitiveChanged(int, Object) and update
- * the model appropriately. This method is called when the user edits the
- * list directly and presses <Enter>.
- * 
- * The JTree using this model must be configured as "editable":
- * 	tree.setEditable(true);
- */
-// TODO convert to use an adapter instead of requiring subclass
-public abstract class PrimitiveListTreeModel
-	extends DefaultTreeModel
-{
-	/** a model on the list of primitives */
-	private final ListValueModel<?> listHolder;
-
-	/** a listener that handles the adding, removing, and replacing of the primitives */
-	private final ListChangeListener listChangeListener;
-
-
-	// ********** constructors **********
-	
-	/**
-	 * Public constructor - the list holder is required
-	 */
-	public PrimitiveListTreeModel(ListValueModel<?> listHolder) {
-		super(new DefaultMutableTreeNode(null, true));  // true = the root can have children
-		if (listHolder == null) {
-			throw new NullPointerException();
-		}
-		this.listHolder = listHolder;
-		this.listChangeListener = this.buildListChangeListener();
-		// postpone listening to the model until we have listeners ourselves
-	}
-
-	protected ListChangeListener buildListChangeListener() {
-		return new AWTListChangeListenerWrapper(this.buildListChangeListener_());
-	}
-
-	protected ListChangeListener buildListChangeListener_() {
-		return new PrimitiveListChangeListener();
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Subclasses should override this method to update the 
-	 * model appropriately. The primitive at the specified index was
-	 * edited directly by the user and the new value is as specified.
-	 * Convert the value appropriately and place it in the model.
-	 */
-	protected abstract void primitiveChanged(int index, Object newValue);
-
-
-	// ********** TreeModel implementation **********
-
-	/**
-	 * Override to change the underlying model instead of changing the node directly.
-	 */
-    @Override
-	public void valueForPathChanged(TreePath path, Object newValue) {
-		TreeNode node = (TreeNode) path.getLastPathComponent();
-		int index = ((TreeNode) this.getRoot()).getIndex(node);
-		this.primitiveChanged(index, newValue);
-	}
-
-	/**
-	 * Extend to start listening to the underlying model if necessary.
-	 */
-    @Override
-	public void addTreeModelListener(TreeModelListener l) {
-		if (this.getTreeModelListeners().length == 0) {
-			this.listHolder.addListChangeListener(ListValueModel.LIST_VALUES, this.listChangeListener);
-			this.synchronizeList();
-		}
-		super.addTreeModelListener(l);
-	}
-
-	/**
-	 * Extend to stop listening to the underlying model if appropriate.
-	 */
-    @Override
-	public void removeTreeModelListener(TreeModelListener l) {
-		super.removeTreeModelListener(l);
-		if (this.getTreeModelListeners().length == 0) {
-			this.listHolder.removeListChangeListener(ListValueModel.LIST_VALUES, this.listChangeListener);
-		}
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Synchronize our list of nodes with the list of primitives
-	 */
-	void synchronizeList() {
-		this.clearList();
-		this.buildList();
-	}
-
-	void clearList() {
-		int childcount = this.root.getChildCount();
-		for (int i = childcount - 1; i >= 0; i--) {
-			this.removeNodeFromParent((MutableTreeNode)this.root.getChildAt(i));
-		}
-	}
-		
-	private void buildList() {
-		for (Iterator<?> stream = this.listHolder.iterator(); stream.hasNext(); ) {
-			this.addPrimitive(stream.next());
-		}
-	}
-
-	/**
-	 * Add the specified primitive to the end of the list.
-	 */
-	private void addPrimitive(Object primitive) {
-		this.insertPrimitive(this.root.getChildCount(), primitive);
-	}
-
-	/**
-	 * Create a node for the specified primitive
-	 * and insert it as a child of the root.
-	 */
-	void insertPrimitive(int index, Object primitive) {
-		DefaultMutableTreeNode node = new DefaultMutableTreeNode(primitive, false); // don't allow children on the child node
-		this.insertNodeInto(node, (MutableTreeNode) this.root, index);
-	}
-
-	/**
-	 * Remove node at the specified index.
-	 */
-	MutableTreeNode removeNode(int index) {
-		MutableTreeNode node = (MutableTreeNode) this.root.getChildAt(index);
-		this.removeNodeFromParent(node);
-		return node;
-	}
-
-	/**
-	 * Replace the user object of the node at childIndex.
-	 */
-	void replacePrimitive(int index, Object primitive) {
-		MutableTreeNode node = (MutableTreeNode) this.root.getChildAt(index);
-		node.setUserObject(primitive);
-		this.nodeChanged(node);
-	}
-
-
-	// ********** inner class **********
-
-	private class PrimitiveListChangeListener implements ListChangeListener {
-		PrimitiveListChangeListener() {
-			super();
-		}
-
-		public void itemsAdded(ListChangeEvent event) {
-			int i = event.getIndex();
-			for (ListIterator<?> stream = event.items(); stream.hasNext(); ) {
-				PrimitiveListTreeModel.this.insertPrimitive(i++, stream.next());
-			}
-		}
-
-		public void itemsRemoved(ListChangeEvent event) {
-			for (int i = 0; i < event.itemsSize(); i++) {
-				PrimitiveListTreeModel.this.removeNode(event.getIndex());
-			}
-		}
-
-		public void itemsReplaced(ListChangeEvent event) {
-			int i = event.getIndex();
-			for (ListIterator<?> stream = event.items(); stream.hasNext(); ) {
-				PrimitiveListTreeModel.this.replacePrimitive(i++, stream.next());
-			}
-		}
-
-		public void itemsMoved(ListChangeEvent event) {
-			ArrayList<MutableTreeNode> temp = new ArrayList<MutableTreeNode>(event.getMoveLength());
-			for (int i = 0; i < event.getMoveLength(); i++) {
-				temp.add(PrimitiveListTreeModel.this.removeNode(event.getSourceIndex()));
-			}
-			int i = event.getTargetIndex();
-			for (MutableTreeNode node : temp) {
-				PrimitiveListTreeModel.this.insertPrimitive(i++, node);
-			}
-		}
-
-		public void listCleared(ListChangeEvent event) {
-			PrimitiveListTreeModel.this.clearList();
-		}
-
-		public void listChanged(ListChangeEvent event) {
-			PrimitiveListTreeModel.this.synchronizeList();
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/RadioButtonModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/RadioButtonModelAdapter.java
deleted file mode 100644
index 1caee488c8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/RadioButtonModelAdapter.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value.swing;
-
-import org.eclipse.jpt.utility.internal.BidiFilter;
-import org.eclipse.jpt.utility.internal.BidiTransformer;
-import org.eclipse.jpt.utility.internal.model.value.FilteringWritablePropertyValueModel;
-import org.eclipse.jpt.utility.internal.model.value.TransformationWritablePropertyValueModel;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * This javax.swing.ButtonModel can be used to keep a listener
- * (e.g. a JRadioButton) in synch with a (typically shared)
- * PropertyValueModel that holds one value out of a set of values.
- * 
- * NOTE: Do *not* use this model with a ButtonGroup, since the
- * shared value holder and the wrappers built by this adapter will
- * keep the appropriate radio button checked. Also, this allows
- * us to uncheck all the radio buttons in a group when the shared
- * value is null.
- */
-public class RadioButtonModelAdapter
-	extends ToggleButtonModelAdapter
-{
-
-	// ********** constructors **********
-
-	/**
-	 * Constructor - the value holder is required.
-	 */
-	public RadioButtonModelAdapter(WritablePropertyValueModel<Object> valueHolder, Object buttonValue, boolean defaultValue) {
-		super(buildBooleanHolder(valueHolder, buttonValue), defaultValue);
-	}
-
-	/**
-	 * Constructor - the value holder is required.
-	 * The default value will be false.
-	 */
-	public RadioButtonModelAdapter(WritablePropertyValueModel<Object> valueHolder, Object buttonValue) {
-		super(buildBooleanHolder(valueHolder, buttonValue));
-	}
-
-
-	// ********** static methods **********
-
-	/**
-	 * Build up a set of wrappers that will convert the
-	 * specified value holder and button value to/from a boolean.
-	 * 
-	 * If the value holder's value matches the button value,
-	 * the wrapper will return true. Likewise, if the value holder's
-	 * value is set to true, the wrapper will set the value holder's
-	 * value to the button value.
-	 */
-	public static WritablePropertyValueModel<Boolean> buildBooleanHolder(WritablePropertyValueModel<Object> valueHolder, Object buttonValue) {
-		WritablePropertyValueModel<Object> filteringPVM = new FilteringWritablePropertyValueModel<Object>(valueHolder, new RadioButtonFilter(buttonValue));
-		return new TransformationWritablePropertyValueModel<Object, Boolean>(filteringPVM, new RadioButtonTransformer(buttonValue));
-	}
-
-
-	// ********** overrides **********
-
-	/**
-	 * The user cannot de-select a radio button - the user
-	 * can only *select* a radio button. Only the model can
-	 * cause a radio button to be de-selected. We use the
-	 * ARMED flag to indicate whether we are being de-selected
-	 * by the user.
-	 */
-    @Override
-	public void setSelected(boolean b) {
-		// do not allow the user to de-select a radio button
-		// radio buttons can
-		if ((b == false) && this.isArmed()) {
-			return;
-		}
-		super.setSelected(b);
-	}
-
-
-	// ********** inner classes **********
-
-	/**
-	 * This filter will only pass through a new value to the wrapped
-	 * value holder when it matches the configured button value.
-	 */
-	public static class RadioButtonFilter implements BidiFilter<Object> {
-		private Object buttonValue;
-
-		public RadioButtonFilter(Object buttonValue) {
-			super();
-			this.buttonValue = buttonValue;
-		}
-
-		/**
-		 * always return the wrapped value
-		 */
-		public boolean accept(Object value) {
-			return true;
-		}
-
-		/**
-		 * pass through the value to the wrapped property value model
-		 * *only* when it matches our button value
-		 */
-		public boolean reverseAccept(Object value) {
-			return value == this.buttonValue;
-		}
-
-	}
-
-	/**
-	 * This transformer will convert the wrapped value to Boolean.TRUE
-	 * when it matches the configured button value.
-	 */
-	public static class RadioButtonTransformer implements BidiTransformer<Object, Boolean> {
-		private Object buttonValue;
-
-		public RadioButtonTransformer(Object buttonValue) {
-			super();
-			this.buttonValue = buttonValue;
-		}
-
-		/**
-		 * if the wrapped value matches our button value return true,
-		 * if it is some other value return false;
-		 * but if it is null simply pass it through because it will cause the
-		 * button model's default value to be used
-		 */
-		public Boolean transform(Object value) {
-			return (value == null) ? null : Boolean.valueOf(value == this.buttonValue);
-		}
-
-		/**
-		 * if the new value is true, pass through the our button value;
-		 * otherwise pass through null
-		 */
-		public Object reverseTransform(Boolean value) {
-			return (value.booleanValue()) ? this.buttonValue : null;
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/SpinnerModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/SpinnerModelAdapter.java
deleted file mode 100644
index c26f18fc90..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/SpinnerModelAdapter.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value.swing;
-
-import javax.swing.AbstractSpinnerModel;
-import javax.swing.SpinnerModel;
-import javax.swing.SpinnerNumberModel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.model.listener.awt.AWTPropertyChangeListenerWrapper;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * This javax.swing.SpinnerModel can be used to keep a ChangeListener
- * (e.g. a JSpinner) in synch with a PropertyValueModel that holds a value.
- * 
- * Note: it is likely you want to use one of the following classes instead of
- * this one:
- *     DateSpinnerModelAdapter
- *     NumberSpinnerModelAdapter
- *     ListSpinnerModelAdapter
- * 
- * NB: This model should only be used for values that have a fairly
- * inexpensive #equals() implementation.
- * @see #synchronizeDelegate(Object)
- */
-public class SpinnerModelAdapter
-	extends AbstractSpinnerModel
-{
-	/** The delegate spinner model whose behavior we "enhance". */
-	protected final SpinnerModel delegate;
-
-	/** A listener that allows us to forward any changes made to the delegate spinner model. */
-	protected final ChangeListener delegateListener;
-
-	/** A value model on the underlying value. */
-	protected final WritablePropertyValueModel<Object> valueHolder;
-
-	/** A listener that allows us to synchronize with changes made to the underlying value. */
-	protected final PropertyChangeListener valueListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Constructor - the value holder and delegate are required.
-	 */
-	public SpinnerModelAdapter(WritablePropertyValueModel<Object> valueHolder, SpinnerModel delegate) {
-		super();
-		if (valueHolder == null || delegate == null) {
-			throw new NullPointerException();
-		}
-		this.valueHolder = valueHolder;
-		this.delegate = delegate;
-		// postpone listening to the underlying value
-		// until we have listeners ourselves...
-		this.valueListener = this.buildValueListener();
-		this.delegateListener = this.buildDelegateListener();
-	}
-
-	/**
-	 * Constructor - the value holder is required.
-	 * This will wrap a simple number spinner model.
-	 */
-	public SpinnerModelAdapter(WritablePropertyValueModel<Object> valueHolder) {
-		this(valueHolder, new SpinnerNumberModel());
-	}
-
-
-	// ********** initialization **********
-
-	protected PropertyChangeListener buildValueListener() {
-		return new AWTPropertyChangeListenerWrapper(this.buildValueListener_());
-	}
-
-	protected PropertyChangeListener buildValueListener_() {
-		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent event) {
-				SpinnerModelAdapter.this.valueChanged(event);
-			}
-			@Override
-			public String toString() {
-				return "value listener";
-			}
-		};
-	}
-
-	/**
-	 * expand access a bit for inner class
-	 */
-	@Override
-	protected void fireStateChanged() {
-		super.fireStateChanged();
-	}
-
-	protected ChangeListener buildDelegateListener() {
-		return new ChangeListener() {
-			public void stateChanged(ChangeEvent event) {
-				// forward the event, with this as the source
-				SpinnerModelAdapter.this.fireStateChanged();
-			}
-			@Override
-			public String toString() {
-				return "delegate listener";
-			}
-		};
-	}
-
-
-	// ********** SpinnerModel implementation **********
-
-	public Object getValue() {
-		return this.delegate.getValue();
-	}
-
-	/**
-	 * Extend to update the underlying value directly.
-	 * The resulting event will be ignored: @see #synchronizeDelegate(Object).
-	 */
-	public void setValue(Object value) {
-		this.delegate.setValue(value);
-		this.valueHolder.setValue(value);
-	}
-
-	public Object getNextValue() {
-		return this.delegate.getNextValue();
-	}
-
-	public Object getPreviousValue() {
-		return this.delegate.getPreviousValue();
-	}
-
-	/**
-	 * Extend to start listening to the underlying value if necessary.
-	 */
-    @Override
-	public void addChangeListener(ChangeListener listener) {
-		if (this.listenerList.getListenerCount(ChangeListener.class) == 0) {
-			this.delegate.addChangeListener(this.delegateListener);
-			this.engageValueHolder();
-		}
-		super.addChangeListener(listener);
-	}
-
-	/**
-	 * Extend to stop listening to the underlying value if appropriate.
-	 */
-    @Override
-	public void removeChangeListener(ChangeListener listener) {
-		super.removeChangeListener(listener);
-		if (this.listenerList.getListenerCount(ChangeListener.class) == 0) {
-			this.disengageValueHolder();
-			this.delegate.removeChangeListener(this.delegateListener);
-		}
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * A third party has modified the underlying value.
-	 * Synchronize the delegate model accordingly.
-	 */
-	protected void valueChanged(PropertyChangeEvent event) {
-		this.synchronizeDelegate(event.getNewValue());
-	}
-
-	/**
-	 * Set the delegate's value if it has changed.
-	 */
-	protected void synchronizeDelegate(Object value) {
-		// check to see whether the delegate has already been synchronized
-		// (via #setValue())
-		if ( ! this.delegate.getValue().equals(value)) {
-			this.delegate.setValue(value);
-		}
-	}
-
-	protected void engageValueHolder() {
-		this.valueHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.valueListener);
-		this.synchronizeDelegate(this.valueHolder.getValue());
-	}
-
-	protected void disengageValueHolder() {
-		this.valueHolder.removePropertyChangeListener(PropertyValueModel.VALUE, this.valueListener);
-	}
-
-
-	// ********** standard methods **********
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.valueHolder);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/TableModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/TableModelAdapter.java
deleted file mode 100644
index 5e039e270b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/TableModelAdapter.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value.swing;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import javax.swing.event.TableModelListener;
-import javax.swing.table.AbstractTableModel;
-import org.eclipse.jpt.utility.internal.model.listener.awt.AWTListChangeListenerWrapper;
-import org.eclipse.jpt.utility.internal.model.listener.awt.AWTPropertyChangeListenerWrapper;
-import org.eclipse.jpt.utility.internal.model.value.CollectionListValueModelAdapter;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * This TableModel can be used to keep a TableModelListener (e.g. a JTable)
- * in synch with a ListValueModel that holds a collection of model objects,
- * each of which corresponds to a row in the table.
- * Typically, each column of the table will be bound to a different aspect
- * of the contained model objects.
- * 
- * For example, a MWTable has an attribute 'databaseFields' that holds
- * a collection of MWDatabaseFields that would correspond to the rows of
- * a JTable; and each MWDatabaseField has a number
- * of attributes (e.g. name, type, size) that can be bound to the columns of
- * a row in the JTable. As these database fields are added, removed, and
- * changed, this model will keep the listeners aware of the changes.
- * 
- * An instance of this TableModel must be supplied with a
- * list holder (e.g. the 'databaseFields'), which is a value
- * model on the bound collection This is required - the
- * collection itself can be null, but the list value model that
- * holds it is required. Typically this list will be sorted (@see
- * SortedListValueModelAdapter).
- * 
- * This TableModel must also be supplied with a ColumnAdapter that
- * will be used to configure the headers, renderers, editors, and contents
- * of the various columns.
- * 
- * Design decision:
- * Cell listener options (from low space/high time to high space/low time):
- * 	- 1 cell listener listening to every cell (this is the current implementation)
- * 	- 1 cell listener per row
- * 	- 1 cell listener per cell
- */
-public class TableModelAdapter<E>
-	extends AbstractTableModel
-{
-	/**
-	 * a list of user objects that are converted to
-	 * rows via the column adapter
-	 */
-	private ListValueModel<? extends E> listHolder;
-	private final ListChangeListener listChangeListener;
-
-	/**
-	 * each row is an array of cell models
-	 */
-	// declare as ArrayList so we can use #ensureCapacity(int)
-	private final ArrayList<WritablePropertyValueModel<Object>[]> rows;
-
-	/**
-	 * client-supplied adapter that provides with the various column
-	 * settings and converts the objects in the LVM
-	 * into an array of cell models
-	 */
-	private final ColumnAdapter columnAdapter;
-
-	/**
-	 * the single listener that listens to every cell's model
-	 */
-	private final PropertyChangeListener cellListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a table model adapter for the specified objects
-	 * and adapter.
-	 */
-	public TableModelAdapter(ListValueModel<? extends E> listHolder, ColumnAdapter columnAdapter) {
-		super();
-		if (listHolder == null) {
-			throw new NullPointerException();
-		}
-		this.listHolder = listHolder;
-		this.columnAdapter = columnAdapter;
-		this.listChangeListener = this.buildListChangeListener();
-		this.rows = new ArrayList<WritablePropertyValueModel<Object>[]>();
-		this.cellListener = this.buildCellListener();
-	}
-
-	/**
-	 * Construct a table model adapter for the specified objects
-	 * and adapter.
-	 */
-	public TableModelAdapter(CollectionValueModel<? extends E> collectionHolder, ColumnAdapter columnAdapter) {
-		this(new CollectionListValueModelAdapter<E>(collectionHolder), columnAdapter);
-	}
-
-
-	// ********** initialization **********
-
-	protected ListChangeListener buildListChangeListener() {
-		return new AWTListChangeListenerWrapper(this.buildListChangeListener_());
-	}
-
-	protected ListChangeListener buildListChangeListener_() {
-		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent event) {
-				TableModelAdapter.this.addRows(event.getIndex(), event.itemsSize(), this.items(event));
-			}
-			public void itemsRemoved(ListChangeEvent event) {
-				TableModelAdapter.this.removeRows(event.getIndex(), event.itemsSize());
-			}
-			public void itemsReplaced(ListChangeEvent event) {
-				TableModelAdapter.this.replaceRows(event.getIndex(), this.items(event));
-			}
-			public void itemsMoved(ListChangeEvent event) {
-				TableModelAdapter.this.moveRows(event.getTargetIndex(), event.getSourceIndex(), event.getMoveLength());
-			}
-			public void listCleared(ListChangeEvent event) {
-				TableModelAdapter.this.clearTable();
-			}
-			public void listChanged(ListChangeEvent event) {
-				TableModelAdapter.this.rebuildTable();
-			}
-			/**
-			 * minimize scope of suppressed warnings
-			 */
-			@SuppressWarnings("unchecked")
-			protected Iterator<Object> items(ListChangeEvent event) {
-				return (Iterator<Object>) event.items();
-			}
-			@Override
-			public String toString() {
-				return "list listener";
-			}
-		};
-	}
-
-
-	protected PropertyChangeListener buildCellListener() {
-		return new AWTPropertyChangeListenerWrapper(this.buildCellListener_());
-	}
-
-	protected PropertyChangeListener buildCellListener_() {
-		return new PropertyChangeListener() {
-			@SuppressWarnings("unchecked")
-			public void propertyChanged(PropertyChangeEvent event) {
-				TableModelAdapter.this.cellChanged((WritablePropertyValueModel<Object>) event.getSource());
-			}
-			@Override
-			public String toString() {
-				return "cell listener";
-			}
-		};
-	}
-
-
-	// ********** TableModel implementation **********
-
-	public int getColumnCount() {
-		return this.columnAdapter.columnCount();
-	}
-
-	public int getRowCount() {
-		return this.rows.size();
-	}
-
-    @Override
-	public String getColumnName(int column) {
-		return this.columnAdapter.columnName(column);
-	}
-
-    @Override
-	public Class<?> getColumnClass(int columnIndex) {
-		return this.columnAdapter.columnClass(columnIndex);
-	}
-
-    @Override
-	public boolean isCellEditable(int rowIndex, int columnIndex) {
-		return this.columnAdapter.columnIsEditable(columnIndex);
-	}
-
-	public Object getValueAt(int rowIndex, int columnIndex) {
-		WritablePropertyValueModel<Object>[] row = this.rows.get(rowIndex);
-		return row[columnIndex].getValue();
-	}
-
-	@Override
-	public void setValueAt(Object value, int rowIndex, int columnIndex) {
-		WritablePropertyValueModel<Object>[] row = this.rows.get(rowIndex);
-		row[columnIndex].setValue(value);
-	}
-
-	/**
-	 * Extend to start listening to the underlying model if necessary.
-	 */
-    @Override
-	public void addTableModelListener(TableModelListener l) {
-		if (this.hasNoTableModelListeners()) {
-			this.engageModel();
-		}
-		super.addTableModelListener(l);
-	}
-
-	/**
-	 * Extend to stop listening to the underlying model if necessary.
-	 */
-    @Override
-	public void removeTableModelListener(TableModelListener l) {
-		super.removeTableModelListener(l);
-		if (this.hasNoTableModelListeners()) {
-			this.disengageModel();
-		}
-	}
-
-
-	// ********** public API **********
-
-	/**
-	 * Return the underlying list model.
-	 */
-	public ListValueModel<? extends E> getModel() {
-		return this.listHolder;
-	}
-
-	/**
-	 * Set the underlying list model.
-	 */
-	public void setModel(ListValueModel<E> listHolder) {
-		if (listHolder == null) {
-			throw new NullPointerException();
-		}
-		boolean hasListeners = this.hasTableModelListeners();
-		if (hasListeners) {
-			this.disengageModel();
-		}
-		this.listHolder = listHolder;
-		if (hasListeners) {
-			this.engageModel();
-			this.fireTableDataChanged();
-		}
-	}
-
-	/**
-	 * Set the underlying collection model.
-	 */
-	public void setModel(CollectionValueModel<E> collectionHolder) {
-		this.setModel(new CollectionListValueModelAdapter<E>(collectionHolder));
-	}
-
-
-	// ********** queries **********
-
-	/**
-	 * Return whether this model has no listeners.
-	 */
-	protected boolean hasNoTableModelListeners() {
-		return this.listenerList.getListenerCount(TableModelListener.class) == 0;
-	}
-
-	/**
-	 * Return whether this model has any listeners.
-	 */
-	protected boolean hasTableModelListeners() {
-		return ! this.hasNoTableModelListeners();
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Start listening to the list of objects and the various aspects
-	 * of the objects that make up the rows.
-	 */
-	private void engageModel() {
-		this.listHolder.addListChangeListener(ListValueModel.LIST_VALUES, this.listChangeListener);
-		this.engageAllCells();
-	}
-
-	/**
-	 * Convert the objects into rows and listen to the cells.
-	 */
-	private void engageAllCells() {
-		this.rows.ensureCapacity(this.listHolder.size());
-		for (Iterator<? extends E> stream = this.listHolder.iterator(); stream.hasNext(); ) {
-			WritablePropertyValueModel<Object>[] row = this.columnAdapter.cellModels(stream.next());
-			this.engageRow(row);
-			this.rows.add(row);
-		}
-	}
-
-	/**
-	 * Listen to the cells in the specified row.
-	 */
-	private void engageRow(WritablePropertyValueModel<Object>[] row) {
-		for (int i = row.length; i-- > 0; ) {
-			row[i].addPropertyChangeListener(PropertyValueModel.VALUE, this.cellListener);
-		}
-	}
-
-	/**
-	 * Stop listening.
-	 */
-	private void disengageModel() {
-		this.disengageAllCells();
-		this.listHolder.removeListChangeListener(ListValueModel.LIST_VALUES, this.listChangeListener);
-	}
-
-	private void disengageAllCells() {
-		for (WritablePropertyValueModel<Object>[] row : this.rows) {
-			this.disengageRow(row);
-		}
-		this.rows.clear();
-	}
-
-	private void disengageRow(WritablePropertyValueModel<Object>[] row) {
-		for (int i = row.length; i-- > 0; ) {
-			row[i].removePropertyChangeListener(PropertyValueModel.VALUE, this.cellListener);
-		}
-	}
-
-	/**
-	 * brute-force search for the cell(s) that changed...
-	 */
-	void cellChanged(WritablePropertyValueModel<Object> cellHolder) {
-		for (int i = this.rows.size(); i-- > 0; ) {
-			WritablePropertyValueModel<Object>[] row = this.rows.get(i);
-			for (int j = row.length; j-- > 0; ) {
-				if (row[j] == cellHolder) {
-					this.fireTableCellUpdated(i, j);
-				}
-			}
-		}
-	}
-
-	/**
-	 * convert the items to rows
-	 */
-	void addRows(int index, int size, Iterator<Object> items) {
-		List<WritablePropertyValueModel<Object>[]> newRows = new ArrayList<WritablePropertyValueModel<Object>[]>(size);
-		while (items.hasNext()) {
-			WritablePropertyValueModel<Object>[] row = this.columnAdapter.cellModels(items.next());
-			this.engageRow(row);
-			newRows.add(row);
-		}
-		this.rows.addAll(index, newRows);
-		this.fireTableRowsInserted(index, index + size - 1);
-	}
-
-	void removeRows(int index, int size) {
-		for (int i = 0; i < size; i++) {
-			this.disengageRow(this.rows.remove(index));
-		}
-		this.fireTableRowsDeleted(index, index + size - 1);
-	}
-
-	void replaceRows(int index, Iterator<Object> items) {
-		int i = index;
-		while (items.hasNext()) {
-			WritablePropertyValueModel<Object>[] row = this.rows.get(i);
-			this.disengageRow(row);
-			row = this.columnAdapter.cellModels(items.next());
-			this.engageRow(row);
-			this.rows.set(i, row);
-			i++;
-		}
-		this.fireTableRowsUpdated(index, i - 1);
-	}
-
-	void moveRows(int targetIndex, int sourceIndex, int length) {
-		ArrayList<WritablePropertyValueModel<Object>[]> temp = new ArrayList<WritablePropertyValueModel<Object>[]>(length);
-		for (int i = 0; i < length; i++) {
-			temp.add(this.rows.remove(sourceIndex));
-		}
-		this.rows.addAll(targetIndex, temp);
-
-		int start = Math.min(targetIndex, sourceIndex);
-		int end = Math.max(targetIndex, sourceIndex) + length - 1;
-		this.fireTableRowsUpdated(start, end);
-	}
-
-	void clearTable() {
-		this.disengageAllCells();
-		this.fireTableDataChanged();
-	}
-
-	void rebuildTable() {
-		this.disengageAllCells();
-		this.engageAllCells();
-		this.fireTableDataChanged();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ToggleButtonModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ToggleButtonModelAdapter.java
deleted file mode 100644
index 7c0e742f33..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ToggleButtonModelAdapter.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value.swing;
-
-import java.awt.event.ActionListener;
-import java.awt.event.ItemListener;
-import javax.swing.JToggleButton.ToggleButtonModel;
-import javax.swing.event.ChangeListener;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.model.listener.awt.AWTPropertyChangeListenerWrapper;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
-
-/**
- * This javax.swing.ButtonModel can be used to keep a listener
- * (e.g. a JCheckBox or a JRadioButton) in synch with a PropertyValueModel
- * on a boolean.
- */
-public class ToggleButtonModelAdapter
-	extends ToggleButtonModel
-{
-	/**
-	 * The default setting for the toggle button; for when the underlying model is null.
-	 * The default [default value] is false (i.e. the toggle button is unchecked/empty).
-	 */
-	protected final boolean defaultValue;
-
-	/** A value model on the underlying model boolean. */
-	protected final WritablePropertyValueModel<Boolean> booleanHolder;
-
-	/**
-	 * A listener that allows us to synchronize with
-	 * changes made to the underlying model boolean.
-	 */
-	protected final PropertyChangeListener booleanChangeListener;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Constructor - the boolean holder is required.
-	 */
-	public ToggleButtonModelAdapter(WritablePropertyValueModel<Boolean> booleanHolder, boolean defaultValue) {
-		super();
-		if (booleanHolder == null) {
-			throw new NullPointerException();
-		}
-		this.booleanHolder = booleanHolder;
-		this.booleanChangeListener = this.buildBooleanChangeListener();
-		// postpone listening to the underlying model
-		// until we have listeners ourselves...
-		this.defaultValue = defaultValue;
-	}
-
-	/**
-	 * Constructor - the boolean holder is required.
-	 * The default value will be false.
-	 */
-	public ToggleButtonModelAdapter(WritablePropertyValueModel<Boolean> booleanHolder) {
-		this(booleanHolder, false);
-	}
-
-
-	// ********** initialization **********
-
-	protected PropertyChangeListener buildBooleanChangeListener() {
-		return new AWTPropertyChangeListenerWrapper(this.buildBooleanChangeListener_());
-	}
-
-	protected PropertyChangeListener buildBooleanChangeListener_() {
-		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent event) {
-				ToggleButtonModelAdapter.this.booleanChanged(event);
-			}
-		    @Override
-			public String toString() {
-				return "boolean listener";
-			}
-		};
-	}
-
-
-	// ********** ButtonModel implementation **********
-
-	/**
-	 * Extend to update the underlying model if necessary.
-	 */
-    @Override
-	public void setSelected(boolean b) {
-		if (this.isSelected() != b) {	// stop the recursion!
-			super.setSelected(b);//put the super call first, otherwise the following gets called twice
-			this.booleanHolder.setValue(Boolean.valueOf(b));
-		}
-	}
-
-	/**
-	 * Extend to start listening to the underlying model if necessary.
-	 */
-    @Override
-	public void addActionListener(ActionListener l) {
-		if (this.hasNoListeners()) {
-			this.engageModel();
-		}
-		super.addActionListener(l);
-	}
-
-	/**
-	 * Extend to stop listening to the underlying model if appropriate.
-	 */
-    @Override
-	public void removeActionListener(ActionListener l) {
-		super.removeActionListener(l);
-		if (this.hasNoListeners()) {
-			this.disengageModel();
-		}
-	}
-
-	/**
-	 * Extend to start listening to the underlying model if necessary.
-	 */
-    @Override
-	public void addItemListener(ItemListener l) {
-		if (this.hasNoListeners()) {
-			this.engageModel();
-		}
-		super.addItemListener(l);
-	}
-
-	/**
-	 * Extend to stop listening to the underlying model if appropriate.
-	 */
-    @Override
-	public void removeItemListener(ItemListener l) {
-		super.removeItemListener(l);
-		if (this.hasNoListeners()) {
-			this.disengageModel();
-		}
-	}
-
-	/**
-	 * Extend to start listening to the underlying model if necessary.
-	 */
-    @Override
-	public void addChangeListener(ChangeListener l) {
-		if (this.hasNoListeners()) {
-			this.engageModel();
-		}
-		super.addChangeListener(l);
-	}
-
-	/**
-	 * Extend to stop listening to the underlying model if appropriate.
-	 */
-    @Override
-	public void removeChangeListener(ChangeListener l) {
-		super.removeChangeListener(l);
-		if (this.hasNoListeners()) {
-			this.disengageModel();
-		}
-	}
-
-
-	// ********** queries **********
-
-	/**
-	 * Return whether we have no listeners at all.
-	 */
-	protected boolean hasNoListeners() {
-		return this.listenerList.getListenerCount() == 0;
-	}
-
-	protected boolean getDefaultValue() {
-		return this.defaultValue;
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Synchronize with the specified value.
-	 * If it is null, use the default value (which is typically false).
-	 */
-	protected void setSelected(Boolean value) {
-		if (value == null) {
-			this.setSelected(this.getDefaultValue());
-		} else {
-			this.setSelected(value.booleanValue());
-		}
-	}
-
-	/**
-	 * The underlying model has changed - synchronize accordingly.
-	 */
-	protected void booleanChanged(PropertyChangeEvent event) {
-		this.setSelected((Boolean) event.getNewValue());
-	}
-
-	protected void engageModel() {
-		this.booleanHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.booleanChangeListener);
-		this.setSelected(this.booleanHolder.getValue());
-	}
-
-	protected void disengageModel() {
-		this.booleanHolder.removePropertyChangeListener(PropertyValueModel.VALUE, this.booleanChangeListener);
-	}
-
-
-	// ********** standard methods **********
-
-    @Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.booleanHolder);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/TreeModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/TreeModelAdapter.java
deleted file mode 100644
index f94a723025..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/TreeModelAdapter.java
+++ /dev/null
@@ -1,722 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.model.value.swing;
-
-import java.util.ArrayList;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.List;
-import javax.swing.event.TreeModelListener;
-import javax.swing.tree.TreePath;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.model.listener.awt.AWTListChangeListenerWrapper;
-import org.eclipse.jpt.utility.internal.model.listener.awt.AWTPropertyChangeListenerWrapper;
-import org.eclipse.jpt.utility.internal.model.listener.awt.AWTStateChangeListenerWrapper;
-import org.eclipse.jpt.utility.internal.model.value.StaticPropertyValueModel;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.event.StateChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.listener.StateChangeListener;
-import org.eclipse.jpt.utility.model.value.ListValueModel;
-import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.utility.model.value.TreeNodeValueModel;
-
-/**
- * This javax.swing.tree.TreeModel can be used to keep a TreeModelListener
- * (e.g. a JTree) in synch with a tree of TreeNodeValueModel objects. Unlike
- * javax.swing.tree.DefaultTreeModel, you do not add and remove nodes with
- * methods implemented here. You can add and remove nodes by adding and
- * removing them directly to/from the nodes (or, more typically, the domain
- * objects the nodes are wrapping and listening to).
- * 
- * Due to limitations in JTree, the root of the tree can never be null,
- * which, typically, should not be a problem. (If you want to display an empty
- * tree you can set the JTree's treeModel to null.)
- */
-public class TreeModelAdapter<T>
-	extends AbstractTreeModel
-{
-	/**
-	 * A value model on the underlying tree's root node and its
-	 * corresponding listener. This allows clients to swap out
-	 * the entire tree. Due to limitations in JTree, the root should
-	 * never be set to null while we have listeners.
-	 */
-	private final PropertyValueModel<TreeNodeValueModel<T>> rootHolder;
-	private final PropertyChangeListener rootListener;
-
-	/**
-	 * A listener that notifies us when a node's internal
-	 * "state" changes (as opposed to the node's value or list of
-	 * children), allowing us to forward notification to our listeners.
-	 */
-	private final StateChangeListener nodeStateListener;
-
-	/**
-	 * A listener that notifies us when a node's "value"
-	 * changes (as opposed to the node's state or list of
-	 * children), allowing us to forward notification to our listeners.
-	 * Typically, this will only happen with nodes that hold
-	 * primitive data.
-	 */
-	private final PropertyChangeListener nodeValueListener;
-
-	/**
-	 * A listener that notifies us when an underlying node's
-	 * "list" of children changes, allowing us to keep our
-	 * internal tree in synch with the underlying tree model.
-	 */
-	private final ListChangeListener childrenListener;
-
-	/* these attributes make up our internal tree */
-	/**
-	 * The root cannot be null while we have listeners, which is
-	 * most of the time. The root is cached so we can disengage
-	 * from it when it has been swapped out.
-	 */
-	private TreeNodeValueModel<T> root;
-
-	/**
-	 * Map the nodes to their lists of children.
-	 * We cache these so we can swap out the entire list of children
-	 * when we receive a #listChanged() event (which does not include
-	 * the items that were affected).
-	 * @see EventChangePolicy#rebuildChildren()
-	 */
-	final IdentityHashMap<TreeNodeValueModel<T>, List<TreeNodeValueModel<T>>> childrenLists;
-
-	/**
-	 * Map the children models to their parents.
-	 * We cache these so we can figure out the "real" source of the
-	 * list change events (the parent).
-	 * @see EventChangePolicy#parent()
-	 */
-	final IdentityHashMap<ListValueModel<TreeNodeValueModel<T>>, TreeNodeValueModel<T>> parents;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a tree model for the specified root.
-	 */
-	public TreeModelAdapter(PropertyValueModel<TreeNodeValueModel<T>> rootHolder) {
-		super();
-		if (rootHolder == null) {
-			throw new NullPointerException();
-		}
-		this.rootHolder = rootHolder;
-		this.rootListener = this.buildRootListener();
-		this.nodeStateListener = this.buildNodeStateListener();
-		this.nodeValueListener = this.buildNodeValueListener();
-		this.childrenListener = this.buildChildrenListener();
-		this.childrenLists = new IdentityHashMap<TreeNodeValueModel<T>, List<TreeNodeValueModel<T>>>();
-		this.parents = new IdentityHashMap<ListValueModel<TreeNodeValueModel<T>>, TreeNodeValueModel<T>>();
-	}
-
-	/**
-	 * Construct a tree model for the specified root.
-	 */
-	public TreeModelAdapter(TreeNodeValueModel<T> root) {
-		this(new StaticPropertyValueModel<TreeNodeValueModel<T>>(root));
-	}
-
-
-	// ********** initialization **********
-
-	protected PropertyChangeListener buildRootListener() {
-		return new AWTPropertyChangeListenerWrapper(this.buildRootListener_());
-	}
-
-	protected PropertyChangeListener buildRootListener_() {
-		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent event) {
-				TreeModelAdapter.this.rootChanged();
-			}
-			@Override
-			public String toString() {
-				return "root listener";
-			}
-		};
-	}
-
-	protected PropertyChangeListener buildNodeValueListener() {
-		return new AWTPropertyChangeListenerWrapper(this.buildNodeValueListener_());
-	}
-
-	protected PropertyChangeListener buildNodeValueListener_() {
-		return new PropertyChangeListener() {
-			@SuppressWarnings("unchecked")
-			public void propertyChanged(PropertyChangeEvent event) {
-				TreeModelAdapter.this.nodeChanged((TreeNodeValueModel<T>) event.getSource());
-			}
-			@Override
-			public String toString() {
-				return "node value listener";
-			}
-		};
-	}
-
-	protected StateChangeListener buildNodeStateListener() {
-		return new AWTStateChangeListenerWrapper(this.buildNodeStateListener_());
-	}
-
-	protected StateChangeListener buildNodeStateListener_() {
-		return new StateChangeListener() {
-			@SuppressWarnings("unchecked")
-			public void stateChanged(StateChangeEvent event) {
-				TreeModelAdapter.this.nodeChanged((TreeNodeValueModel<T>) event.getSource());
-			}
-			@Override
-			public String toString() {
-				return "node state listener";
-			}
-		};
-	}
-
-	protected ListChangeListener buildChildrenListener() {
-		return new AWTListChangeListenerWrapper(this.buildChildrenListener_());
-	}
-
-	protected ListChangeListener buildChildrenListener_() {
-		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent event) {
-				new EventChangePolicy(event).addChildren();
-			}
-			public void itemsRemoved(ListChangeEvent event) {
-				new EventChangePolicy(event).removeChildren();
-			}
-			public void itemsReplaced(ListChangeEvent event) {
-				new EventChangePolicy(event).replaceChildren();
-			}
-			public void itemsMoved(ListChangeEvent event) {
-				new EventChangePolicy(event).moveChildren();
-			}
-			public void listCleared(ListChangeEvent event) {
-				new EventChangePolicy(event).clearChildren();
-			}
-			public void listChanged(ListChangeEvent event) {
-				new EventChangePolicy(event).rebuildChildren();
-			}
-			@Override
-			public String toString() {
-				return "children listener";
-			}
-		};
-	}
-
-
-	// ********** TreeModel implementation **********
-
-	public Object getRoot() {
-		return this.root;
-	}
-
-	@SuppressWarnings("unchecked")
-	public Object getChild(Object parent, int index) {
-		return ((TreeNodeValueModel<T>) parent).child(index);
-	}
-
-	@SuppressWarnings("unchecked")
-	public int getChildCount(Object parent) {
-		return ((TreeNodeValueModel<T>) parent).childrenSize();
-	}
-
-	@SuppressWarnings("unchecked")
-	public boolean isLeaf(Object node) {
-		return ((TreeNodeValueModel<T>) node).isLeaf();
-	}
-
-	@SuppressWarnings("unchecked")
-	public void valueForPathChanged(TreePath path, Object newValue) {
-		((TreeNodeValueModel<T>) path.getLastPathComponent()).setValue((T) newValue);
-	}
-
-	@SuppressWarnings("unchecked")
-	public int getIndexOfChild(Object parent, Object child) {
-		return ((TreeNodeValueModel<T>) parent).indexOfChild((TreeNodeValueModel<T>) child);
-	}
-
-	/**
-	 * Extend to start listening to the underlying model if necessary.
-	 */
-    @Override
-	public void addTreeModelListener(TreeModelListener l) {
-		if (this.hasNoTreeModelListeners()) {
-			this.engageModel();
-		}
-		super.addTreeModelListener(l);
-	}
-
-	/**
-	 * Extend to stop listening to the underlying model if appropriate.
-	 */
-    @Override
-	public void removeTreeModelListener(TreeModelListener l) {
-		super.removeTreeModelListener(l);
-		if (this.hasNoTreeModelListeners()) {
-			this.disengageModel();
-		}
-	}
-
-
-	// ********** behavior **********
-
-	/**
-	 * Listen to the root and all the other nodes
-	 * in the underlying tree model.
-	 */
-	private void engageModel() {
-		this.rootHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.rootListener);
-		this.root = this.rootHolder.getValue();
-		if (this.root == null) {
-			throw new NullPointerException();	// the root cannot be null while we have listeners
-		}
-		this.engageNode(this.root);
-		this.addRoot();
-	}
-
-	/**
-	 * Add the root and all of the nodes to the underlying tree.
-	 */
-	private void addRoot() {
-		this.addNode(0, this.root);
-	}
-
-	/**
-	 * Stop listening to the root and all the other
-	 * nodes in the underlying tree model.
-	 */
-	private void disengageModel() {
-		this.removeRoot();
-		this.disengageNode(this.root);
-		this.root = null;
-		this.rootHolder.removePropertyChangeListener(PropertyValueModel.VALUE, this.rootListener);
-	}
-
-	/**
-	 * Remove the root and all of the nodes from the underlying tree.
-	 */
-	private void removeRoot() {
-		this.removeNode(0, this.root);
-	}
-
-	/**
-	 * The root has been swapped.
-	 * This method is a bit gnarly because the API for notifying listeners
-	 * that the root has changed is a bit inconsistent with that used for
-	 * non-root nodes.
-	 */
-	void rootChanged() {
-		TreeNodeValueModel<T> newRoot = this.rootHolder.getValue();
-		if (newRoot == null) {
-			throw new NullPointerException();	// the root cannot be null while we have listeners
-		}
-		// remove all the current root's children from the tree
-		// and remove the it from the internal tree
-		this.removeRoot(); 
-
-		// save the old root and swap in the new root
-		TreeNodeValueModel<T> oldRoot = this.root;
-		this.root = newRoot;
-
-		// we must be listening to both the old and new roots when we fire the event
-		// because their values can be affected by whether they have listeners
-		this.engageNode(this.root);
-		this.fireTreeRootReplaced(this.root);
-		// now we can stop listening to the old root
-		this.disengageNode(oldRoot);
-
-		// add the new root to the internal tree and
-		// add all its children to the tree also
-		this.addRoot();
-	}
-
-	/**
-	 * Either the "value" or the "state" of the specified node has changed,
-	 * forward notification to our listeners.
-	 */
-	void nodeChanged(TreeNodeValueModel<T> node) {
-		TreeNodeValueModel<T> parent = node.parent();
-		if (parent == null) {
-			this.fireTreeRootChanged(node);
-		} else {
-			this.fireTreeNodeChanged(parent.path(), parent.indexOfChild(node), node);
-		}
-	}
-
-	/**
-	 * Listen to the nodes, notify our listeners that the nodes were added,
-	 * and then add the nodes to our internal tree.
-	 * We must listen to the nodes before notifying anybody, because
-	 * adding a listener can change the value of a node.
-	 */
-	void addChildren(TreeNodeValueModel<T>[] path, int[] childIndices, TreeNodeValueModel<T>[] children) {
-		int len = childIndices.length;
-		for (int i = 0; i < len; i++) {
-			this.engageNode(children[i]);
-		}
-		this.fireTreeNodesInserted(path, childIndices, children);
-		for (int i = 0; i < len; i++) {
-			this.addNode(childIndices[i], children[i]);
-		}
-	}
-
-	/**
-	 * Listen to the node and its children model.
-	 */
-	private void engageNode(TreeNodeValueModel<T> node) {
-		node.addStateChangeListener(this.nodeStateListener);
-		node.addPropertyChangeListener(PropertyValueModel.VALUE, this.nodeValueListener);
-		node.childrenModel().addListChangeListener(ListValueModel.LIST_VALUES, this.childrenListener);
-	}
-
-	/**
-	 * Add the node to our internal tree;
-	 * then recurse down through the node's children,
-	 * adding them to the internal tree also.
-	 */
-	private void addNode(int index, TreeNodeValueModel<T> node) {
-		this.addNodeToInternalTree(node.parent(), index, node, node.childrenModel());
-		new NodeChangePolicy(node).addChildren();
-	}
-
-	/**
-	 * Add the specified node to our internal tree.
-	 */
-	private void addNodeToInternalTree(TreeNodeValueModel<T> parent, int index, TreeNodeValueModel<T> node, ListValueModel<TreeNodeValueModel<T>> childrenModel) {
-		List<TreeNodeValueModel<T>> siblings = this.childrenLists.get(parent);
-		if (siblings == null) {
-			siblings = new ArrayList<TreeNodeValueModel<T>>();
-			this.childrenLists.put(parent, siblings);
-		}
-		siblings.add(index, node);
-
-		this.parents.put(childrenModel, node);
-	}
-
-	/**
-	 * Remove nodes from our internal tree, notify our listeners that the
-	 * nodes were removed, then stop listening to the nodes.
-	 * We must listen to the nodes until after notifying anybody, because
-	 * removing a listener can change the value of a node.
-	 */
-	void removeChildren(TreeNodeValueModel<T>[] path, int[] childIndices, TreeNodeValueModel<T>[] children) {
-		int len = childIndices.length;
-		for (int i = 0; i < len; i++) {
-			// the indices slide down a notch each time we remove a child
-			this.removeNode(childIndices[i] - i, children[i]);
-		}
-		this.fireTreeNodesRemoved(path, childIndices, children);
-		for (int i = 0; i < len; i++) {
-			this.disengageNode(children[i]);
-		}
-	}
-
-	/**
-	 * First, recurse down through the node's children,
-	 * removing them from our internal tree;
-	 * then remove the node itself from our internal tree.
-	 */
-	private void removeNode(int index, TreeNodeValueModel<T> node) {
-		new NodeChangePolicy(node).removeChildren();
-		this.removeNodeFromInternalTree(node.parent(), index, node, node.childrenModel());
-	}
-
-	/**
-	 * Remove the specified node from our internal tree.
-	 */
-	private void removeNodeFromInternalTree(TreeNodeValueModel<T> parent, int index, TreeNodeValueModel<T> node, ListValueModel<TreeNodeValueModel<T>> childrenModel) {
-		this.parents.remove(childrenModel);
-
-		List<TreeNodeValueModel<T>> siblings = this.childrenLists.get(parent);
-		siblings.remove(index);
-		if (siblings.isEmpty()) {
-			this.childrenLists.remove(parent);
-		}
-	}
-
-	/**
-	 * Stop listening to the node and its children model.
-	 */
-	private void disengageNode(TreeNodeValueModel<T> node) {
-		node.childrenModel().removeListChangeListener(ListValueModel.LIST_VALUES, this.childrenListener);
-		node.removePropertyChangeListener(PropertyValueModel.VALUE, this.nodeValueListener);
-		node.removeStateChangeListener(this.nodeStateListener);
-	}
-
-	void moveChildren(TreeNodeValueModel<T> parent, int targetIndex, int sourceIndex, int length) {
-		List<TreeNodeValueModel<T>> childrenList = this.childrenLists.get(parent);
-		ArrayList<TreeNodeValueModel<T>> temp = new ArrayList<TreeNodeValueModel<T>>(length);
-		for (int i = 0; i < length; i++) {
-			temp.add(childrenList.remove(sourceIndex));
-		}
-		childrenList.addAll(targetIndex, temp);
-
-		this.fireTreeStructureChanged(parent.path());
-	}
-
-
-	// ********** standard methods **********
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.root);
-	}
-
-
-	// ********** inner classes **********
-
-	/**
-	 * Coalesce some of the common change policy behavior.
-	 */
-	private abstract class ChangePolicy {
-
-		ChangePolicy() {
-			super();
-		}
-
-		/**
-		 * Add the current set of children.
-		 */
-		void addChildren() {
-			TreeModelAdapter.this.addChildren(this.parent().path(), this.childIndices(), this.childArray());
-		}
-
-		/**
-		 * Remove the current set of children.
-		 */
-		void removeChildren() {
-			TreeModelAdapter.this.removeChildren(this.parent().path(), this.childIndices(), this.childArray());
-		}
-
-		/**
-		 * Return an array of the indices of the current set of children,
-		 * which should be contiguous.
-		 */
-		int[] childIndices() {
-			return this.buildIndices(this.childrenStartIndex(), this.childrenSize());
-		}
-
-		/**
-		 * Return an array of the current set of children.
-		 */
-		TreeNodeValueModel<T>[] childArray() {
-			return this.buildArray(this.children(), this.childrenSize());
-		}
-
-		/**
-		 * Build an array to hold the elements in the specified iterator.
-		 * If they are different sizes, something is screwed up...
-		 */
-		TreeNodeValueModel<T>[] buildArray(Iterator<TreeNodeValueModel<T>> stream, int size) {
-			@SuppressWarnings("unchecked")
-			TreeNodeValueModel<T>[] array = new TreeNodeValueModel[size];
-			for (int i = 0; stream.hasNext(); i++) {
-				array[i] = stream.next();
-			}
-			return array;
-		}
-
-		/**
-		 * Return a set of indices, starting at zero and
-		 * continuing for the specified size.
-		 */
-		int[] buildIndices(int size) {
-			return buildIndices(0, size);
-		}
-
-		/**
-		 * Return a set of indices, starting at the specified index and
-		 * continuing for the specified size.
-		 */
-		int[] buildIndices(int start, int size) {
-			int[] indices = new int[size];
-			int index = start;
-			for (int i = 0; i < size; i++) {
-				indices[i] = index++;
-			}
-			return indices;
-		}
-
-		/**
-		 * Return the parent of the current set of children.
-		 */
-		abstract TreeNodeValueModel<T> parent();
-
-		/**
-		 * Return the starting index for the current set of children.
-		 */
-		abstract int childrenStartIndex();
-
-		/**
-		 * Return the size of the current set of children.
-		 */
-		abstract int childrenSize();
-
-		/**
-		 * Return an interator on the current set of children.
-		 */
-		abstract Iterator<TreeNodeValueModel<T>> children();
-
-	}
-
-
-	/**
-	 * Wraps a ListChangeEvent for adding, removing, replacing,
-	 * and changing children.
-	 */
-	private class EventChangePolicy extends ChangePolicy {
-		private ListChangeEvent event;
-
-		EventChangePolicy(ListChangeEvent event) {
-			this.event = event;
-		}
-
-		/**
-		 * Map the ListChangeEvent's source to the corresponding parent.
-		 */
-		@Override
-		TreeNodeValueModel<T> parent() {
-			return TreeModelAdapter.this.parents.get(this.event.getSource());
-		}
-
-		/**
-		 * The ListChangeEvent's item index is the children start index.
-		 */
-		@Override
-		int childrenStartIndex() {
-			return this.event.getIndex();
-		}
-
-		/**
-		 * The ListChangeEvent's size is the children size.
-		 */
-		@Override
-		int childrenSize() {
-			return this.event.itemsSize();
-		}
-
-		/**
-		 * The ListChangeEvent's items are the children.
-		 */
-		@Override
-		@SuppressWarnings("unchecked")
-		Iterator<TreeNodeValueModel<T>> children() {
-			return (Iterator<TreeNodeValueModel<T>>) this.event.items();
-		}
-
-		/**
-		 * Remove the old nodes and add the new ones.
-		 */
-		void replaceChildren() {
-			TreeNodeValueModel<T>[] parentPath = this.parent().path();
-			int[] childIndices = this.childIndices();
-			TreeModelAdapter.this.removeChildren(parentPath, childIndices, this.replacedChildren());
-			TreeModelAdapter.this.addChildren(parentPath, childIndices, this.childArray());
-		}
-
-		/**
-		 * Remove the old nodes and add the new ones.
-		 */
-		void moveChildren() {
-			TreeModelAdapter.this.moveChildren(this.parent(), this.event.getTargetIndex(), this.event.getSourceIndex(), this.event.getMoveLength());
-		}
-
-		/**
-		 * Clear all the nodes.
-		 */
-		void clearChildren() {
-			TreeNodeValueModel<T> parent = this.parent();
-			TreeNodeValueModel<T>[] parentPath = parent.path();
-			List<TreeNodeValueModel<T>> childrenList = TreeModelAdapter.this.childrenLists.get(parent);
-			int[] childIndices = this.buildIndices(childrenList.size());
-			TreeNodeValueModel<T>[] childArray = this.buildArray(childrenList.iterator(), childrenList.size());
-			TreeModelAdapter.this.removeChildren(parentPath, childIndices, childArray);
-		}
-
-		/**
-		 * Remove all the old nodes and add all the new nodes.
-		 */
-		void rebuildChildren() {
-			TreeNodeValueModel<T> parent = this.parent();
-			TreeNodeValueModel<T>[] parentPath = parent.path();
-			List<TreeNodeValueModel<T>> childrenList = TreeModelAdapter.this.childrenLists.get(parent);
-			int[] childIndices = this.buildIndices(childrenList.size());
-			TreeNodeValueModel<T>[] childArray = this.buildArray(childrenList.iterator(), childrenList.size());
-			TreeModelAdapter.this.removeChildren(parentPath, childIndices, childArray);
-
-			childIndices = this.buildIndices(parent.childrenModel().size());
-			childArray = this.buildArray(parent.childrenModel().iterator(), parent.childrenSize());
-			TreeModelAdapter.this.addChildren(parentPath, childIndices, childArray);
-		}
-
-		/**
-		 * The ListChangeEvent's replaced items are the replaced children.
-		 */
-		@SuppressWarnings("unchecked")
-		TreeNodeValueModel<T>[] replacedChildren() {
-			return this.buildArray((Iterator<TreeNodeValueModel<T>>) this.event.replacedItems(), this.event.itemsSize());
-		}
-
-	}
-
-
-	/**
-	 * Wraps a TreeNodeValueModel for adding and removing its children.
-	 */
-	private class NodeChangePolicy extends ChangePolicy {
-		private TreeNodeValueModel<T> node;
-
-		NodeChangePolicy(TreeNodeValueModel<T> node) {
-			this.node = node;
-		}
-
-		/**
-		 * The node itself is the parent.
-		 */
-		@Override
-		TreeNodeValueModel<T> parent() {
-			return this.node;
-		}
-
-		/**
-		 * Since we will always be dealing with all of the node's
-		 * children, the children start index is always zero.
-		 */
-		@Override
-		int childrenStartIndex() {
-			return 0;
-		}
-
-		/**
-		 * Since we will always be dealing with all of the node's
-		 * children, the children size is always equal to the size
-		 * of the children model.
-		 */
-		@Override
-		int childrenSize() {
-			return this.node.childrenModel().size();
-		}
-
-		/**
-		 * Since we will always be dealing with all of the node's
-		 * children, the children are all the objects held by
-		 * the children model.
-		 */
-		@Override
-		Iterator<TreeNodeValueModel<T>> children() {
-			return this.node.childrenModel().iterator();
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/AbstractNode.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/AbstractNode.java
deleted file mode 100644
index 4a84e1856e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/AbstractNode.java
+++ /dev/null
@@ -1,948 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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.utility.internal.node;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Set;
-import java.util.Vector;
-
-import org.eclipse.jpt.utility.internal.iterators.CloneIterator;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.internal.model.CallbackChangeSupport;
-import org.eclipse.jpt.utility.internal.model.ChangeSupport;
-
-/**
- * Base class for Node classes.
- * Provides support for the following:
- *     initialization
- *     enforced object identity wrt #equals()/#hashCode()
- *     containment hierarchy (parent/child)
- *     user comment
- *     dirty flag
- *     problems
- *     sorting
- * 
- * Typically, subclasses should consider implementing the following methods:
- *     the appropriate constructors
- *         (with the appropriately-restrictive type declaration for parent)
- *     #initialize()
- *     #initialize(Node parentNode)
- *     #checkParent(Node parentNode)
- *     #addChildrenTo(List list)
- *     #nodeRemoved(Node)
- *     #validator()
- *     #transientAspectNames() or
- *         #addTransientAspectNamesTo(Set transientAspectNames)
- *     #addProblemsTo(List currentProblems)
- *     #nonValidatedAspectNames()
- *         #addNonValidatedAspectNamesTo(Set nonValidatedAspectNames)
- *     #displayString()
- *     #toString(StringBuilder sb)
- */
-public abstract class AbstractNode 
-	extends AbstractModel
-	implements Node
-{
-
-	/** Containment hierarchy. */
-	private Node parent;  // pseudo-final
-
-	/** Track whether the node has changed. */
-	private volatile boolean dirty;
-	private volatile boolean dirtyBranch;
-
-	/**
-	 * The node's problems, as calculated during validation.
-	 * This list should only be modified via a ProblemSynchronizer,
-	 * allowing for asynchronous modification from another thread.
-	 */
-	private Vector<Problem> problems;		// pseudo-final
-		private static final Object[] EMPTY_PROBLEM_MESSAGE_ARGUMENTS = new Object[0];
-
-	/**
-	 * Cache the node's "branch" problems, as calculated during validation.
-	 * This list should only be modified via a ProblemSynchronizer,
-	 * allowing for asynchronous modification from another thread.
-	 * This must be recalculated every time this node or one of its
-	 * descendants changes it problems.
-	 */
-	private Vector<Problem> branchProblems;		// pseudo-final
-
-	/** User comment. */
-	private volatile String comment;
-
-
-	// ********** static fields **********
-
-	/**
-	 * Sets of transient aspect names, keyed by class.
-	 * This is built up lazily, as the objects are modified.
-	 */
-	private static final HashMap<Class<? extends AbstractNode>, HashSet<String>> transientAspectNameSets = new HashMap<Class<? extends AbstractNode>, HashSet<String>>();
-
-	/**
-	 * Sets of non-validated aspect names, keyed by class.
-	 * This is built up lazily, as the objects are modified.
-	 */
-	private static final HashMap<Class<? extends AbstractNode>, HashSet<String>> nonValidatedAspectNameSets = new HashMap<Class<? extends AbstractNode>, HashSet<String>>();
-
-
-	// ********** constructors **********
-
-	/**
-	 * Most objects must have a parent.
-	 * Use this constructor to create a new node.
-	 * @see #initialize(Node)
-	 */
-	protected AbstractNode(Node parent) {
-		super();
-		this.initialize();
-		this.initialize(parent);
-	}
-
-
-	// ********** initialization **********
-
-	/**
-	 * Initialize a newly-created instance.
-	 * @see #initialize(Node)
-	 */
-	protected void initialize() {
-		this.comment = ""; //$NON-NLS-1$
-
-		// a new object is dirty, by definition
-		this.dirty = true;
-		this.dirtyBranch = true;
-
-		this.problems = new Vector<Problem>();
-		this.branchProblems = new Vector<Problem>();
-
-	// when you override this method, don't forget to include:
-	//	super.initialize();
-	}
-
-	/**
-	 * Initialize a newly-created instance.
-	 * @see #initialize()
-	 */
-	protected void initialize(Node parentNode) {
-		this.checkParent(parentNode);
-		this.parent = parentNode;
-	// when you override this method, don't forget to include:
-	//	super.initialize(parentNode);
-	}
-
-	@Override
-	protected ChangeSupport buildChangeSupport() {
-		return new CallbackChangeSupport(this, this.buildChangeSupportListener());
-	}
-
-	protected CallbackChangeSupport.Listener buildChangeSupportListener() {
-		return new CallbackChangeSupport.Listener() {
-			public void aspectChanged(String aspectName) {
-				AbstractNode.this.aspectChanged(aspectName);
-			}
-		};
-	}
-
-
-	// ********** equality **********
-
-	/**
-	 * Enforce object identity - do not allow objects to be equal unless
-	 * they are the same object.
-	 * Do NOT override this method - we rely on object identity extensively.
-	 */
-	@Override
-	public final boolean equals(Object o) {
-		return this == o;
-	}
-
-	/**
-	 * Enforce object identity - do not allow objects to be equal unless
-	 * they are the same object.
-	 * Do NOT override this method - we rely on object identity extensively.
-	 */
-	@Override
-	public final int hashCode() {
-		return super.hashCode();
-	}
-
-
-	// ********** containment hierarchy (parent/children) **********
-
-	/**
-	 * INTRA-TREE API?
-	 * Return the node's parent in the containment hierarchy.
-	 * Most nodes must have a parent.
-	 * @see #children()
-	 */
-	public Node getParent() {
-		return this.parent;
-	}
-
-	/**
-	 * Throw an IllegalArgumentException if the parent is not valid
-	 * for the node.
-	 * By default require a non-null parent. Override if other restrictions exist
-	 * or the parent should be null.
-	 * NB: Root node model implementations will need to override this method.
-	 */
-	protected void checkParent(Node parentNode) {
-		if (parentNode == null) {
-			throw new IllegalArgumentException("The parent node cannot be null"); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * INTRA-TREE API?
-	 * Return the node's children, which are also nodes.
-	 * Do NOT override this method.
-	 * Override #addChildrenTo(List).
-	 * @see #getParent()
-	 * @see #addChildrenTo(java.util.List)
-	 */
-	public final Iterator<Node> children() {
-		List<Node> children = new ArrayList<Node>();
-		this.addChildrenTo(children);
-		return children.iterator();
-	}
-
-	/**
-	 * Subclasses should override this method to add their children
-	 * to the specified list.
-	 * @see #children()
-	 */
-	protected void addChildrenTo(@SuppressWarnings("unused") List<Node> list) {
-		// this class has no children, subclasses will...
-	// when you override this method, don't forget to include:
-	//	super.addChildrenTo(list);
-	}
-
-	/**
-	 * INTRA-TREE API?
-	 * Return the containment hierarchy's root node.
-	 * Most nodes must have a root.
-	 * @see #getParent()
-	 * NB: Assume the root has no parent.
-	 */
-	public Node root() {
-		Node p = this.parent;
-		return (p == null) ? this : p.root();
-	}
-
-	/**
-	 * Return whether the node is a descendant of the specified node.
-	 * By definition, a node is a descendant of itself.
-	 */
-	public boolean isDescendantOf(Node node) {
-		return (this == node) || this.parentIsDescendantOf(node);
-	}
-
-	protected boolean parentIsDescendantOf(Node node) {
-		return (this.parent != null) && this.parent.isDescendantOf(node);
-	}
-
-	/**
-	 * Return a collection holding all the node's "references", and all
-	 * the node's descendants' "references". "References" are
-	 * objects that are "referenced" by another object, as opposed
-	 * to "owned" by another object.
-	 */
-	public Iterator<Node.Reference> branchReferences() {
-		Collection<Node.Reference> branchReferences = new ArrayList<Node.Reference>(1000);		// start big
-		this.addBranchReferencesTo(branchReferences);
-		return branchReferences.iterator();
-	}
-
-	/**
-	 * INTRA-TREE API
-	 * Add the node's "references", and all the node's descendants'
-	 * "references", to the specified collection. "References" are
-	 * objects that are "referenced" by another object, as opposed
-	 * to "owned" by another object.
-	 * This method is of particular concern to Handles, since most
-	 * (hopefully all) "references" are held by Handles.
-	 * @see Reference
-	 * @see #children()
-	 */
-	public void addBranchReferencesTo(Collection<Node.Reference> branchReferences) {
-		for (Iterator<Node> stream = this.children(); stream.hasNext(); ) {
-			Node child = stream.next();		// pull out the child to ease debugging
-			child.addBranchReferencesTo(branchReferences);
-		}
-	}
-
-	/**
-	 * Return all the nodes in the object's branch of the tree,
-	 * including the node itself. The nodes will probably returned
-	 * in "depth-first" order.
-	 * Only really used for testing and debugging.
-	 */
-	public Iterator<Node> allNodes() {
-		Collection<Node> nodes = new ArrayList<Node>(1000);		// start big
-		this.addAllNodesTo(nodes);
-		return nodes.iterator();
-	}
-
-	/**
-	 * INTRA-TREE API?
-	 * Add all the nodes in the object's branch of the tree,
-	 * including the node itself, to the specified collection.
-	 * Only really used for testing and debugging.
-	 */
-	public void addAllNodesTo(Collection<Node> nodes) {
-		nodes.add(this);
-		for (Iterator<Node> stream = this.children(); stream.hasNext(); ) {
-			Node child = stream.next();		// pull out the child to ease debugging
-			child.addAllNodesTo(nodes);
-		}
-	}
-
-
-	// ********** model synchronization support **********
-
-	/**
-	 * INTRA-TREE API
-	 * This is a general notification that the specified node has been
-	 * removed from the tree. The node receiving this notification
-	 * should perform any necessary updates to remain in synch
-	 * with the tree (e.g. clearing out or replacing any references
-	 * to the removed node or any of the removed node's descendants).
-	 * @see #isDescendantOf(Node)
-	 */
-	public void nodeRemoved(Node node) {
-		for (Iterator<Node> stream = this.children(); stream.hasNext(); ) {
-			Node child = stream.next();		// pull out the child to ease debugging
-			child.nodeRemoved(node);
-		}
-	// when you override this method, don't forget to include:
-	//	super.nodeRemoved(node);
-	}
-
-	/**
-	 * convenience method
-	 * return whether node1 is a descendant of node2;
-	 * node1 can be null
-	 */
-	protected boolean nodeIsDescendantOf(Node node1, Node node2) {
-		return (node1 != null) && node1.isDescendantOf(node2);
-	}
-
-	/**
-	 * INTRA-TREE API
-	 * This is a general notification that the specified node has been
-	 * renamed. The node receiving this notification should mark its
-	 * branch dirty if necessary (i.e. it references the renamed node
-	 * or one of its descendants). This method is of particular concern
-	 * to Handles.
-	 * @see #isDescendantOf(Node)
-	 */
-	public void nodeRenamed(Node node) {
-		for (Iterator<Node> stream = this.children(); stream.hasNext(); ) {
-			Node child = stream.next();		// pull out the child to ease debugging
-			child.nodeRenamed(node);
-		}
-	// when you override this method, don't forget to include:
-	//	super.nodeRenamed(node);
-	}
-	
-	
-	// ********** user comment **********
-
-	/**
-	 * Return the object's user comment.
-	 */
-	public final String comment() {
-		return this.comment;
-	}
-
-	/**
-	 * Set the object's user comment.
-	 */
-	public final void setComment(String comment) {
-		Object old = this.comment;
-		this.comment = comment;
-		this.firePropertyChanged(COMMENT_PROPERTY, old, comment);
-	}
-
-
-	// ********** change support **********
-
-	/**
-	 * An aspect of the node has changed:
-	 * 	- if it is a persistent aspect, mark the object dirty
-	 * 	- if it is a significant aspect, validate the object
-	 */
-	protected void aspectChanged(String aspectName) {
-		if (this.aspectIsPersistent(aspectName)) {
-			// System.out.println(Thread.currentThread() + " dirty change: " + this + ": " + aspectName);
-			this.markDirty();
-		}
-		if (this.aspectChangeRequiresValidation(aspectName)) {
-			// System.out.println(Thread.currentThread() + " validation change: " + this + ": " + aspectName);
-			this.validate();
-		}
-	}
-
-	protected void validate() {
-		this.getValidator().validate();
-	}
-
-	/**
-	 * INTRA-TREE API
-	 * Return a validator that will be invoked whenever a
-	 * "validated" aspect of the node tree changes.
-	 * Typically only the root node directly holds a validator.
-	 * NB: Root node model implementations will need to override this method.
-	 */
-	public Node.Validator getValidator() {
-		if (this.parent == null) {
-			throw new IllegalStateException("This node should not be firing change events during its construction."); //$NON-NLS-1$
-		}
-		return this.parent.getValidator();
-	}
-
-	/**
-	 * Set a validator that will be invoked whenever a
-	 * "validated" aspect of the node tree changes.
-	 * Typically only the root node directly holds a validator.
-	 * NB: Root node model implementations will need to override this method.
-	 */
-	public void setValidator(Node.Validator validator) {
-		if (this.parent == null) {
-			throw new IllegalStateException("This root node should implement #setValidator(Node.Validator)."); //$NON-NLS-1$
-		}
-		throw new UnsupportedOperationException("Only root nodes implement #setValidator(Node.Validator)."); //$NON-NLS-1$
-	}
-
-
-	// ********** dirty flag support **********
-
-	/**
-	 * Return whether any persistent aspects of the object
-	 * have changed since the object was last read or saved.
-	 * This does NOT include changes to the object's descendants.
-	 */
-	public final boolean isDirty() {
-		return this.dirty;
-	}
-
-	/**
-	 * Return whether any persistent aspects of the object,
-	 * or any of its descendants, have changed since the object and
-	 * its descendants were last read or saved.
-	 */
-	public final boolean isDirtyBranch() {
-		return this.dirtyBranch;
-	}
-
-	/**
-	 * Return whether the object is unmodified
-	 * since it was last read or saved.
-	 * This does NOT include changes to the object's descendants.
-	 */
-	public final boolean isClean() {
-		return ! this.dirty;
-	}
-
-	/**
-	 * Return whether the object and all of its descendants
-	 * are unmodified since the object and
-	 * its descendants were last read or saved.
-	 */
-	public final boolean isCleanBranch() {
-		return ! this.dirtyBranch;
-	}
-
-	/**
-	 * Set the dirty branch flag setting. This is set to true
-	 * when either the object or one of its descendants becomes dirty.
-	 */
-	private void setIsDirtyBranch(boolean dirtyBranch) {
-		boolean old = this.dirtyBranch;
-		this.dirtyBranch = dirtyBranch;
-		this.firePropertyChanged(DIRTY_BRANCH_PROPERTY, old, dirtyBranch);
-	}
-
-	/**
-	 * Mark the object as dirty and as a dirty branch.
-	 * An object is marked dirty when either a "persistent" attribute
-	 * has changed or its save location has changed.
-	 */
-	private void markDirty() {
-		this.dirty = true;
-		this.markBranchDirty();
-	}
-
-	/**
-	 * INTRA-TREE API
-	 * Mark the node and its parent as dirty branches.
-	 * This message is propagated up the containment
-	 * tree when a particular node becomes dirty.
-	 */
-	public void markBranchDirty() {
-		// short-circuit any unnecessary propagation
-		if (this.dirtyBranch) {
-			// if this is already a dirty branch, the parent must be also
-			return;
-		}
-
-		this.setIsDirtyBranch(true);
-		this.markParentBranchDirty();
-	}
-
-	protected void markParentBranchDirty() {
-		if (this.parent != null) {
-			this.parent.markBranchDirty();
-		}
-	}
-
-	/**
-	 * Mark the object and all its descendants as dirty.
-	 * This is used when the save location of some
-	 * top-level object is changed and the entire
-	 * containment tree must be marked dirty so it
-	 * will be written out.
-	 */
-	public final void markEntireBranchDirty() {
-		this.markDirty();
-		for (Iterator<Node> stream = this.children(); stream.hasNext(); ) {
-			Node child = stream.next();		// pull out the child to ease debugging
-			child.markEntireBranchDirty();
-		}
-	}
-
-	/**
-	 * Mark the object and all its descendants as clean.
-	 * Then notify the object's parent that it (the parent)
-	 * might now be a clean branch also.
-	 * Typically used when the object has just been
-	 * read in or written out.
-	 */
-	public final void markEntireBranchClean() {
-		this.cascadeMarkEntireBranchClean();
-		this.markParentBranchCleanIfPossible();
-	}
-
-	protected void markParentBranchCleanIfPossible() {
-		if (this.parent != null) {
-			this.parent.markBranchCleanIfPossible();
-		}
-	}
-
-	/**
-	 * INTRA-TREE API
-	 * Mark the node and all its descendants as clean.
-	 * Typically used when the node has just been
-	 * read in or written out.
-	 * This method is for internal use only; it is not for
-	 * client use.
-	 * Not the best of method names.... :-(
-	 */
-	public final void cascadeMarkEntireBranchClean() {
-		for (Iterator<Node> stream = this.children(); stream.hasNext(); ) {
-			Node child = stream.next();		// pull out the child to ease debugging
-			child.cascadeMarkEntireBranchClean();
-		}
-		this.dirty = false;
-		this.setIsDirtyBranch(false);
-	}
-
-	/**
-	 * INTRA-TREE API
-	 * A child node's branch has been marked clean. If the node
-	 * itself is clean and if all of its children are also clean, the
-	 * node's branch can be marked clean. Then, if the node's
-	 * branch is clean, the node will notify its parent that it might
-	 * be clean also. This message is propagated up the containment
-	 * tree when a particular node becomes clean.
-	 */
-	public final void markBranchCleanIfPossible() {
-		// short-circuit any unnecessary propagation
-		if (this.dirty) {
-			// if the object is "locally" dirty, it is still a dirty branch
-			return;
-		}
-
-		for (Iterator<Node> stream = this.children(); stream.hasNext(); ) {
-			Node child = stream.next();		// pull out the child to ease debugging
-			if (child.isDirtyBranch()) {
-				return;
-			}
-		}
-
-		this.setIsDirtyBranch(false);
-		this.markParentBranchCleanIfPossible();
-	}
-
-	private boolean aspectIsPersistent(String aspectName) {
-		return ! this.aspectIsTransient(aspectName);
-	}
-
-	private boolean aspectIsTransient(String aspectName) {
-		return this.transientAspectNames().contains(aspectName);
-	}
-
-	/**
-	 * Return a set of the object's transient aspect names.
-	 * These are the aspects that, when they change, will NOT cause the
-	 * object to be marked dirty.
-	 * If you need instance-based calculation of your transient aspects,
-	 * override this method. If class-based calculation is sufficient,
-	 * override #addTransientAspectNamesTo(Set).
-	 */
-	protected final Set<String> transientAspectNames() {
-		synchronized (transientAspectNameSets) {
-			HashSet<String> transientAspectNames = transientAspectNameSets.get(this.getClass());
-			if (transientAspectNames == null) {
-				transientAspectNames = new HashSet<String>();
-				this.addTransientAspectNamesTo(transientAspectNames);
-				transientAspectNameSets.put(this.getClass(), transientAspectNames);
-			}
-			return transientAspectNames;
-		}
-	}
-
-	/**
-	 * Add the object's transient aspect names to the specified set.
-	 * These are the aspects that, when they change, will NOT cause the
-	 * object to be marked dirty.
-	 * If class-based calculation of your transient aspects is sufficient,
-	 * override this method. If you need instance-based calculation,
-	 * override #transientAspectNames().
-	 */
-	protected void addTransientAspectNamesTo(Set<String> transientAspectNames) {
-		transientAspectNames.add(DIRTY_BRANCH_PROPERTY);
-		transientAspectNames.add(BRANCH_PROBLEMS_LIST);
-		transientAspectNames.add(HAS_BRANCH_PROBLEMS_PROPERTY);
-	// when you override this method, don't forget to include:
-	//	super.addTransientAspectNamesTo(transientAspectNames);
-	}
-
-	/**
-	 * Return the dirty nodes in the object's branch of the tree,
-	 * including the node itself (if appropriate).
-	 * Only really used for testing and debugging.
-	 */
-	public final Iterator<Node> allDirtyNodes() {
-		return new FilteringIterator<Node, Node>(this.allNodes()) {
-			@Override
-			protected boolean accept(Node node) {
-				return (node instanceof AbstractNode) && ((AbstractNode) node).isDirty();
-			}
-		};
-	}
-
-
-	// ********** problems **********
-
-	/**
-	 * Return the node's problems.
-	 * This does NOT include the problems of the node's descendants.
-	 * @see #branchProblems()
-	 */
-	public final Iterator<Problem> problems() {
-		return new CloneIterator<Problem>(this.problems);	// removes are not allowed
-	}
-
-	/**
-	 * Return the size of the node's problems.
-	 * This does NOT include the problems of the node's descendants.
-	 * @see #branchProblemsSize()
-	 */
-	public final int problemsSize() {
-		return this.problems.size();
-	}
-
-	/**
-	 * Return whether the node has problems
-	 * This does NOT include the problems of the node's descendants.
-	 * @see #hasBranchProblems()
-	 */
-	public final boolean hasProblems() {
-		return ! this.problems.isEmpty();
-	}
-
-	/**
-	 * Return all the node's problems along with all the
-	 * node's descendants' problems.
-	 */
-	public final ListIterator<Problem> branchProblems() {
-		return new CloneListIterator<Problem>(this.branchProblems);	// removes are not allowed
-	}
-
-	/**
-	 * Return the size of all the node's problems along with all the
-	 * node's descendants' problems.
-	 */
-	public final int branchProblemsSize() {
-		return this.branchProblems.size();
-	}
-
-	/**
-	 * Return whether the node or any of its descendants have problems.
-	 */
-	public final boolean hasBranchProblems() {
-		return ! this.branchProblems.isEmpty();
-	}
-
-	public final boolean containsBranchProblem(Problem problem) {
-		return this.branchProblems.contains(problem);
-	}
-
-	protected final Problem buildProblem(String messageKey, Object... messageArguments) {
-		return new DefaultProblem(this, messageKey, messageArguments);
-	}
-
-	protected final Problem buildProblem(String messageKey) {
-		return this.buildProblem(messageKey, EMPTY_PROBLEM_MESSAGE_ARGUMENTS);
-	}
-
-	/**
-	 * Validate the node and all of its descendants,
-	 * and update their sets of "branch" problems.
-	 * If the node's "branch" problems have changed,
-	 * notify the node's parent.
-	 */
-	public void validateBranch() {
-		if (this.validateBranchInternal()) {
-			// if our "branch" problems have changed, then
-			// our parent must rebuild its "branch" problems also
-			this.rebuildParentBranchProblems();
-		}
-	}
-
-	protected void rebuildParentBranchProblems() {
-		if (this.parent != null) {
-			this.parent.rebuildBranchProblems();
-		}
-	}
-
-	/**
-	 * INTRA-TREE API
-	 * Validate the node and all of its descendants,
-	 * and update their sets of "branch" problems.
-	 * Return true if the collection of "branch" problems has changed.
-	 * This method is for internal use only; it is not for
-	 * client use.
-	 */
-	public boolean validateBranchInternal() {
-		// rebuild "branch" problems in children first
-		for (Iterator<Node> stream = this.children(); stream.hasNext(); ) {
-			Node child = stream.next();		// pull out the child to ease debugging
-			// ignore the return value because we are going to rebuild our "branch"
-			// problems no matter what, to see if they have changed
-			child.validateBranchInternal();
-		}
-
-		this.problems.clear();
-		this.addProblemsTo(this.problems);
-
-		return this.checkBranchProblems();
-	}
-
-	/**
-	 * Check for any problems and add them to the specified list.
-	 * This method should ONLY add problems for this particular node;
-	 * it should NOT add problems for any of this node's descendants
-	 * or ancestors. (Although there will be times when it is debatable
-	 * as to which node a problem "belongs" to....)
-	 * 
-	 * NB: This method should NOT modify ANY part of the node's state!
-	 * It is a READ-ONLY behavior. ONLY the list of current problems
-	 * passed in to the method should be modified.
-	 */
-	protected void addProblemsTo(@SuppressWarnings("unused") List<Problem> currentProblems) {
-		// The default is to do nothing.
-		// When you override this method, don't forget to include:
-	//	super.addProblemsTo(currentProblems);
-	}
-
-	/**
-	 * Rebuild the "branch" problems and return whether they have
-	 * changed.
-	 * NB: The entire collection of "branch" problems must be re-calculated
-	 * with EVERY "significant" change - we cannot keep it in synch via
-	 * change notifications because if a descendant with problems is
-	 * removed or replaced we will not receive notification that its
-	 * problems were removed from our "branch" problems.
-	 */
-	private boolean checkBranchProblems() {
-		Vector<Problem> oldBranchProblems = new Vector<Problem>(this.branchProblems);
-		int oldSize = this.branchProblems.size();
-
-		this.branchProblems.clear();
-		this.branchProblems.addAll(this.problems);
-		for (Iterator<Node> stream = this.children(); stream.hasNext(); ) {
-			Node child = stream.next();		// pull out the child to ease debugging
-			child.addBranchProblemsTo(this.branchProblems);
-		}
-
-		// if the size has changed to or from zero, our virtual flag has changed
-		int newSize = this.branchProblems.size();
-		if ((oldSize == 0) && (newSize != 0)) {
-			this.firePropertyChanged(HAS_BRANCH_PROBLEMS_PROPERTY, false, true);
-		} else if ((oldSize != 0) && (newSize == 0)) {
-			this.firePropertyChanged(HAS_BRANCH_PROBLEMS_PROPERTY, true, false);
-		}
-
-		if (oldBranchProblems.equals(this.branchProblems)) {
-			return false;		// our "branch" problems did not change
-		}
-		// our "branch" problems changed
-		this.fireListChanged(BRANCH_PROBLEMS_LIST);
-		return true;
-	}
-
-	/**
-	 * INTRA-TREE API
-	 * Add all the problems of the node and all
-	 * the problems of its descendants to the
-	 * specified collection.
-	 */
-	public final void addBranchProblemsTo(List<Problem> list) {
-		list.addAll(this.branchProblems);
-	}
-
-	/**
-	 * INTRA-TREE API
-	 * A child node's "branch" problems changed;
-	 * therefore the node's "branch" problems have changed also and
-	 * must be rebuilt.
-	 */
-	public final void rebuildBranchProblems() {
-		if ( ! this.checkBranchProblems()) {
-			throw new IllegalStateException("we should not get here unless our \"branch\" problems have changed"); //$NON-NLS-1$
-		}
-		this.rebuildParentBranchProblems();
-	}
-
-	/**
-	 * Clear the node's "branch" problems and the "branch"
-	 * problems of all of its descendants.
-	 * If the node's "branch" problems have changed,
-	 * notify the node's parent.
-	 */
-	public final void clearAllBranchProblems() {
-		if (this.clearAllBranchProblemsInternal()) {
-			// if our "branch" problems have changed, then
-			// our parent must rebuild its "branch" problems also
-			this.rebuildParentBranchProblems();
-		}
-	}
-
-	/**
-	 * INTRA-TREE API
-	 * Clear the node's "branch" problems and the "branch"
-	 * problems of all of its descendants.
-	 * Return true if the collection of "branch" problems has changed.
-	 * This method is for internal use only; it is not for
-	 * client use.
-	 */
-	public final boolean clearAllBranchProblemsInternal() {
-		if (this.branchProblems.isEmpty()) {
-			return false;
-		}
-		for (Iterator<Node> stream = this.children(); stream.hasNext(); ) {
-			Node child = stream.next();		// pull out the child to ease debugging
-			// ignore the return value because we are going to clear our "branch"
-			// problems no matter what
-			child.clearAllBranchProblemsInternal();
-		}
-		this.problems.clear();
-		this.branchProblems.clear();
-		this.firePropertyChanged(HAS_BRANCH_PROBLEMS_PROPERTY, true, false);
-		this.fireListChanged(BRANCH_PROBLEMS_LIST);
-		return true;
-	}
-
-	/**
-	 * Return whether a change to specified aspect requires a re-validation
-	 * of the node's tree.
-	 */
-	private boolean aspectChangeRequiresValidation(String aspectName) {
-		return ! this.aspectChangeDoesNotRequireValidation(aspectName);
-	}
-
-	private boolean aspectChangeDoesNotRequireValidation(String aspectName) {
-		return this.nonValidatedAspectNames().contains(aspectName);
-	}
-
-	/**
-	 * Return a set of the object's "non-validated" aspect names.
-	 * These are the aspects that, when they change, will NOT cause the
-	 * object (or its containing tree) to be validated, i.e. checked for problems.
-	 * If you need instance-based calculation of your "non-validated" aspects,
-	 * override this method. If class-based calculation is sufficient,
-	 * override #addNonValidatedAspectNamesTo(Set).
-	 */
-	protected final Set<String> nonValidatedAspectNames() {
-		synchronized (nonValidatedAspectNameSets) {
-			HashSet<String> nonValidatedAspectNames = nonValidatedAspectNameSets.get(this.getClass());
-			if (nonValidatedAspectNames == null) {
-				nonValidatedAspectNames = new HashSet<String>();
-				this.addNonValidatedAspectNamesTo(nonValidatedAspectNames);
-				nonValidatedAspectNameSets.put(this.getClass(), nonValidatedAspectNames);
-			}
-			return nonValidatedAspectNames;
-		}
-	}
-
-	/**
-	 * Add the object's "non-validated" aspect names to the specified set.
-	 * These are the aspects that, when they change, will NOT cause the
-	 * object (or its containing tree) to be validated, i.e. checked for problems.
-	 * If class-based calculation of your "non-validated" aspects is sufficient,
-	 * override this method. If you need instance-based calculation,
-	 * override #nonValidatedAspectNames().
-	 */
-	protected void addNonValidatedAspectNamesTo(Set<String> nonValidatedAspectNames) {
-		nonValidatedAspectNames.add(COMMENT_PROPERTY);
-		nonValidatedAspectNames.add(DIRTY_BRANCH_PROPERTY);
-		nonValidatedAspectNames.add(BRANCH_PROBLEMS_LIST);
-		nonValidatedAspectNames.add(HAS_BRANCH_PROBLEMS_PROPERTY);
-	// when you override this method, don't forget to include:
-	//	super.addNonValidatedAspectNamesTo(nonValidatedAspectNames);
-	}
-
-
-	// ********** display methods **********
-
-	/**
-	 * Compare display strings.
-	 */
-	public int compareTo(Node node) {
-		return DEFAULT_COMPARATOR.compare(this, node);
-	}
-
-	/**
-	 * Return a developer-friendly String. If you want something useful for
-	 * displaying in a user interface, use #displayString().
-	 * If you want to give more information in your #toString(),
-	 * override #toString(StringBuilder sb). 
-	 * Whatever you add to that string buffer will show up between the parentheses.
-	 * @see AbstractModel#toString(StringBuilder sb)
-	 * @see #displayString()
-	 */
-	@Override
-	public final String toString() {
-		return super.toString();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/AsynchronousValidator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/AsynchronousValidator.java
deleted file mode 100644
index fd2059cc8c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/AsynchronousValidator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.node;
-
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.SynchronizedBoolean;
-
-/**
- * This implementation of the PluggableValidator.Delegate interface
- * simply sets a shared "validate" flag to true. This should trigger a
- * separate "validation" thread to begin validating the appropriate
- * branch of nodes.
- */
-public class AsynchronousValidator
-	implements PluggableValidator.Delegate
-{
-	private SynchronizedBoolean validateFlag;
-
-	/**
-	 * Construct a validator delegate with the specified shared
-	 * "validate" flag. This flag should be shared with
-	 * another thread that will perform the actual validation.
-	 */
-	public AsynchronousValidator(SynchronizedBoolean validateFlag) {
-		super();
-		this.validateFlag = validateFlag;
-	}
-
-	/**
-	 * Set the shared "validate" flag to true, triggering
-	 * an asynchronous validation of the appropriate
-	 * branch of nodes.
-	 */
-	public void validate() {
-		this.validateFlag.setTrue();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.validateFlag);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/DefaultProblem.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/DefaultProblem.java
deleted file mode 100644
index 9d3898c59d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/DefaultProblem.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.node;
-
-import java.util.Arrays;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * This class is a straightforward implementation of the Problem interface.
- */
-public class DefaultProblem
-	implements Problem
-{
-	private final Node source;
-	private final String messageKey;
-	private final Object[] messageArguments;
-
-
-	DefaultProblem(Node source, String messageKey, Object[] messageArguments) {
-		super();
-		this.source = source;
-		this.messageKey = messageKey;
-		this.messageArguments = messageArguments;
-	}
-
-
-	// ********** Problem implementation **********
-
-	public Node source() {
-		return this.source;
-	}
-
-	public String messageKey() {
-		return this.messageKey;
-	}
-
-	public Object[] messageArguments() {
-		return this.messageArguments;
-	}
-
-
-	// ********** Object overrides **********
-
-	/**
-	 * We implement #equals(Object) because problems are repeatedly
-	 * re-calculated and the resulting problems merged with the existing
-	 * set of problems; and we want to keep the original problems and
-	 * ignore any freshly-generated duplicates.
-	 * Also, problems are not saved to disk....
-	 */
-	@Override
-	public boolean equals(Object o) {
-		if ( ! (o instanceof Problem)) {
-			return false;
-		}
-		Problem other = (Problem) o;
-		return this.source == other.source()
-				&& this.messageKey.equals(other.messageKey())
-				&& Arrays.equals(this.messageArguments, other.messageArguments());
-	}
-
-	@Override
-	public int hashCode() {
-		return this.source.hashCode() ^ this.messageKey.hashCode();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.messageKey);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/Node.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/Node.java
deleted file mode 100644
index 2936883fce..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/Node.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.node;
-
-import java.text.Collator;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.model.Model;
-
-/**
- * This interface defines the methods that must be implemented
- * by any class whose instances are to be part of a containment hierarchy
- * that supports a "dirty" state and validation "problems".
- * 
- * Note: Methods marked "INTRA-TREE API" are typically only used by
- * the nodes themselves, as opposed to clients of the nodes. These
- * methods are called by a node on either its parent or its children.
- */
-public interface Node extends Model, Comparable<Node> {
-
-
-	// ********** containment hierarchy (parent/children) **********
-
-	/**
-	 * INTRA-TREE API?
-	 * Return the node's parent in the containment hierarchy.
-	 * Most nodes must have a parent. The parent is immutable.
-	 * @see #children()
-	 */
-	Node getParent();
-
-	/**
-	 * INTRA-TREE API?
-	 * Return the node's children, which are also nodes.
-	 * @see #getParent()
-	 */
-	Iterator<Node> children();
-
-	/**
-	 * INTRA-TREE API?
-	 * Return the containment hierarchy's root node.
-	 * Most nodes must have a root.
-	 * @see #getParent()
-	 */
-	Node root();
-
-	/**
-	 * Return whether the node is a descendant of the specified node.
-	 * By definition, a node is a descendant of itself.
-	 */
-	boolean isDescendantOf(Node node);
-
-	/**
-	 * INTRA-TREE API
-	 * Add the node's "references", and all the node's descendants'
-	 * "references", to the specified collection. "References" are
-	 * objects that are "referenced" by another object, as opposed
-	 * to "owned" by another object.
-	 * This method is of particular concern to Handles, since most
-	 * (hopefully all) "references" are held by Handles.
-	 * @see Reference
-	 * @see #children()
-	 */
-	void addBranchReferencesTo(Collection<Node.Reference> branchReferences);
-
-	/**
-	 * INTRA-TREE API?
-	 * Add all the nodes in the object's branch of the tree,
-	 * including the node itself, to the specified collection.
-	 * Only really used for testing and debugging.
-	 */
-	void addAllNodesTo(Collection<Node> nodes);
-
-
-	// ********** model synchronization support **********
-
-	/**
-	 * INTRA-TREE API
-	 * This is a general notification that the specified node has been
-	 * removed from the tree. The node receiving this notification
-	 * should perform any necessary updates to remain in synch
-	 * with the tree (e.g. clearing out or replacing any references
-	 * to the removed node or any of the removed node's descendants).
-	 * @see #isDescendantOf(Node)
-	 */
-	void nodeRemoved(Node node);
-
-	/**
-	 * INTRA-TREE API
-	 * This is a general notification that the specified node has been
-	 * renamed. The node receiving this notification should mark its
-	 * branch dirty if necessary (i.e. it references the renamed node
-	 * or one of its descendants). This method is of particular concern
-	 * to Handles.
-	 * @see #isDescendantOf(Node)
-	 */
-	void nodeRenamed(Node node);
-	
-
-	// ********** dirty flag support **********
-
-	/**
-	 * Return whether any persistent aspects of the node,
-	 * or any of its descendants, have changed since the node and
-	 * its descendants were last read or saved.
-	 */
-	boolean isDirtyBranch();
-		String DIRTY_BRANCH_PROPERTY = "dirtyBranch";
-
-	/**
-	 * INTRA-TREE API
-	 * Mark the node and its parent as dirty branches.
-	 * This message is propagated up the containment
-	 * tree when a particular node becomes dirty.
-	 */
-	void markBranchDirty();
-
-	/**
-	 * Mark the node and all its descendants as dirty.
-	 * This is used when the save location of some
-	 * top-level node is changed and the entire
-	 * containment tree must be marked dirty so it
-	 * will be written out.
-	 */
-	void markEntireBranchDirty();
-
-	/**
-	 * INTRA-TREE API
-	 * A child node's branch has been marked clean. If the node
-	 * itself is clean and if all of its children are also clean, the
-	 * node's branch can be marked clean. Then, if the node's
-	 * branch is clean, the node will notify its parent that it might
-	 * be clean also. This message is propagated up the containment
-	 * tree when a particular node becomes clean.
-	 */
-	void markBranchCleanIfPossible();
-
-	/**
-	 * INTRA-TREE API
-	 * Mark the node and all its descendants as clean.
-	 * Typically used when the node has just been
-	 * read in or written out.
-	 * This method is for internal use only; it is not for
-	 * client use.
-	 * Not the best of method names.... :-(
-	 */
-	void cascadeMarkEntireBranchClean();
-
-
-	// ********** problems **********
-
-	/**
-	 * INTRA-TREE API
-	 * Return a validator that will be invoked whenever a
-	 * "validated" aspect of the node tree changes.
-	 * Typically only the root node directly holds a validator.
-	 */
-	Validator getValidator();
-
-	/**
-	 * Set a validator that will be invoked whenever a
-	 * "validated" aspect of the node tree changes.
-	 * Typically only the root node directly holds a validator.
-	 */
-	void setValidator(Validator validator);
-
-	/**
-	 * Validate the node and its descendants.
-	 * This is an explicit request invoked by a client; and it will
-	 * typically be followed by a call to one of the following methods:
-	 * 	#branchProblems()
-	 * 	#hasBranchProblems()
-	 * Whether the node maintains its problems on the fly
-	 * or waits until this method is called is determined by the
-	 * implementation.
-	 * @see Problem
-	 */
-	void validateBranch();
-
-	/**
-	 * INTRA-TREE API
-	 * Validate the node and all of its descendants,
-	 * and update their sets of "branch" problems.
-	 * Return true if the collection of "branch" problems has changed.
-	 * This method is for internal use only; it is not for
-	 * client use.
-	 */
-	boolean validateBranchInternal();
-
-	/**
-	 * Return all the node's problems along with all the
-	 * node's descendants' problems.
-	 */
-	ListIterator<Problem> branchProblems();
-		String BRANCH_PROBLEMS_LIST = "branchProblems";
-
-	/**
-	 * Return the size of all the node's problems along with all the
-	 * node's descendants' problems.
-	 */
-	int branchProblemsSize();
-
-	/**
-	 * Return whether the node or any of its descendants have problems.
-	 */
-	boolean hasBranchProblems();
-		String HAS_BRANCH_PROBLEMS_PROPERTY = "hasBranchProblems";
-
-	/**
-	 * Return whether the node contains the specified branch problem.
-	 */
-	boolean containsBranchProblem(Problem problem);
-
-	/**
-	 * INTRA-TREE API
-	 * Something changed, rebuild the node's collection of branch problems.
-	 */
-	void rebuildBranchProblems();
-
-	/**
-	 * INTRA-TREE API
-	 * Add the node's problems, and all the node's descendants'
-	 * problems, to the specified list.
-	 * A call to this method should be immediately preceded by a call to
-	 * #validateBranch() or all of the problems might not be
-	 * added to the list.
-	 * @see Problem
-	 */
-	void addBranchProblemsTo(List<Problem> branchProblems);
-
-	/**
-	 * Clear the node's "branch" problems and the "branch"
-	 * problems of all of its descendants.
-	 */
-	void clearAllBranchProblems();
-
-	/**
-	 * INTRA-TREE API
-	 * Clear the node's "branch" problems and the "branch"
-	 * problems of all of its descendants.
-	 * Return true if the collection of "branch" problems has changed.
-	 * This method is for internal use only; it is not for
-	 * client use.
-	 */
-	boolean clearAllBranchProblemsInternal();
-
-
-	// ********** comment **********
-
-	/**
-	 * Return the user comment concerning the node.
-	 */
-	String comment();
-		String COMMENT_PROPERTY = "comment";
-
-	/**
-	 * Set the user comment concerning the node.
-	 */
-	void setComment(String comment);
-
-
-	// ********** displaying/sorting **********
-
-	/**
-	 * Return a string representation of the model, suitable for sorting.
-	 */
-	String displayString();
-
-
-	// ********** sub-interfaces **********
-
-	/**
-	 * Simple interface defining a "reference" between two nodes.
-	 * @see Node#addBranchReferencesTo(java.util.Collection)
-	 */
-	interface Reference {
-
-		/**
-		 * Return the "source" node of the reference, i.e. the node that
-		 * references the "target" node.
-		 */
-		Node source();
-
-		/**
-		 * Return the "target" node of the reference, i.e. the node that
-		 * is referenced by the "source" node.
-		 */
-		Node target();
-
-	}
-
-
-	/**
-	 * A validator will validate a node as appropriate.
-	 * Typically the validation will
-	 * 	- occur whenever a node has changed
-	 * 	- encompass the entire tree containing the node
-	 * 	- execute asynchronously
-	 */
-	interface Validator {
-
-		/**
-		 * A "significant" aspect has changed;
-		 * validate the node as appropriate
-		 */
-		void validate();
-
-		/**
-		 * Stop all validation of the node until #resume() is called.
-		 * This can be used to improve the performance of any long-running
-		 * action that triggers numerous changes to the node. Be sure to
-		 * match a call to this method with a corresponding call to
-		 * #resume().
-		 */
-		void pause();
-
-		/**
-		 * Resume validation of the node. This method can only be
-		 * called after a matching call to #pause().
-		 */
-		void resume();
-
-	}
-
-
-	// ********** helper implementations **********
-
-	/**
-	 * Straightforward implementation of the Reference interface
-	 * defined above.
-	 */
-	public class SimpleReference implements Reference {
-		private Node source;
-		private Node target;
-		public SimpleReference(Node source, Node target) {
-			super();
-			if (source == null || target == null) {
-				throw new NullPointerException();
-			}
-			this.source = source;
-			this.target = target;
-		}
-		public Node source() {
-			return this.source;
-		}
-		public Node target() {
-			return this.target;
-		}
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this, this.source + " => " + this.target);
-		}
-	}
-
-	/**
-	 * Typical comparator that can be used to sort a collection of nodes.
-	 * Sort based on display string:
-	 * 	- identical objects are equal (which means that cannot
-	 * 		co-exist in a SortedSet)
-	 * 	- use the default collator (which typically interleaves
-	 * 		lower- and upper-case letters)
-	 * 	- allow duplicate display strings (from different objects)
-	 * 	- try to return consistent results for same object pairs
-	 */
-	Comparator<Node> DEFAULT_COMPARATOR =
-		new Comparator<Node>() {
-			public int compare(Node node1, Node node2) {
-				// disallow duplicates based on object identity
-				if (node1 == node2) {
-					return 0;
-				}
-
-				// first compare display strings using the default collator
-				int result = Collator.getInstance().compare(node1.displayString(), node2.displayString());
-				if (result != 0) {
-					return result;
-				}
-
-				// then compare using object-id
-				result = System.identityHashCode(node1) - System.identityHashCode(node2);
-				if (result != 0) {
-					return result;
-				}
-
-				// It's unlikely that we get to this point; but, just in case, we will return -1.
-				// Unfortunately, this introduces some mild unpredictability to the sort order
-				// (unless the objects are always passed into this method in the same order).
-				return -1;		// if all else fails, indicate that o1 < o2
-			}
-			@Override
-			public String toString() {
-				return "Node.DEFAULT_COMPARATOR";
-			}
-		};
-
-
-	/**
-	 * This validator does nothing to validate the node.
-	 */
-	Validator NULL_VALIDATOR =
-		new PluggableValidator(PluggableValidator.Delegate.Null.instance()) {
-			@Override
-			public String toString() {
-				return "Node.NULL_VALIDATOR";
-			}
-		};
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/PluggableValidator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/PluggableValidator.java
deleted file mode 100644
index c44f8aab43..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/PluggableValidator.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.node;
-
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.SynchronizedBoolean;
-
-/**
- * This implementation of the Validator interface implements the
- * pause/resume portion of the protocol, but delegates the actual
- * validation to a "pluggable" delegate.
- */
-public class PluggableValidator
-	implements Node.Validator
-{
-	private boolean pause;
-	private boolean validateOnResume;
-	private final Delegate delegate;
-
-
-	/**
-	 * Convenience factory method.
-	 */
-	public static Node.Validator buildAsynchronousValidator(SynchronizedBoolean validateFlag) {
-		return new PluggableValidator(new AsynchronousValidator(validateFlag));
-	}
-
-	/**
-	 * Convenience factory method.
-	 */
-	public static Node.Validator buildSynchronousValidator(Node node) {
-		return new PluggableValidator(new SynchronousValidator(node));
-	}
-
-	/**
-	 * Construct a validator with the specified delegate.
-	 */
-	public PluggableValidator(Delegate delegate) {
-		super();
-		this.pause = false;
-		this.validateOnResume = false;
-		this.delegate = delegate;
-	}
-
-	public synchronized void validate() {
-		if (this.pause) {
-			this.validateOnResume = true;
-		} else {
-			this.delegate.validate();
-		}
-	}
-
-	public synchronized void pause() {
-		if (this.pause) {
-			throw new IllegalStateException("already paused");
-		}
-		this.pause = true;
-	}
-
-	public synchronized void resume() {
-		if ( ! this.pause) {
-			throw new IllegalStateException("not paused");
-		}
-		this.pause = false;
-		// validate any changes that occurred while the validation was paused
-		if (this.validateOnResume) {
-			this.validateOnResume = false;
-			this.delegate.validate();
-		}
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.delegate);
-	}
-
-
-	// ********** member interface **********
-
-	/**
-	 * Interface implemented by any delegates of a pluggable validator.
-	 */
-	public interface Delegate {
-
-		/**
-		 * The validator is not "paused" - perform the appropriate validation.
-		 */
-		void validate();
-
-
-		/**
-		 * This delegate does nothing.
-		 */
-		final class Null implements Delegate {
-			public static final Delegate INSTANCE = new Null();
-			public static Delegate instance() {
-				return INSTANCE;
-			}
-			// ensure single instance
-			private Null() {
-				super();
-			}
-			public void validate() {
-				// do nothing
-			}
-			@Override
-			public String toString() {
-				return "PluggableValidator.Delegate.Null";
-			}
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/Problem.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/Problem.java
deleted file mode 100644
index 4f8e730362..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/Problem.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.node;
-
-/**
- * Define an interface describing the problems associated with a node.
- */
-public interface Problem {
-
-	/**
-	 * Return the node most closely associated with the problem.
-	 */
-	Node source();
-
-	/**
-	 * Return a key that can be used to uniquely identify the problem's message.
-	 */
-	String messageKey();
-
-	/**
-	 * Return the arguments associate with the problem's message.
-	 */
-	Object[] messageArguments();
-
-	/**
-	 * Return whether the problem is equal to the specified object.
-	 * It is equal if the specified object is a implementation of the
-	 * Problem interface and its source, message key, and message
-	 * arguments are all equal to this problem's.
-	 */
-	boolean equals(Object o);
-
-	/**
-	 * Return the problem's hash code, which should calculated as an
-	 * XOR of the source's hash code and the message key's hash code.
-	 */
-	int hashCode();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/RunnableValidation.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/RunnableValidation.java
deleted file mode 100644
index 367d57a028..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/RunnableValidation.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.node;
-
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
-import org.eclipse.jpt.utility.internal.SynchronizedBoolean;
-
-/**
- * This implementation of Runnable will asynchronously validate
- * a branch of nodes. It will wait until a shared "validate" flag is
- * set to validate the branch. Once the the branch is validated,
- * the thread will quiesce until the flag is set again.
- * 
- * There are two ways to stop this thread:
- * 	- Thread.interrupt()
- * 	- set the "continue" flag to false
- * For now, these two are equivalent; but in the future we might
- * pass the "continue" flag to the Node.validateBranch()
- * method so we can short-circuit the validation instead of waiting
- * until the entire branch is validated.
- */
-public class RunnableValidation
-	implements Runnable
-{
-	/** The node whose branch this thread will validate. */
-	private final Node node;
-
-	/** When this flag is set to true, we kick off the validation routine. */
-	private final SynchronizedBoolean validateFlag;
-
-	/** When this flag is set to false, we allow this thread to die. */
-	private final SynchronizedBoolean continueFlag;
-
-	/** Log any exceptions encountered during validation with the following settings. */
-	private final Logger exceptionLogger;
-	private final Level exceptionLevel;
-	private final String exceptionMessage;
-
-
-	/**
-	 * Construct a validation thread.
-	 */
-	public RunnableValidation(
-			Node node,
-			SynchronizedBoolean validateFlag,
-			SynchronizedBoolean continueFlag,
-			Logger exceptionLogger,
-			Level exceptionLevel,
-			String exceptionMessage
-	) {
-		super();
-		this.node = node;
-		this.validateFlag = validateFlag;
-		this.continueFlag = continueFlag;
-		this.exceptionLogger = exceptionLogger;
-		this.exceptionLevel = exceptionLevel;
-		this.exceptionMessage = exceptionMessage;
-	}
-
-
-	// ********** Runnable Implementation **********
-
-	/**
-	 * Loop while the "continue" flag is true and the thread
-	 * has not been interrupted by another thread.
-	 * In each loop: Wait until the "validate" flag is set to true,
-	 * then set it back to false and validate the branch of nodes.
-	 */
-	public void run() {
-		while (this.continueFlag.isTrue()) {
-			try {
-				this.validateFlag.waitToSetFalse();
-			} catch (InterruptedException ex) {
-				// we were interrupted while waiting, must be quittin' time
-				return;
-			}
-			this.validateNode();
-		}
-	}
-
-	/**
-	 * Validate the node, logging any exceptions.
-	 * If an exception occurs, we terminate the validation until the
-	 * "validation" flag is set again. Some exceptions occur because
-	 * of concurrent changes to the model that occur *after* validation
-	 * starts but before it completes an entire pass over the model. If that
-	 * is the case, things should be OK; because the exception will be
-	 * caught and the "validation" flag will have been set again *during* the
-	 * initial validation pass. So when we return from catching the exception
-	 * we will simply re-start the validation, hopefully with the model in
-	 * a consistent state that will prevent another exception from
-	 * occurring. Of course, if we have any exceptions that are *not*
-	 * the result of the model being in an inconsistent state, we will
-	 * probably fill the log; and those exceptions are bugs that need
-	 * to be fixed. (!) Hopefully the user will notice the enormous log and
-	 * contact support....  ~bjv
-	 */
-	private void validateNode() {
-		try {
-			this.node.validateBranch();
-		} catch (Throwable ex) {
-			this.logException(ex);
-		}
-	}
-
-	/**
-	 * We need to do all this because Logger#log(LogRecord) does not pass through
-	 * Logger#doLog(LogRecord) like all the other Logger#log(...) methods.
-	 */
-	private void logException(Throwable ex) {
-		LogRecord logRecord = new LogRecord(this.exceptionLevel, this.exceptionMessage);
-		logRecord.setParameters(new Object[] { this.node.displayString() });
-		logRecord.setThrown(ex);
-		logRecord.setLoggerName(this.exceptionLogger.getName());
-		logRecord.setResourceBundle(this.exceptionLogger.getResourceBundle());
-		this.exceptionLogger.log(logRecord);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/SynchronousValidator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/SynchronousValidator.java
deleted file mode 100644
index ede6b8b8f0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/SynchronousValidator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.node;
-
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * This implementation of the PluggableValidator.Delegate interface
- * will validate the node immediately.
- * 
- * This is useful for debugging in a single thread or generating
- * problem reports.
- */
-public class SynchronousValidator
-	implements PluggableValidator.Delegate
-{
-	private final Node node;
-
-	/**
-	 * Construct a validator that will immediately validate the
-	 * specified node.
-	 */
-	public SynchronousValidator(Node node) {
-		super();
-		this.node = node;
-	}
-
-	public void validate() {
-		this.node.validateBranch();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.node);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/CachingComboBoxModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/CachingComboBoxModel.java
deleted file mode 100644
index 8ebe2617e6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/CachingComboBoxModel.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.swing;
-
-import javax.swing.ComboBoxModel;
-
-/**
- * This interface allows a client to better control the performance of
- * a combo box model by allowing the client to specify when it is
- * acceptable for the model to "cache" and "uncache" its list of elements.
- * The model may ignore these hints if appropriate.
- */
-public interface CachingComboBoxModel extends ComboBoxModel {
-    
-    /**
-     * Cache the comboBoxModel List.  If you call this, you
-     * must make sure to call uncacheList() as well.  Otherwise
-     * stale data will be in the ComboBox until cacheList() is 
-     * called again or uncacheList() is called.
-     */
-    void cacheList();
-    
-    /**
-     * Clear the cached list.  Next time the list is needed it will
-     * be built when it is not cached.
-     */
-    void uncacheList();
-
-    /**
-     * Check to see if the list is already cached.  This can be used for 
-     * MouseEvents, since they are not terribly predictable.
-     */
-    boolean isCached();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/CheckBoxTableCellRenderer.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/CheckBoxTableCellRenderer.java
deleted file mode 100644
index 45ec6be9e2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/CheckBoxTableCellRenderer.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.swing;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import javax.swing.BorderFactory;
-import javax.swing.Icon;
-import javax.swing.JCheckBox;
-import javax.swing.JTable;
-import javax.swing.SwingConstants;
-import javax.swing.UIManager;
-import javax.swing.border.Border;
-import org.eclipse.jpt.utility.internal.swing.TableCellEditorAdapter.ImmediateEditListener;
-
-/**
- * Make the cell look like a check box.
- */
-public class CheckBoxTableCellRenderer implements TableCellEditorAdapter.Renderer {
-
-	/** the component used to paint the cell */
-	private final JCheckBox checkBox;
-	
-	/** the listener to be notified on an immediate edit */
-	protected TableCellEditorAdapter.ImmediateEditListener immediateEditListener;
-
-	/** "normal" border - assume the default table "focus" border is 1 pixel thick */
-	private static final Border NO_FOCUS_BORDER = BorderFactory.createEmptyBorder(1, 1, 1, 1);
-
-
-	// ********** constructors/initialization **********
-
-	/**
-	 * Construct a cell renderer with no label or icon.
-	 */
-	public CheckBoxTableCellRenderer() {
-		super();
-		this.checkBox = this.buildCheckBox();
-		// by default, check boxes do not paint their borders
-		this.checkBox.setBorderPainted(true);
-		// this setting is recommended for check boxes inside of trees and tables
-		this.checkBox.setBorderPaintedFlat(true);
-	}
-
-	/**
-	 * Construct a cell renderer with the specified text and icon,
-	 * either of which may be null.
-	 */
-	public CheckBoxTableCellRenderer(String text, Icon icon) {
-		this();
-		this.setText(text);
-		this.setIcon(icon);
-	}
-
-	/**
-	 * Construct a cell renderer with the specified text.
-	 */
-	public CheckBoxTableCellRenderer(String text) {
-		this(text, null);
-	}
-
-	/**
-	 * Construct a cell renderer with the specified icon.
-	 */
-	public CheckBoxTableCellRenderer(Icon icon) {
-		this(null, icon);
-	}
-
-	protected JCheckBox buildCheckBox() {
-		JCheckBox cb = new JCheckBox();
-		cb.addActionListener(this.buildActionListener());
-		return cb;
-	}
-	
-	private ActionListener buildActionListener() {
-		return new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				if (CheckBoxTableCellRenderer.this.immediateEditListener != null) {
-					CheckBoxTableCellRenderer.this.immediateEditListener.immediateEdit();
-				}
-			}
-		};
-	}
-
-
-	// ********** TableCellRenderer implementation **********
-
-	public Component getTableCellRendererComponent(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) {
-	    this.checkBox.setHorizontalAlignment(SwingConstants.CENTER);
-		this.checkBox.setComponentOrientation(table.getComponentOrientation());
-		this.checkBox.setFont(table.getFont());
-		this.checkBox.setEnabled(table.isEnabled());
-
-		this.checkBox.setForeground(this.foregroundColor(table, value, selected, hasFocus, row, column));
-		this.checkBox.setBackground(this.backgroundColor(table, value, selected, hasFocus, row, column));
-		// once the colors are set, calculate opaque setting
-		this.checkBox.setOpaque(this.cellIsOpaqueIn(table, value, selected, hasFocus, row, column));
-		this.checkBox.setBorder(this.border(table, value, selected, hasFocus, row, column));
-
-		this.setValue(value);
-		return this.checkBox;
-	}
-
-	/**
-	 * Return the cell's foreground color.
-	 */
-	protected Color foregroundColor(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) {
-		if (selected) {
-			if (hasFocus && table.isCellEditable(row, column)) {
-				return UIManager.getColor("Table.focusCellForeground");
-			}
-			return table.getSelectionForeground();
-		}
-		return table.getForeground();
-	}
-
-	/**
-	 * Return the cell's background color.
-	 */
-	protected Color backgroundColor(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) {
-		if (selected) {
-			if (hasFocus && table.isCellEditable(row, column)) {
-				return UIManager.getColor("Table.focusCellBackground");
-			}
-			return table.getSelectionBackground();
-		}
-		return table.getBackground();
-	}
-
-	/**
-	 * Return the cell's border.
-	 */
-	protected Border border(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) {
-		return hasFocus ?  UIManager.getBorder("Table.focusCellHighlightBorder") : NO_FOCUS_BORDER;
-	}
-
-	/**
-	 * Return whether the cell should be opaque in the table.
-	 * If the cell's background is the same as the table's background
-	 * and table is opaque, we don't need to paint the background -
-	 * the table will do it.
-	 */
-	protected boolean cellIsOpaqueIn(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) {
-		Color cellBackground = this.checkBox.getBackground();
-		Color tableBackground = table.getBackground();
-		return ! (table.isOpaque() && cellBackground.equals(tableBackground));
-	}
-
-	/**
-	 * Set the check box's value.
-	 */
-	protected void setValue(Object value) {
-		// CR#3999318 - This null check needs to be removed once JDK bug is fixed
-		if (value == null) {
-			value = Boolean.FALSE;
-		}
-		this.checkBox.setSelected(((Boolean) value).booleanValue());
-	}
-
-
-	// ********** TableCellEditorAdapter.Renderer implementation **********
-
-	public Object getValue() {
-		return Boolean.valueOf(this.checkBox.isSelected());
-	}
-	
-	public void setImmediateEditListener(ImmediateEditListener listener) {
-		this.immediateEditListener = listener;
-	}
-
-	// ********** public API **********
-
-	/**
-	 * Set the check box's text; which by default is blank.
-	 */
-	public void setText(String text) {
-		this.checkBox.setText(text);
-	}
-
-	/**
-	 * Set the check box's icon; which by default is not present.
-	 */
-	public void setIcon(Icon icon) {
-		this.checkBox.setIcon(icon);
-	}
-
-	/**
-	 * Return the renderer's preferred height. This allows you
-	 * to set the table's row height to something the check box
-	 * will look good in....
-	 */
-	public int preferredHeight() {
-		// add in space for the border top and bottom
-		return (int) this.checkBox.getPreferredSize().getHeight() + 2;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/ComboBoxTableCellRenderer.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/ComboBoxTableCellRenderer.java
deleted file mode 100644
index 55d8d1f9a0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/ComboBoxTableCellRenderer.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.swing;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import javax.swing.BorderFactory;
-import javax.swing.ComboBoxModel;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JTable;
-import javax.swing.ListCellRenderer;
-import javax.swing.SwingConstants;
-import javax.swing.UIManager;
-import javax.swing.border.Border;
-import javax.swing.event.PopupMenuEvent;
-import javax.swing.event.PopupMenuListener;
-import org.eclipse.jpt.utility.internal.ClassTools;
-
-/**
- * Make the cell look like a combo-box.
- */
-public class ComboBoxTableCellRenderer implements TableCellEditorAdapter.Renderer {
-
-	/* caching the combo box because we are caching the comboBoxModel.
-	 * Everytime we rebuilt the comboBox we would set the model on it and not
-	 * remove the model from the old combo box.  This meant that new listeners
-	 * kept being added to the comboBoxModel for every comboBox build.
-	 * Not sure if there is a way to clear out the old combo box, or why
-	 * we were buildig a new combo box every time so I went with caching it.
-	 */
-	private JComboBox comboBox;
-	
-	/** the items used to populate the combo box */
-	private CachingComboBoxModel model;
-	private ListCellRenderer renderer;
-	Object value;
-	private static int height = -1;
-	boolean fakeFocusFlag;
-
-	/** the listener to be notified on an immediate edit */
-	protected TableCellEditorAdapter.ImmediateEditListener immediateEditListener;
-	
-	/** hold the original colors of the combo-box */
-	private static Color defaultForeground;
-	private static Color defaultBackground;
-
-	/** "normal" border - assume the default table "focus" border is 1 pixel thick */
-	private static final Border NO_FOCUS_BORDER = BorderFactory.createEmptyBorder(1, 1, 1, 1);
-
-
-	// ********** constructors/initialization **********
-
-	/**
-	 * Default constructor.
-	 */
-	private ComboBoxTableCellRenderer() {
-		super();
-		initialize();
-	}
-
-	/**
-	 * Construct a cell renderer that uses the specified combo-box model.
-	 */
-	public ComboBoxTableCellRenderer(ComboBoxModel model) {
-		this(new NonCachingComboBoxModel(model));
-	}
-	
-	/**
-	 * Construct a cell renderer that uses the specified caching combo-box model.
-	 */
-	public ComboBoxTableCellRenderer(CachingComboBoxModel model) {
-		this();
-		this.model = model;
-	}
-
-	/**
-	 * Construct a cell renderer that uses the specified
-	 * combo-box model and renderer.
-	 */
-	public ComboBoxTableCellRenderer(ComboBoxModel model, ListCellRenderer renderer) {
-		this(new NonCachingComboBoxModel(model), renderer);
-	}
-	
-	/**
-	 * Construct a cell renderer that uses the specified
-	 * caching combo-box model and renderer.
-	 */
-	public ComboBoxTableCellRenderer(CachingComboBoxModel model, ListCellRenderer renderer) {
-		this(model);
-		this.renderer = renderer;
-	}
-
-	protected void initialize() {
-		// save the original colors of the combo-box, so we
-		// can use them to paint non-selected cells
-		if (height == -1) {
-			JComboBox cb = new JComboBox();
-			cb.addItem("m");
-
-			// add in space for the border top and bottom
-			height = cb.getPreferredSize().height + 2;
-
-			defaultForeground = cb.getForeground();
-			defaultBackground = cb.getBackground();
-		}
-	}
-
-    static JLabel prototypeLabel = new JLabel("Prototype", new EmptyIcon(16), SwingConstants.LEADING);
-
-    protected JComboBox buildComboBox() {
-
-		final JComboBox result = new JComboBox() {
-			private boolean fakeFocus;
-			@Override
-			public boolean hasFocus() {
-				return fakeFocus || super.hasFocus();
-			}
-			@Override
-			public void paint(Graphics g) {
-				fakeFocus = ComboBoxTableCellRenderer.this.fakeFocusFlag;
-				super.paint(g);
-				fakeFocus = false;
-			}
-			//wrap the renderer to deal with the prototypeDisplayValue
-		    @Override
-			public void setRenderer(final ListCellRenderer aRenderer) {
-		        super.setRenderer(new ListCellRenderer(){
-		            public Component getListCellRendererComponent(JList list, Object v, int index, boolean isSelected, boolean cellHasFocus) {
-		                if (v == prototypeLabel) {
-		                    return prototypeLabel;
-		                }
-		                return aRenderer.getListCellRendererComponent(list, v, index, isSelected, cellHasFocus);
-		            }
-		        });
-		    }
-			@Override
-			public int getSelectedIndex() {
-		        boolean listNotCached = !listIsCached();
-		        if (listNotCached) {
-		            cacheList();
-		        }
-		        
-				int index = super.getSelectedIndex();
-
-		        if (listNotCached) {
-		            uncacheList();
-		        }
-				return index;
-		   }
-
-		};
-		// stole this code from javax.swing.DefaultCellEditor
-		result.putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE);
-		result.addActionListener(this.buildActionListener());
-		result.addPopupMenuListener(this.buildPopupMenuListener());
-		
-        //These are used to workaround problems with Swing trying to 
-        //determine the size of a comboBox with a large model
-        result.setPrototypeDisplayValue(prototypeLabel);
-        getListBox(result).setPrototypeCellValue(prototypeLabel);
-        
-		return result;
-	}
-	
-    
-    private JList getListBox(JComboBox result) {
-        return (JList) ClassTools.fieldValue(result.getUI(), "listBox");
-    }
-
-	
-	private ActionListener buildActionListener() {
-		return new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				JComboBox cb = (JComboBox) e.getSource();
-				Object selectedItem = cb.getSelectedItem();
-
-				// Only update the selected item and invoke immediateEdit() if the
-				// selected item actually changed, during the initialization of the
-				// editing, the model changes and causes this method to be invoked,
-				// it causes CR#3963675 to occur because immediateEdit() stop the
-				// editing, which is done at the wrong time
-				if (ComboBoxTableCellRenderer.this.value != selectedItem) {
-					ComboBoxTableCellRenderer.this.value = cb.getSelectedItem();
-					ComboBoxTableCellRenderer.this.immediateEdit();
-				}
-			}
-		};
-	}
-
-	void immediateEdit() {
-		if (this.immediateEditListener != null) {
-			this.immediateEditListener.immediateEdit();
-		}
-	}
-	
-	private PopupMenuListener buildPopupMenuListener() {
-		return new PopupMenuListener() {
-		
-			public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-				if (listIsCached()) {
-					uncacheList();
-				}
-				cacheList();
-			}
-		
-			public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
-	            if (listIsCached()) {
-	                uncacheList();
-	            }
-
-			}
-		
-			public void popupMenuCanceled(PopupMenuEvent e) {
-	            if (listIsCached()) {
-	                uncacheList();
-	            }
-			}
-		};
-	}
-
-	
-	void cacheList() {
-		this.model.cacheList();
-	}
-	
-	void uncacheList() {
-		this.model.uncacheList();
-	}	
-	
-	boolean listIsCached() {
-		return this.model.isCached();
-	}
-	// ********** TableCellRenderer implementation **********
-
-	public Component getTableCellRendererComponent(JTable table, Object val, boolean selected, boolean hasFocus, int row, int column) {
-		this.fakeFocusFlag = selected || hasFocus;
-		if (this.comboBox == null) {
-			this.comboBox = this.buildComboBox();
-	
-			this.comboBox.setComponentOrientation(table.getComponentOrientation());
-			this.comboBox.setModel(this.model);
-			if (this.renderer != null) {
-				this.comboBox.setRenderer(this.renderer);
-			}
-			this.comboBox.setFont(table.getFont());
-			this.comboBox.setEnabled(table.isEnabled());
-			this.comboBox.setBorder(this.border(table, val, selected, hasFocus, row, column));
-		}
-
-		// We need to go through the model since JComboBox might prevent us from
-		// selecting the value. This can happen when the value is not contained
-		// in the model, see CR#3950044 for an example
-		this.model.setSelectedItem(val);
-
-		return this.comboBox;
-	}
-
-	/**
-	 * Return the cell's foreground color.
-	 */
-	protected Color foregroundColor(JTable table, Object val, boolean selected, boolean hasFocus, int row, int column) {
-		if (selected) {
-			if (hasFocus && table.isCellEditable(row, column)) {
-				return defaultForeground;
-			}
-			return table.getSelectionForeground();
-		}
-		return defaultForeground;
-	}
-
-	/**
-	 * Return the cell's background color.
-	 */
-	protected Color backgroundColor(JTable table, Object val, boolean selected, boolean hasFocus, int row, int column) {
-		if (selected) {
-			if (hasFocus && table.isCellEditable(row, column)) {
-				return defaultBackground;
-			}
-			return table.getSelectionBackground();
-		}
-		return defaultBackground;
-	}
-
-	/**
-	 * Return the cell's border.
-	 */
-	protected Border border(JTable table, Object val, boolean selected, boolean hasFocus, int row, int column) {
-		return hasFocus ?
-			UIManager.getBorder("Table.focusCellHighlightBorder")
-		:
-			NO_FOCUS_BORDER;
-	}
-
-
-	// ********** TableCellEditorAdapter.Renderer implementation **********
-
-	public Object getValue() {
-		return this.value;
-	}
-	
-	public void setImmediateEditListener(TableCellEditorAdapter.ImmediateEditListener listener) {
-		this.immediateEditListener = listener;
-	}
-
-
-	// ********** public API **********
-
-	/**
-	 * Return the renderer's preferred height. This allows you
-	 * to set the row height to something the combo-box will look good in....
-	 */
-	public int preferredHeight() {
-		return height;
-	}
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/Displayable.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/Displayable.java
deleted file mode 100644
index f5149cfb78..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/Displayable.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.swing;
-
-import java.text.Collator;
-import java.util.Comparator;
-import javax.swing.Icon;
-import org.eclipse.jpt.utility.model.Model;
-
-/**
- * Used by general-purpose UI models and renderers to cast
- * application model objects to something displayable.
- */
-public interface Displayable
-	extends Model, Comparable<Displayable>
-{
-
-	/**
-	 * Return a string that can be used to identify the model
-	 * in a textual UI setting (typically the object's name).
-	 * When the display string changes, the model should fire
-	 * the appropriate change notification:
-	 *     this.firePropertyChanged(DISPLAY_STRING_PROPERTY, oldDisplayString, this.displayString());
-	 */
-	String displayString();
-		String DISPLAY_STRING_PROPERTY = "displayString";
-
-	/**
-	 * Return an icon that can be used to identify the model
-	 * in a UI component that supports icons (the icon can be null).
-	 * When the icon changes, the model should fire
-	 * the appropriate change notification:
-	 *     this.firePropertyChanged(ICON_PROPERTY, oldIcon, this.icon());
-	 */
-	Icon icon();
-		String ICON_PROPERTY = "icon";
-
-
-	// ********** helper implementations **********
-
-	Collator DEFAULT_COLLATOR = Collator.getInstance();
-
-	/**
-	 * Since all displayable objects must be comparable, provide a
-	 * typical comparator that can be used to sort a collection of
-	 * displayable objects.
-	 * Sort based on display string:
-	 *     - identical objects are equal (which means they cannot
-	 *         co-exist in a SortedSet)
-	 *     - use the default collator (which typically interleaves
-	 *         lower- and upper-case letters)
-	 *     - allow duplicate display strings (from different objects)
-	 *     - try to return consistent results for same object pairs
-	 */
-	Comparator<Displayable> DEFAULT_COMPARATOR =
-		new Comparator<Displayable>() {
-			public int compare(Displayable d1, Displayable d2) {
-				// disallow duplicates based on object identity
-				if (d1 == d2) {
-					return 0;
-				}
-
-				// first compare display strings using the default collator
-				int result = DEFAULT_COLLATOR.compare(d1.displayString(), d2.displayString());
-				if (result != 0) {
-					return result;
-				}
-
-				// then compare using object-id
-				result = System.identityHashCode(d1) - System.identityHashCode(d2);
-				if (result != 0) {
-					return result;
-				}
-
-				// It's unlikely that we get to this point; but, just in case, we will return -1.
-				// Unfortunately, this introduces some mild unpredictability to the sort order
-				// (unless the objects are always passed into this method in the same order).
-				return -1;		// if all else fails, indicate that o1 < o2
-			}
-			@Override
-			public String toString() {
-				return "Displayable.DEFAULT_COMPARATOR";
-			}
-		};
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/EmptyIcon.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/EmptyIcon.java
deleted file mode 100644
index 148308eaa9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/EmptyIcon.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.swing;
-
-import java.awt.Component;
-import java.awt.Graphics;
-import javax.swing.Icon;
-
-/**
- * Implement the Icon interface with an icon that has a size but
- * does not paint anything on the graphics context.
- */
-public class EmptyIcon
-	implements Icon
-{
-	private final int width;
-	private final int height;
-
-	public static final EmptyIcon NULL_INSTANCE = new EmptyIcon(0);
-
-
-	public EmptyIcon(int width, int height) {
-		super();
-		this.width = width;
-		this.height = height;
-	}
-
-	public EmptyIcon(int size) {
-		this(size, size);
-	}
-
-
-	// ********** Icon implementation **********
-
-	public void paintIcon(Component c, Graphics g, int x, int y) {
-		// don't paint anything for an empty icon
-	}
-
-	public int getIconWidth() { 
-		return this.width;
-	}
-
-	public int getIconHeight() {
-		return this.height;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/FilteringListBrowser.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/FilteringListBrowser.java
deleted file mode 100644
index d59f3e04d3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/FilteringListBrowser.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.swing;
-
-import javax.swing.Icon;
-import javax.swing.JComboBox;
-import javax.swing.JOptionPane;
-import javax.swing.ListModel;
-
-/**
- * This implementation of LongListComponent.Browser uses a
- * JOptionPane to prompt the user for the selection. The JOPtionPane
- * is passed a FilteringListPanel to assist the user in making
- * a selection.
- */
-public class FilteringListBrowser<T> 
-	implements ListChooser.ListBrowser 
-{
-	private FilteringListPanel<T> panel;
-
-	/**
-	 * Default constructor.
-	 */
-	public FilteringListBrowser() {
-		super();
-		this.panel = this.buildPanel();
-	}
-
-	protected FilteringListPanel<T> buildPanel() {
-		return new LocalFilteringListPanel<T>();
-	}
-
-	/**
-	 * Prompt the user using a JOptionPane with a filtering
-	 * list panel.
-	 */
-	public void browse(ListChooser chooser) {	
-		this.initializeCellRenderer(chooser);
-		
-		int option = 
-			JOptionPane.showOptionDialog(
-				chooser, 
-				this.message(chooser), 
-				this.title(chooser), 
-				this.optionType(chooser), 
-				this.messageType(chooser), 
-				this.icon(chooser), 
-				this.selectionValues(chooser), 
-				this.initialSelectionValue(chooser)
-		);
-		
-		if (option == JOptionPane.OK_OPTION) {
-			chooser.getModel().setSelectedItem(this.panel.selection());
-		}
-		
-		// clear the text field so the list box is re-filtered
-		this.panel.textField().setText("");
-	}
-	
-	protected void initializeCellRenderer(JComboBox comboBox) {
-		// default behavior should be to use the cell renderer from the combobox.
-		this.panel.listBox().setCellRenderer(comboBox.getRenderer());
-	}
-
-	/**
-	 * the message can be anything - here we build a component
-	 */
-	protected Object message(JComboBox comboBox) {
-		this.panel.setCompleteList(this.convertToArray(comboBox.getModel()));
-		this.panel.setSelection(comboBox.getModel().getSelectedItem());
-		return this.panel;
-	}
-
-	protected String title(JComboBox comboBox) {
-		return null;
-	}
-
-	protected int optionType(JComboBox comboBox) {
-		return JOptionPane.OK_CANCEL_OPTION;
-	}
-
-	protected int messageType(JComboBox comboBox) {
-		return JOptionPane.QUESTION_MESSAGE;
-	}
-
-	protected Icon icon(JComboBox comboBox) {
-		return null;
-	}
-
-	protected Object[] selectionValues(JComboBox comboBox) {
-		return null;
-	}
-
-	protected Object initialSelectionValue(JComboBox comboBox) {
-		return null;
-	}
-
-	/**
-	 * Convert the list of objects in the specified list model
-	 * into an array.
-	 */
-	protected Object[] convertToArray(ListModel model) {
-		int size = model.getSize();
-		Object[] result = new Object[size];
-		for (int i = 0; i < size; i++) {
-			result[i] = model.getElementAt(i);
-		}
-		return result;
-	}
-	
-	
-	// ********** custom panel **********
-	
-	protected static class LocalFilteringListPanel<S> extends FilteringListPanel<S> {
-		protected static final Object[] EMPTY_ARRAY = new Object[0];
-
-		protected LocalFilteringListPanel() {
-			super(EMPTY_ARRAY, null);
-		}
-	
-		/**
-		 * Disable the performance tweak because JOptionPane
-		 * will try open wide enough to disable the horizontal scroll bar;
-		 * and it looks a bit clumsy.
-		 */
-		@Override
-		protected String prototypeCellValue() {
-			return null;
-		}
-	
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/FilteringListPanel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/FilteringListPanel.java
deleted file mode 100644
index ff17df3305..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/FilteringListPanel.java
+++ /dev/null
@@ -1,455 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.swing;
-
-import java.awt.BorderLayout;
-import java.awt.Font;
-import javax.swing.AbstractListModel;
-import javax.swing.BorderFactory;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.ListCellRenderer;
-import javax.swing.ListModel;
-import javax.swing.ListSelectionModel;
-import javax.swing.border.Border;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import org.eclipse.jpt.utility.internal.SimpleStringMatcher;
-import org.eclipse.jpt.utility.internal.StringConverter;
-import org.eclipse.jpt.utility.internal.StringMatcher;
-
-/**
- * This panel presents an entry field and a list box of choices that
- * allows the user to filter the entries in the list box by entering
- * a pattern in the entry field.
- * 
- * By default, two wildcards are allowed in the pattern:
- * 	'*' will match any set of zero or more characters
- * 	'?' will match any single character
- * 
- * The panel consists of 4 components that can be customized:
- * 	- 1 text field
- * 	- 1 list box
- * 	- 2 labels, one for each of the above
- * 
- * Other aspects of the panel's behavior can be changed:
- * 	- the string converter determines how the objects in the
- * 		list are converted to strings and compared to the pattern
- * 		entered in the text field; by default the converter simply
- * 		uses the result of the object's #toString() method
- * 		(if you replace the string converter, you will probably
- * 		want to replace the list box's cell renderer also)
- * 	- the string matcher can also be changed if you would
- * 		like different pattern matching behavior than that
- * 		described above
- * 	- you can specify the maximum size of the list - this may
- * 		force the user to enter a pattern restrictive enough
- * 		to result in a list smaller than the maximum size; the
- * 		default is -1, which disables the restriction
- * 
- * This panel is not a typical panel, in the sense that it does not share
- * its model with clients via value models. Instead, this panel's model
- * is set and queried directly because it is designed to be used in a
- * dialog that directs the user's behavior (as opposed to a "normal"
- * window).
- */
-public class FilteringListPanel<T> extends JPanel {
-
-	/**
-	 * The complete list of available choices
-	 * (as opposed to the partial list held by the list box).
-	 */
-	private Object[] completeList;
-
-	/**
-	 * An adapter used to convert the objects in the list
-	 * to strings so they can be run through the matcher
-	 * and displayed in the text field.
-	 */
-	StringConverter<T> stringConverter;
-
-	/** The text field. */
-	private JTextField textField;
-	private JLabel textFieldLabel;
-	private DocumentListener textFieldListener;
-
-	/** The list box. */
-	private JList listBox;
-	private JLabel listBoxLabel;
-
-	/** The maximum number of entries displayed in the list box. */
-	private int maxListSize;
-
-	/**
-	 * The matcher used to filter the list against
-	 * the pattern entered in the text field. By default,
-	 * this allows the two wildcard characters described in
-	 * the class comment.
-	 */
-	private StringMatcher stringMatcher;
-
-	/**
-	 * Performance tweak: We use this buffer instead of
-	 * a temporary variable during filtering so we don't have
-	 * to keep re-allocating it.
-	 */
-	private Object[] buffer;
-
-	private static final Border TEXT_FIELD_LABEL_BORDER = BorderFactory.createEmptyBorder(0, 0, 5, 0);
-	private static final Border LIST_BOX_LABEL_BORDER = BorderFactory.createEmptyBorder(5, 0, 5, 0);
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a FilteringListPanel with the specified list of choices
-	 * and initial selection. Use the default string converter to convert the
-	 * choices and selection to strings (which simply calls #toString() on
-	 * the objects).
-	 */
-	public FilteringListPanel(Object[] completeList, Object initialSelection) {
-		this(completeList, initialSelection, StringConverter.Default.<T>instance());
-	}
-
-	/**
-	 * Construct a FilteringListPanel with the specified list of choices
-	 * and initial selection. Use the specified string converter to convert the
-	 * choices and selection to strings.
-	 */
-	public FilteringListPanel(Object[] completeList, Object initialSelection, StringConverter<T> stringConverter) {
-		super(new BorderLayout());
-		this.completeList = completeList;
-		this.stringConverter = stringConverter;
-		this.initialize(initialSelection);
-	}
-
-
-	// ********** initialization **********
-
-	private void initialize(Object initialSelection) {
-		this.maxListSize = this.defaultMaxListSize();
-		this.buffer = this.buildBuffer();
-
-		this.textFieldListener = this.buildTextFieldListener();
-
-		this.stringMatcher = this.buildStringMatcher();
-
-		this.initializeLayout(initialSelection);
-	}
-
-	private Object[] buildBuffer() {
-		return new Object[this.max()];
-	}
-
-	/**
-	 * Return the current max number of entries allowed in the list box.
-	 */
-	private int max() {
-		if (this.maxListSize == -1) {
-			return this.completeList.length;
-		}
-		return Math.min(this.maxListSize, this.completeList.length);
-	}
-
-	/**
-	 * Build a listener that will listen to changes in the text field
-	 * and filter the list appropriately.
-	 */
-	private DocumentListener buildTextFieldListener() {
-		return new DocumentListener() {
-			public void insertUpdate(DocumentEvent e) {
-				FilteringListPanel.this.filterList();
-			}
-			public void changedUpdate(DocumentEvent e) {
-				FilteringListPanel.this.filterList();
-			}
-			public void removeUpdate(DocumentEvent e) {
-				FilteringListPanel.this.filterList();
-			}
-			@Override
-			public String toString() {
-				return "text field listener";
-			}
-		};
-	}
-
-	private int defaultMaxListSize() {
-		return -1;
-	}
-
-	private StringMatcher buildStringMatcher() {
-		return new SimpleStringMatcher<T>();
-	}
-
-	private void initializeLayout(Object initialSelection) {
-		// text field
-		JPanel textFieldPanel = new JPanel(new BorderLayout());
-		this.textFieldLabel = new JLabel();
-		this.textFieldLabel.setBorder(TEXT_FIELD_LABEL_BORDER);
-		textFieldPanel.add(this.textFieldLabel, BorderLayout.NORTH);
-
-		this.textField = new JTextField();
-		this.textField.getDocument().addDocumentListener(this.textFieldListener);
-		this.textFieldLabel.setLabelFor(this.textField);
-		textFieldPanel.add(this.textField, BorderLayout.CENTER);
-
-		this.add(textFieldPanel, BorderLayout.NORTH);
-
-		// list box
-		JPanel listBoxPanel = new JPanel(new BorderLayout());
-		this.listBoxLabel = new JLabel();
-		this.listBoxLabel.setBorder(LIST_BOX_LABEL_BORDER);
-		listBoxPanel.add(this.listBoxLabel, BorderLayout.NORTH);
-
-		this.listBox = new JList();
-		this.listBox.setDoubleBuffered(true);
-		this.listBox.setModel(this.buildPartialArrayListModel(this.completeList, this.max()));
-		this.listBox.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		// performance tweak(?)
-		this.listBox.setPrototypeCellValue(this.prototypeCellValue());
-		this.listBox.setPrototypeCellValue(null);
-		this.listBox.setCellRenderer(this.buildDefaultCellRenderer());
-		this.listBoxLabel.setLabelFor(this.listBox);
-		// bug 2777802 - scroll bars shouldn't be on the tab sequence
-		JScrollPane listBoxScrollPane = new JScrollPane(this.listBox);
-		listBoxScrollPane.getHorizontalScrollBar().setFocusable(false);
-		listBoxScrollPane.getVerticalScrollBar().setFocusable(false);
-		listBoxPanel.add(listBoxScrollPane, BorderLayout.CENTER);
-
-		// initialize the widgets
-		this.listBox.setSelectedValue(initialSelection, true);
-		this.textField.select(0, this.textField.getText().length());
-
-		this.add(listBoxPanel, BorderLayout.CENTER);
-	}
-
-
-	// ********** public API **********
-
-	public Object selection() {
-		return this.listBox.getSelectedValue();
-	}
-
-	public void setSelection(Object selection) {
-		this.listBox.setSelectedValue(selection, true);
-	}
-
-	public Object[] completeList() {
-		return this.completeList;
-	}
-
-	/**
-	 * rebuild the filtering buffer and re-apply the filter
-	 * to the new list
-	 */
-	public void setCompleteList(Object[] completeList) {
-		this.completeList = completeList;
-		if (this.buffer.length < this.max()) {
-			// the buffer will never shrink - might want to re-consider...  ~bjv
-			this.buffer = this.buildBuffer();
-		}
-		this.filterList();
-	}
-
-	public int maxListSize() {
-		return this.maxListSize;
-	}
-
-	public void setMaxListSize(int maxListSize) {
-		this.maxListSize = maxListSize;
-		if (this.buffer.length < this.max()) {
-			// the buffer will never shrink - might want to re-consider...  ~bjv
-			this.buffer = this.buildBuffer();
-		}
-		this.filterList();
-	}
-
-	public StringConverter<T> stringConverter() {
-		return this.stringConverter;
-	}
-
-	/**
-	 * apply the new filter to the list
-	 */
-	public void setStringConverter(StringConverter<T> stringConverter) {
-		this.stringConverter = stringConverter;
-		this.filterList();
-	}
-
-	/**
-	 * allow client code to access the text field
-	 * (so we can set the focus)
-	 */
-	public JTextField textField() {
-		return this.textField;
-	}
-
-	/**
-	 * allow client code to access the text field label
-	 */
-	public JLabel textFieldLabel() {
-		return this.textFieldLabel;
-	}
-
-	/**
-	 * convenience method
-	 */
-	public void setTextFieldLabelText(String text) {
-		this.textFieldLabel.setText(text);
-	}
-
-	/**
-	 * allow client code to access the list box
-	 * (so we can add mouse listeners for double-clicking)
-	 */
-	public JList listBox() {
-		return this.listBox;
-	}
-
-	/**
-	 * convenience method
-	 */
-	public void setListBoxCellRenderer(ListCellRenderer renderer) {
-		this.listBox.setCellRenderer(renderer);
-	}
-
-	/**
-	 * allow client code to access the list box label
-	 */
-	public JLabel listBoxLabel() {
-		return this.listBoxLabel;
-	}
-
-	/**
-	 * convenience method
-	 */
-	public void setListBoxLabelText(String text) {
-		this.listBoxLabel.setText(text);
-	}
-
-	/**
-	 * convenience method
-	 */
-	public void setComponentsFont(Font font) {
-		this.textFieldLabel.setFont(font);
-		this.textField.setFont(font);
-		this.listBoxLabel.setFont(font);
-		this.listBox.setFont(font);
-	}
-
-	public StringMatcher stringMatcher() {
-		return this.stringMatcher;
-	}
-
-	/**
-	 * re-apply the filter to the list
-	 */
-	public void setStringMatcher(StringMatcher stringMatcher) {
-		this.stringMatcher = stringMatcher;
-		this.filterList();
-	}
-
-
-	// ********** internal methods **********
-
-	/**
-	 * Allow subclasses to disable performance tweak
-	 * by returning null here.
-	 */
-	protected String prototypeCellValue() {
-		return "==========> A_STRING_THAT_IS_DEFINITELY_LONGER_THAN_EVERY_STRING_IN_THE_LIST <==========";
-	}
-
-	/**
-	 * By default, use the string converter to build the text
-	 * used by the list box's cell renderer.
-	 */
-	protected ListCellRenderer buildDefaultCellRenderer() {
-		return new SimpleListCellRenderer() {
-			@Override
-			@SuppressWarnings("unchecked")
-			protected String buildText(Object value) {
-				return FilteringListPanel.this.stringConverter.convertToString((T) value);
-			}
-		};
-	}
-
-	/**
-	 * Something has changed that requires us to filter the list.
-	 * 
-	 * This method is synchronized because a fast typist can
-	 * generate events quicker than we can filter the list. (?  ~bjv)
-	 */
-	synchronized void filterList() {
-		// temporarily stop listening to the list box selection, since we will
-		// be changing the selection during the filtering and don't want
-		// that to affect the text field
-		this.filterList(this.textField.getText());
-	}
-
-	/**
-	 * Filter the contents of the list box to match the
-	 * specified pattern.
-	 */
-	private void filterList(String pattern) {
-		if (pattern.length() == 0) {
-			this.listBox.setModel(this.buildPartialArrayListModel(this.completeList, this.max()));
-		} else {
-			this.stringMatcher.setPatternString(pattern);
-			int j = 0;
-			int len = this.completeList.length;
-			int max = this.max();
-			for (int i = 0; i < len; i++) {
-				if (this.stringMatcher.matches(this.stringConverter.convertToString(this.entry(i)))) {
-					this.buffer[j++] = this.completeList[i];
-				}
-				if (j == max) {
-					break;
-				}
-			}
-			this.listBox.setModel(this.buildPartialArrayListModel(this.buffer, j));
-		}
-
-		// after filtering the list, determine the appropriate selection
-		if (this.listBox.getModel().getSize() == 0) {
-			this.listBox.getSelectionModel().clearSelection();
-		} else {
-			this.listBox.getSelectionModel().setAnchorSelectionIndex(0);
-			this.listBox.getSelectionModel().setLeadSelectionIndex(0);
-			this.listBox.ensureIndexIsVisible(0);
-		}
-	}
-
-	/**
-	 * minimize scope of suppressed warnings
-	 */
-	@SuppressWarnings("unchecked")
-	private T entry(int index) {
-		return (T) this.completeList[index];
-	}
-
-	/**
-	 * Build a list model that wraps only a portion of the specified array.
-	 * The model will include the array entries from 0 to (size - 1).
-	 */
-	private ListModel buildPartialArrayListModel(final Object[] array, final int size) {
-		return new AbstractListModel() {
-			public int getSize() {
-				return size;
-			}
-			public Object getElementAt(int index) {
-				return array[index];
-			}
-		};
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/ListChooser.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/ListChooser.java
deleted file mode 100644
index 9abc2e58f8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/ListChooser.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.swing;
-
-import java.awt.AWTEvent;
-import java.awt.AWTException;
-import java.awt.Component;
-import java.awt.EventQueue;
-import java.awt.Point;
-import java.awt.Robot;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseEvent;
-import javax.swing.ComboBoxModel;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.ListCellRenderer;
-import javax.swing.SwingConstants;
-import javax.swing.event.PopupMenuEvent;
-import javax.swing.event.PopupMenuListener;
-import javax.swing.plaf.basic.BasicComboBoxUI;
-import org.eclipse.jpt.utility.internal.ClassTools;
-
-/**
- * This component provides a way to handle selecting an item from a
- * list that may grow too large to be handled conveniently by a combo-box. 
- * If the list's size is less than the designated "long" list size, 
- * the choice list will be displayed in a normal combo-box popup; 
- * otherwise, a dialog will be used to prompt the user to choose a selection.
- * 
- * To change the browse mechanism, subclasses may 
- * 	- override the method #buildBrowser()
- *  - override the method #browse(), in which case the method 
- * 		#buildBrowser() may be ignored.
- */
-public class ListChooser 
-	extends JComboBox
-{
-	
-	/** the size of a "long" list - anything smaller is a "short" list */
-	int longListSize = DEFAULT_LONG_LIST_SIZE;
-	
-	/** the default size of a "long" list, which is 20 (to match JOptionPane's behavior) */
-	public static final int DEFAULT_LONG_LIST_SIZE = 20;
-	
-	/** property change associated with long list size */
-	public static final String LONG_LIST_SIZE_PROPERTY = "longListSize";
-	
-    static JLabel prototypeLabel = new JLabel("Prototype", new EmptyIcon(17), SwingConstants.LEADING);
-
-    /** 
-	 * whether the chooser is choosable.  if a chooser is not choosable,
-	 * it only serves as a display widget.  a user may not change its 
-	 * selected value.
-	 */
-	boolean choosable = true;
-	
-	/** property change associated with choosable */
-	public static final String CHOOSABLE_PROPERTY = "choosable";
-	
-	/** the browser used to make a selection from the long list - typically via a dialog */
-	private ListBrowser browser;
-	
-    private NodeSelector nodeSelector;
-    
-	/** INTERNAL - The popup is being shown.  Used to prevent infinite loop. */
-	boolean popupAlreadyInProgress;
-	
-	
-	// **************** Constructors ******************************************
-	
-	/**
-	 * Construct a list chooser for the specified model.
-	 */
-	public ListChooser(ComboBoxModel model) {
-		this(model, new NodeSelector.DefaultNodeSelector());
-	}
-	
-    public ListChooser(CachingComboBoxModel model) {
-        this(model, new NodeSelector.DefaultNodeSelector());
-    }
-    
-	public ListChooser(ComboBoxModel model, NodeSelector nodeSelector) {
-        this(new NonCachingComboBoxModel(model), nodeSelector);
-    }
-    
-    public ListChooser(CachingComboBoxModel model, NodeSelector nodeSelector) {
-        super(model);
-        this.initialize();
-        this.nodeSelector = nodeSelector;
-    }
-	// **************** Initialization ****************************************
-	
-	protected void initialize() {
-		this.addPopupMenuListener(this.buildPopupMenuListener());
-		this.setRenderer(new DefaultListCellRenderer());
-        this.addKeyListener(buildF3KeyListener());
-        
-        //These are used to workaround problems with Swing trying to 
-        //determine the size of a comboBox with a large model
-        setPrototypeDisplayValue(prototypeLabel);
-        listBox().setPrototypeCellValue(prototypeLabel);
-	}
-	
-    
-    private JList listBox() {
-        return (JList) ClassTools.fieldValue(this.ui, "listBox");
-    }
-    
-	/** 
-	 * When the popup is about to be shown, the event is consumed, and 
-	 * PopupHandler determines whether to reshow the popup or to show
-	 * the long list browser.
-	 */
-	private PopupMenuListener buildPopupMenuListener() {
-		return new PopupMenuListener() {
-			public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-				ListChooser.this.aboutToShowPopup();
-			}
-			public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
-				// do nothing
-			}
-			public void popupMenuCanceled(PopupMenuEvent e) {
-				// do nothing
-			}
-			@Override
-			public String toString() {
-				return "pop-up menu listener";
-			}
-		};
-	}
-	
-	/**
-	 * If this code is being reached due to the PopupHandler already being in progress,
-	 * then do nothing.  Otherwise, set the flag to true and launch the PopupHandler.
-	 */
-	void aboutToShowPopup() {
-		if (this.popupAlreadyInProgress) {
-			return;
-		}
-		
-		this.popupAlreadyInProgress = true;
-		EventQueue.invokeLater(new PopupHandler());
-	}
- 
-    
-	private KeyListener buildF3KeyListener() {
-        return new KeyAdapter() {
-            @Override
-			public void keyPressed(KeyEvent e) {
-                if (e.getKeyCode() == KeyEvent.VK_F3) {
-                    goToSelectedItem();
-                }                
-            }
-			@Override
-			public String toString() {
-				return "F3 key listener";
-			}
-        };
-    }
-    
-    public void goToSelectedItem() {
-        if (getSelectedItem() != null) {
-            ListChooser.this.nodeSelector.selectNodeFor(getSelectedItem());
-        }
-    }
-    
-	// **************** Browsing **********************************************
-	
-	/** 
-	 * Lazily initialize because subclasses may have further initialization to do
-	 * before browser can be built.
-	 */
-	protected void browse() {
-		if (this.browser == null) {
-			this.browser = this.buildBrowser();
-		}
-		
-		this.browser.browse(this);
-	}
-	
-	/**
-	 * Return the "browser" used to make a selection from the long list,
-	 * typically via a dialog.
-	 */
-	protected ListChooser.ListBrowser buildBrowser() {
-		return new SimpleListBrowser();
-	}
-	
-	
-	// **************** Choosable functionality *******************************
-	
-	/** override behavior - consume selection if chooser is not choosable */
-	@Override
-	public void setSelectedIndex(int anIndex) {
-		if (this.choosable) {
-			super.setSelectedIndex(anIndex);
-		}
-	}
-	
-	private void updateArrowButton() {
-		try {
-			BasicComboBoxUI comboBoxUi = (BasicComboBoxUI) ListChooser.this.getUI();
-			JButton arrowButton = (JButton) ClassTools.fieldValue(comboBoxUi, "arrowButton");
-			arrowButton.setEnabled(this.isEnabled() && this.choosable);
-		}
-		catch (Exception e) {
-			// this is a huge hack to try and make the combo box look right,
-			// so if it doesn't work, just swallow the exception
-		}
-	}
-	
-	
-    // **************** List Caching *******************************
-
-    void cacheList() {
-        ((CachingComboBoxModel) getModel()).cacheList();
-    }
-    
-    void uncacheList() {
-        ((CachingComboBoxModel) getModel()).uncacheList();
-    }
-
-    boolean listIsCached() {
-        return ((CachingComboBoxModel) getModel()).isCached();
-    }
-    
-	// **************** Public ************************************************
-	
-	public int longListSize() {
-		return this.longListSize;
-	}
-	
-	public void setLongListSize(int newLongListSize) {
-		int oldLongListSize = this.longListSize;
-		this.longListSize = newLongListSize;
-		this.firePropertyChange(LONG_LIST_SIZE_PROPERTY, oldLongListSize, newLongListSize);
-	}
-	
-	public boolean isChoosable() {
-		return this.choosable;
-	}
-	
-	public void setChoosable(boolean newValue) {
-		boolean oldValue = this.choosable;
-		this.choosable = newValue;
-		this.firePropertyChange(CHOOSABLE_PROPERTY, oldValue, newValue);
-		this.updateArrowButton();
-	}
-	
-	// **************** Handle selecting null as a value **********************
-
-	private boolean selectedIndexIsNoneSelectedItem(int index) {
-		return index == -1 &&
-				 getModel().getSize() > 0 &&
-				 getModel().getElementAt(0) == null;
-	}
-
-	@Override
-	public int getSelectedIndex() {
-        boolean listNotCached = !listIsCached();
-        if (listNotCached) {
-            cacheList();
-        }
-        
-		int index = super.getSelectedIndex();
-
-		// Use index 0 to show the <none selected> item since the actual value is
-		// null and JComboBox does not handle null values
-		if (selectedIndexIsNoneSelectedItem(index)) {
-			index = 0;
-        }
-
-        if (listNotCached) {
-            uncacheList();
-        }
-		return index;
-   }
-	
-	//wrap the renderer to deal with the prototypeDisplayValue
-    @Override
-	public void setRenderer(final ListCellRenderer aRenderer) {
-        super.setRenderer(new ListCellRenderer(){
-            public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-                if (value == prototypeLabel) {
-                    return prototypeLabel;
-                }
-                return aRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-            }
-        });
-    }
-    
-    
-	// **************** Member classes ****************************************
-	
-	/**
-	 * Define the API required by this ListChooser when it must
-	 * prompt the user to select an item from the "long" list.
-	 */
-	public interface ListBrowser 
-	{
-		/**
-		 * Prompt the user to make a selection from the specified
-		 * combo-box's model.
-		 */
-		void browse(ListChooser parentChooser);
-	}
-	
-	
-	/**
-	 * Runnable class that consumes popup window and determines whether
-	 * to reshow popup or to launch browser, based on the size of the list.
-	 */
-	private class PopupHandler
-		implements Runnable
-	{
-		/** The mouse event */
-		private MouseEvent lastMouseEvent;
-		
-		/** The component from which the last mouse event was thrown */
-		private JComponent eventComponent;
-		
-		/** The location of the component at the time the last mouse event was thrown */
-		private Point componentLocation;
-		
-		/** The location of the mouse at the time the last mouse event was thrown */
-		private Point mouseLocation;
-		
-		
-		PopupHandler() {
-			this.initialize();
-		}
-		
-		private void initialize() {
-			AWTEvent event = EventQueue.getCurrentEvent();
-			
-			if (event instanceof MouseEvent) {
-				this.lastMouseEvent = (MouseEvent) event;
-				this.eventComponent = (JComponent) this.lastMouseEvent.getSource();
-				this.componentLocation = this.eventComponent.getLocationOnScreen();
-				this.mouseLocation = this.lastMouseEvent.getPoint();
-			}
-			else {
-				this.eventComponent = null;
-				this.componentLocation = null;
-				this.mouseLocation = null;
-			}
-		}
-		
-		public void run() {
-			ListChooser.this.hidePopup();
-			
-            cacheList();
-			if (ListChooser.this.choosable == true) {
-				// If the combo box model is of sufficient length, the browser will be shown.
-				// Asking the combo box model for its size should be enough to ensure that 
-				//  its size is recalculated.
-				if (ListChooser.this.getModel().getSize() > ListChooser.this.longListSize) {
-					this.checkComboBoxButton();
-					ListChooser.this.browse();
-				}
-				else {
-					ListChooser.this.showPopup();
-					this.checkMousePosition();
-				}
-			}
-            if (listIsCached()) {
-                uncacheList();
-            }
-			
-			ListChooser.this.popupAlreadyInProgress = false;
-		}
-		
-		/** If this is not done, the button never becomes un-pressed */
-		private void checkComboBoxButton() {
-			try {
-				BasicComboBoxUI comboBoxUi = (BasicComboBoxUI) ListChooser.this.getUI();
-				JButton arrowButton = (JButton) ClassTools.fieldValue(comboBoxUi, "arrowButton");
-				arrowButton.getModel().setPressed(false);
-			}
-			catch (Exception e) {
-				// this is a huge hack to try and make the combo box look right,
-				// so if it doesn't work, just swallow the exception
-			}
-		}
-		
-		/**
-		 * Moves the mouse back to its original position before any jiggery pokery that we've done.
-		 */
-		private void checkMousePosition() {
-			if (this.eventComponent == null) {
-				return;
-			}
-			
-			final Point newComponentLocation = this.eventComponent.getLocationOnScreen();
-			boolean componentMoved = 
-				newComponentLocation.x - this.componentLocation.x != 0
-				|| newComponentLocation.y - this.componentLocation.y != 0;
-			
-			if (componentMoved) {
-				try {
-					new Robot().mouseMove(
-						newComponentLocation.x + this.mouseLocation.x,
-						newComponentLocation.y + this.mouseLocation.y
-					);
-				}
-				catch (AWTException ex) {
-					// move failed - do nothing
-				}
-			}
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/NodeSelector.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/NodeSelector.java
deleted file mode 100644
index f8b4d148e5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/NodeSelector.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.swing;
-
-/**
- * This will be called when the user presses F3 or chooses
- * 'Go To' in the context menu
- */
-public interface NodeSelector 
-{       
-    /**
-     * Select the appropriate Node in the tree or the editor panel.
-     */
-    void selectNodeFor(Object item);
-    
-    /**
-     * This NodeSelector will do nothing when selectNodeFor(Object) is called
-     */
-    class DefaultNodeSelector implements NodeSelector {
-        
-        public void selectNodeFor(Object item) {
-            //default is to do nothing
-        }
-    }
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/NonCachingComboBoxModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/NonCachingComboBoxModel.java
deleted file mode 100644
index ee7226457f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/NonCachingComboBoxModel.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.swing;
-
-import javax.swing.ComboBoxModel;
-import javax.swing.event.ListDataListener;
-
-/**
- * This implementation of the CachingComboBoxModel interface can be used
- * whenever there is no need for caching (i.e. the contents of the selection
- * list can be generated with little latency). All the normal ComboBoxModel
- * behavior is delegated to a client-supplied ComboBoxModel.
- */
-public class NonCachingComboBoxModel implements CachingComboBoxModel {
-	private ComboBoxModel wrappedComboBoxModel;
-
-	public NonCachingComboBoxModel(ComboBoxModel wrappedComboBoxModel) {
-		this.wrappedComboBoxModel = wrappedComboBoxModel;
-	}
-
-
-	// ********** CachingComboBoxModel implementation **********
-
-	public void cacheList() {
-		//do nothing
-	}
-
-	public void uncacheList() {
-		//do nothing
-	}
-
-	public boolean isCached() {
-		return false;
-	}
-
-
-	// ********** ComboBoxModel implementation **********
-
-	public void setSelectedItem(Object anItem) {
-		this.wrappedComboBoxModel.setSelectedItem(anItem);
-	}
-
-	public Object getSelectedItem() {
-		return this.wrappedComboBoxModel.getSelectedItem();
-	}
-
-
-	// ********** ListModel implementation **********
-
-	public int getSize() {
-		return this.wrappedComboBoxModel.getSize();
-	}
-
-	public Object getElementAt(int index) {
-		return this.wrappedComboBoxModel.getElementAt(index);
-	}
-
-	public void addListDataListener(ListDataListener l) {
-		this.wrappedComboBoxModel.addListDataListener(l);
-	}
-
-	public void removeListDataListener(ListDataListener l) {
-		this.wrappedComboBoxModel.removeListDataListener(l);
-	}  
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/SimpleDisplayable.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/SimpleDisplayable.java
deleted file mode 100644
index 8d5aa452cf..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/SimpleDisplayable.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.swing;
-
-import javax.swing.Icon;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-
-/**
- * This implementation of Displayable converts any Object
- * to a Displayable. Subclass it to override #displayString() and
- * #icon() if necessary. Change notification will be fired if the
- * object is changed.
- * 
- * This can be used for Strings - the display string
- * will simply be the String itself.
- */
-public class SimpleDisplayable
-	extends AbstractModel
-	implements Displayable
-{
-	/** The object to be converted to a Displayable. */
-	protected Object object;
-
-
-	/**
-	 * Construct a displayable for the specified object.
-	 */
-	public SimpleDisplayable(Object object) {
-		super();
-		this.object = object;
-	}
-
-	public SimpleDisplayable(boolean b) {
-		this(Boolean.valueOf(b));
-	}
-
-	public SimpleDisplayable(char c) {
-		this(new Character(c));
-	}
-
-	public SimpleDisplayable(byte b) {
-		this(new Byte(b));
-	}
-
-	public SimpleDisplayable(short s) {
-		this(new Short(s));
-	}
-
-	public SimpleDisplayable(int i) {
-		this(new Integer(i));
-	}
-
-	public SimpleDisplayable(long l) {
-		this(new Long(l));
-	}
-
-	public SimpleDisplayable(float f) {
-		this(new Float(f));
-	}
-
-	public SimpleDisplayable(double d) {
-		this(new Double(d));
-	}
-
-
-	// ********** Displayable implementation **********
-
-	public String displayString() {
-		return this.object.toString();
-	}
-
-	public Icon icon() {
-		return null;
-	}
-
-
-	// ********** Comparable implementation **********
-
-	public int compareTo(Displayable o) {
-		return DEFAULT_COMPARATOR.compare(this, o);
-	}
-
-
-	// ********** accessors **********
-
-	public Object getObject() {
-		return this.object;
-	}
-
-	public void setObject(Object object) {
-		String oldDisplayString = this.displayString();
-		Icon oldIcon = this.icon();
-		this.object = object;
-		this.firePropertyChanged(DISPLAY_STRING_PROPERTY, oldDisplayString, this.displayString());
-		this.firePropertyChanged(ICON_PROPERTY, oldIcon, this.icon());
-	}
-
-	public boolean getBoolean() {
-		return ((Boolean) this.object).booleanValue();
-	}
-
-	public void setBoolean(boolean b) {
-		this.setObject(Boolean.valueOf(b));
-	}
-
-	public char getChar() {
-		return ((Character) this.object).charValue();
-	}
-
-	public void setChar(char c) {
-		this.setObject(new Character(c));
-	}
-
-	public byte getByte() {
-		return ((Byte) this.object).byteValue();
-	}
-
-	public void setByte(byte b) {
-		this.setObject(new Byte(b));
-	}
-
-	public short getShort() {
-		return ((Short) this.object).shortValue();
-	}
-
-	public void setShort(short s) {
-		this.setObject(new Short(s));
-	}
-
-	public int getInt() {
-		return ((Integer) this.object).intValue();
-	}
-
-	public void setInt(int i) {
-		this.setObject(new Integer(i));
-	}
-
-	public long getLong() {
-		return ((Long) this.object).longValue();
-	}
-
-	public void setLong(long l) {
-		this.setObject(new Long(l));
-	}
-
-	public float getFloat() {
-		return ((Float) this.object).floatValue();
-	}
-
-	public void setFloat(float f) {
-		this.setObject(new Float(f));
-	}
-
-	public double getDouble() {
-		return ((Double) this.object).doubleValue();
-	}
-
-	public void setDouble(double d) {
-		this.setObject(new Double(d));
-	}
-
-
-	// ********** override methods **********
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.object);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/SimpleListBrowser.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/SimpleListBrowser.java
deleted file mode 100644
index 7215c6a387..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/SimpleListBrowser.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.swing;
-
-import javax.swing.Icon;
-import javax.swing.JComboBox;
-import javax.swing.JOptionPane;
-import javax.swing.ListModel;
-
-/**
- * This implementation of ListChooser.Browser uses a
- * JOptionPane to prompt the user for the selection. Subclasses 
- * can change the dialog's title, message, and/or icon.
- */
-public class SimpleListBrowser
-	implements ListChooser.ListBrowser 
-{
-	/** Default constructor */
-	protected SimpleListBrowser() {
-		super();
-	}
-	
-	/**
-	 * Prompt the user using a JOptionPane.
-	 */
-	public void browse(ListChooser chooser) {
-		Object selection = 
-			JOptionPane.showInputDialog(
-				chooser, 
-				this.message(chooser), 
-				this.title(chooser), 
-				this.messageType(chooser), 
-				this.icon(chooser), 
-				this.selectionValues(chooser), 
-				this.initialSelectionValue(chooser)
-			);
-		
-		if (selection != null) {
-			chooser.getModel().setSelectedItem(selection);
-		}
-	}
-	
-	protected Object message(JComboBox comboBox) {
-		return null;
-	}
-	
-	protected String title(JComboBox comboBox) {
-		return null;
-	}
-	
-	protected int messageType(JComboBox comboBox) {
-		return JOptionPane.QUESTION_MESSAGE;
-	}
-	
-	protected Icon icon(JComboBox comboBox) {
-		return null;
-	}
-	
-	protected Object[] selectionValues(JComboBox comboBox) {
-		return this.convertToArray(comboBox.getModel());
-	}
-	
-	protected Object initialSelectionValue(JComboBox comboBox) {
-		return comboBox.getModel().getSelectedItem();
-	}
-	
-	/**
-	 * Convert the list of objects in the specified list model
-	 * into an array.
-	 */
-	protected Object[] convertToArray(ListModel model) {
-		int size = model.getSize();
-		Object[] result = new Object[size];
-		for (int i = 0; i < size; i++) {
-			result[i] = model.getElementAt(i);
-		}
-		return result;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/SimpleListCellRenderer.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/SimpleListCellRenderer.java
deleted file mode 100644
index ea649ba33d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/SimpleListCellRenderer.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.swing;
-
-import java.awt.Component;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.Icon;
-import javax.swing.JList;
-
-/**
- * This renderer should behave the same as the DefaultListCellRenderer;
- * but it slightly refactors the calculation of the icon and text of the list
- * cell so that subclasses can easily override the methods that build
- * the icon and text.
- * 
- * In most cases, you need only override:
- *     #buildIcon(Object value)
- *     #buildText(Object value)
- */
-public class SimpleListCellRenderer
-	extends DefaultListCellRenderer
-{
-
-	/**
-	 * Construct a simple renderer.
-	 */
-	public SimpleListCellRenderer() {
-		super();
-	}
-
-	@Override
-	public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-		// substitute null for the cell value so nothing is drawn initially...
-		super.getListCellRendererComponent(list, null, index, isSelected, cellHasFocus);
-		this.setOpaque(true);
-
-		// ...then set the icon and text manually
-		this.setIcon(this.buildIcon(list, value, index, isSelected, cellHasFocus));
-		this.setText(this.buildText(list, value, index, isSelected, cellHasFocus));
-
-		this.setToolTipText(this.buildToolTipText(list, value, index, isSelected, cellHasFocus));
-
-		// the context will be initialized only if a reader is running
-		if (this.accessibleContext != null) {
-			this.accessibleContext.setAccessibleName(this.buildAccessibleName(list, value, index, isSelected, cellHasFocus));
-		}
-
-		return this;
-	}
-
-	/**
-	 * Return the icon representation of the specified cell
-	 * value and other settings. (Even more settings are
-	 * accessible via inherited getters: hasFocus, isEnabled, etc.)
-	 */
-	protected Icon buildIcon(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-		return this.buildIcon(value);
-	}
-
-	/**
-	 * Return the icon representation of the specified cell
-	 * value. The default is to display no icon at all unless the
-	 * value itself is an icon.
-	 */
-	protected Icon buildIcon(Object value) {
-		// replicate the default behavior
-		return (value instanceof Icon) ? (Icon) value : null;
-	}
-
-	/**
-	 * Return the textual representation of the specified cell
-	 * value and other settings. (Even more settings are
-	 * accessible via inherited getters: hasFocus, isEnabled, etc.)
-	 */
-	protected String buildText(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-		return this.buildText(value);
-	}
-
-	/**
-	 * Return the textual representation of the specified cell
-	 * value. The default is to display the object's default string
-	 * representation (as returned by #toString()); unless the
-	 * value itself is an icon, in which case no text is displayed.
-	 */
-	protected String buildText(Object value) {
-		return (value instanceof Icon) ? "" : ((value == null) ? "" : value.toString());
-	}
-
-	/**
-	 * Return the text displayed when the cursor lingers over the specified cell.
-	 * (Even more settings are accessible via inherited getters: hasFocus, isEnabled, etc.)
-	 */
-	protected String buildToolTipText(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-		return this.buildToolTipText(value);
-	}
-
-	/**
-	 * Return the text displayed when the cursor lingers over the specified cell.
-	 */
-	protected String buildToolTipText(Object value) {
-		return null;
-	}
-
-	/**
-	 * Return the accessible name to be given to the component used to render
-	 * the given value and other settings. (Even more settings are accessible via
-	 * inherited getters: hasFocus, isEnabled, etc.)
-	 */
-	protected String buildAccessibleName(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-		return this.buildAccessibleName(value);
-	}
-
-	/**
-	 * Return the accessible name to be given to the component used to render
-	 * the given value.
-	 */
-	protected String buildAccessibleName(Object value) {
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/SpinnerTableCellRenderer.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/SpinnerTableCellRenderer.java
deleted file mode 100644
index a15e16a570..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/SpinnerTableCellRenderer.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.swing;
-
-import java.awt.Color;
-import java.awt.Component;
-import javax.swing.BorderFactory;
-import javax.swing.JComponent;
-import javax.swing.JSpinner;
-import javax.swing.JTable;
-import javax.swing.SpinnerModel;
-import javax.swing.UIManager;
-import javax.swing.border.Border;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-/**
- * Make the cell look like a spinner.
- */
-public class SpinnerTableCellRenderer implements TableCellEditorAdapter.Renderer {
-
-	/** the component used to paint the cell */
-	protected JSpinner spinner;
-	
-	/** the listener to be notified on an immediate edit */
-	protected TableCellEditorAdapter.ImmediateEditListener immediateEditListener;
-	
-	
-	// ********** constructors/initialization **********
-
-	/**
-	 * Construct a cell renderer that uses the default
-	 * spinner model, which is a "number" model.
-	 */
-	public SpinnerTableCellRenderer() {
-		super();
-		this.initialize();
-	}
-
-	/**
-	 * Construct a cell renderer that uses the specified
-	 * spinner model, which will determine how the values are displayed.
-	 */
-	public SpinnerTableCellRenderer(SpinnerModel model) {
-		this();
-		this.setModel(model);
-	}
-
-	protected void initialize() {
-		this.spinner = this.buildSpinner();
-	}
-
-	protected JSpinner buildSpinner() {
-		JSpinner s = new JSpinner();
-		s.addChangeListener(this.buildChangeListener());
-		return s;
-	}
-	
-	private ChangeListener buildChangeListener() {
-		return new ChangeListener() {
-			public void stateChanged(ChangeEvent e) {
-				if (SpinnerTableCellRenderer.this.immediateEditListener != null) {
-					SpinnerTableCellRenderer.this.immediateEditListener.immediateEdit();
-				}
-			}
-		};
-	}
-
-
-	// ********** TableCellRenderer implementation **********
-
-	public Component getTableCellRendererComponent(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) {
-		this.spinner.setComponentOrientation(table.getComponentOrientation());
-		this.spinner.setFont(table.getFont());
-		this.spinner.setEnabled(table.isEnabled());
-
-		JComponent editor = this.editor();
-		editor.setForeground(this.foregroundColor(table, value, selected, hasFocus, row, column));
-		editor.setBackground(this.backgroundColor(table, value, selected, hasFocus, row, column));
-		this.spinner.setBorder(this.border(table, value, selected, hasFocus, row, column));
-
-		this.setValue(value);
-		return this.spinner;
-	}
-
-	/**
-	 * Return the cell's foreground color.
-	 */
-	protected Color foregroundColor(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) {
-		if (selected) {
-			if (hasFocus && table.isCellEditable(row, column)) {
-				return UIManager.getColor("Table.focusCellForeground");
-			}
-			return table.getSelectionForeground();
-		}
-		return table.getForeground();
-	}
-
-	/**
-	 * Return the cell's background color.
-	 */
-	protected Color backgroundColor(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) {
-		if (selected) {
-			if (hasFocus && table.isCellEditable(row, column)) {
-				return UIManager.getColor("Table.focusCellBackground");
-			}
-			return table.getSelectionBackground();
-		}
-		return table.getBackground();
-	}
-
-	/**
-	 * Return the cell's border.
-	 */
-	protected Border border(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) {
-		if (hasFocus) {
-			return UIManager.getBorder("Table.focusCellHighlightBorder");
-		}
-		if (selected) {
-			return BorderFactory.createLineBorder(table.getSelectionBackground(), 1);
-		}
-		return BorderFactory.createLineBorder(table.getBackground(), 1);
-	}
-
-	/**
-	 * Return the editor component whose colors should be set
-	 * by the renderer.
-	 */
-	protected JComponent editor() {
-		JComponent editor = this.spinner.getEditor();
-		if (editor instanceof JSpinner.DefaultEditor) {
-			// typically, the editor will be the default or one of its subclasses...
-			editor = ((JSpinner.DefaultEditor) editor).getTextField();
-		}
-		return editor;
-	}
-
-	/**
-	 * Set the spinner's value
-	 */
-	protected void setValue(Object value) {
-		// CR#3999318 - This null check needs to be removed once JDK bug is fixed
-		if (value == null) {
-			value = new Integer(0);
-		}
-		this.spinner.setValue(value);
-	}
-
-
-	// ********** TableCellEditorAdapter.Renderer implementation **********
-
-	public Object getValue() {
-		return this.spinner.getValue();
-	}
-	
-	public void setImmediateEditListener(TableCellEditorAdapter.ImmediateEditListener listener) {
-		this.immediateEditListener = listener;
-	}
-
-
-	// ********** public API **********
-
-	/**
-	 * Set the spinner's model.
-	 */
-	public void setModel(SpinnerModel model) {
-		this.spinner.setModel(model);
-	}
-
-	/**
-	 * Return the renderer's preferred height. This allows you
-	 * to set the row height to something the spinner will look good in....
-	 */
-	public int preferredHeight() {
-		// add in space for the border top and bottom
-		return (int) this.spinner.getPreferredSize().getHeight() + 2;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/TableCellEditorAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/TableCellEditorAdapter.java
deleted file mode 100644
index b19c86f08d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/swing/TableCellEditorAdapter.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.internal.swing;
-
-import java.awt.Component;
-import javax.swing.AbstractCellEditor;
-import javax.swing.JTable;
-import javax.swing.table.TableCellEditor;
-import javax.swing.table.TableCellRenderer;
-
-/**
- * A table cell editor that wraps a table cell renderer.
- */
-public class TableCellEditorAdapter extends AbstractCellEditor implements TableCellEditor {
-
-	/** delegate to a renderer */
-	private Renderer renderer;
-	
-	
-	// ********** constructors/initialization **********
-	
-	private TableCellEditorAdapter() {
-		super();
-	}
-	
-	/**
-	 * Construct a cell editor that behaves like the specified renderer.
-	 */
-	public TableCellEditorAdapter(Renderer renderer) {
-		this();
-		this.initialize(renderer);
-	}
-	
-	protected void initialize(Renderer r) {
-		this.renderer = r;
-		r.setImmediateEditListener(this.buildImmediateEditListener());
-	}
-	
-	private ImmediateEditListener buildImmediateEditListener() {
-		return new ImmediateEditListener() {
-			public void immediateEdit() {
-				TableCellEditorAdapter.this.stopCellEditing();
-			}
-		};
-	}
-	
-	
-	// ********** CellEditor implementation **********
-	
-	public Object getCellEditorValue() {
-		return this.renderer.getValue();
-	}
-	
-	
-	// ********** TableCellEditor implementation **********
-
-	public Component getTableCellEditorComponent(JTable table, Object value, boolean selected, int row, int column) {
-		return this.renderer.getTableCellRendererComponent(table, value, selected, true, row, column);
-	}
-	
-	
-	// ********** Member classes **********************************************
-	
-	/**
-	 * This interface defines the methods that must be implemented by a renderer
-	 * that can be wrapped by a TableCellEditorAdapter.
-	 */
-	public interface Renderer extends TableCellRenderer {
-		
-		/**
-		 * Return the current value of the renderer.
-		 */
-		Object getValue();
-		
-		/**
-		 * Set the immediate edit listener
-		 */
-		void setImmediateEditListener(ImmediateEditListener listener);
-	}
-	
-	
-	public interface ImmediateEditListener {
-		
-		/**
-		 * Called when the renderer does an "immediate edit"
-		 */
-		void immediateEdit();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/Model.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/Model.java
deleted file mode 100644
index 33f2fd2afd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/Model.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model;
-
-import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.listener.StateChangeListener;
-import org.eclipse.jpt.utility.model.listener.TreeChangeListener;
-
-/**
- * Interface to be implemented by models that notify listeners of
- * changes to bound properties, collections, lists, and/or trees.
- * 
- * 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 Model {
-
-	// ********** state change **********
-
-	/**
-	 * Add a listener that listens to all state change events.
-	 * The same listener may be added more than once and will be called
-	 * as many times as it is added. The listener cannot be null.
-	 */
-	void addStateChangeListener(StateChangeListener listener);
-
-	/**
-	 * Remove the specified state change listener. If the listener
-	 * was added more than once, it will be notified one less time
-	 * after being removed. An exception will be thrown if the
-	 * listener is null or if the listener was never added.
-	 */
-	void removeStateChangeListener(StateChangeListener listener);
-
-
-	// ********** property change **********
-
-	/**
-	 * Add a listener that listens to all property change events,
-	 * regardless of the property name associated with that event.
-	 * The same listener may be added more than once and will be called
-	 * as many times as it is added. The listener cannot be null.
-	 */
-	void addPropertyChangeListener(PropertyChangeListener listener);
-
-	/**
-	 * Add a listener that listens to all property change events with
-	 * the specified property name.
-	 * The same listener may be added more than once and will be called
-	 * as many times as it is added. The listener cannot be null.
-	 */
-	void addPropertyChangeListener(String propertyName, PropertyChangeListener listener);
-
-	/**
-	 * Remove a listener that listens to all property change events,
-	 * regardless of the property name associated with that event.
-	 * If the listener was added more than once, it will be notified one less
-	 * time after being removed. An exception will be thrown if the
-	 * listener is null or if the listener was never added.
-	 */
-	void removePropertyChangeListener(PropertyChangeListener listener);
-
-	/**
-	 * Remove a listener that listens to all property change events,
-	 * with the specified property name.
-	 * If the listener was added more than once, it will be notified one less
-	 * time after being removed. An exception will be thrown if the
-	 * listener is null or if the listener was never added.
-	 */
-	void removePropertyChangeListener(String propertyName, PropertyChangeListener listener);
-
-
-	// ********** collection change **********
-
-	/**
-	 * Add a listener that listens to all collection change events,
-	 * regardless of the collection name associated with that event.
-	 * The same listener may be added more than once and will be called
-	 * as many times as it is added. The listener cannot be null.
-	 */
-	void addCollectionChangeListener(CollectionChangeListener listener);
-
-	/**
-	 * Add a listener that listens to all collection change events with
-	 * the specified collection name.
-	 * The same listener may be added more than once and will be called
-	 * as many times as it is added. The listener cannot be null.
-	 */
-	void addCollectionChangeListener(String collectionName, CollectionChangeListener listener);
-
-	/**
-	 * Remove a listener that listens to all collection change events,
-	 * regardless of the collection name associated with that event.
-	 * If the listener was added more than once, it will be notified one less
-	 * time after being removed. An exception will be thrown if the
-	 * listener is null or if the listener was never added.
-	 */
-	void removeCollectionChangeListener(CollectionChangeListener listener);
-
-	/**
-	 * Remove a listener that listens to all collection change events,
-	 * with the specified collection name.
-	 * If the listener was added more than once, it will be notified one less
-	 * time after being removed. An exception will be thrown if the
-	 * listener is null or if the listener was never added.
-	 */
-	void removeCollectionChangeListener(String collectionName, CollectionChangeListener listener);
-
-
-	// ********** list change **********
-
-	/**
-	 * Add a listener that listens to all list change events,
-	 * regardless of the list name associated with that event.
-	 * The same listener may be added more than once and will be called
-	 * as many times as it is added. The listener cannot be null.
-	 */
-	void addListChangeListener(ListChangeListener listener);
-
-	/**
-	 * Add a listener that listens to all list change events with
-	 * the specified list name.
-	 * The same listener may be added more than once and will be called
-	 * as many times as it is added. The listener cannot be null.
-	 */
-	void addListChangeListener(String listName, ListChangeListener listener);
-
-	/**
-	 * Remove a listener that listens to all list change events,
-	 * regardless of the list name associated with that event.
-	 * If the listener was added more than once, it will be notified one less
-	 * time after being removed. An exception will be thrown if the
-	 * listener is null or if the listener was never added.
-	 */
-	void removeListChangeListener(ListChangeListener listener);
-
-	/**
-	 * Remove a listener that listens to all list change events,
-	 * with the specified list name.
-	 * If the listener was added more than once, it will be notified one less
-	 * time after being removed. An exception will be thrown if the
-	 * listener is null or if the listener was never added.
-	 */
-	void removeListChangeListener(String listName, ListChangeListener listener);
-
-
-	// ********** tree change **********
-
-	/**
-	 * Add a listener that listens to all tree change events,
-	 * regardless of the tree name associated with that event.
-	 * The same listener may be added more than once and will be called
-	 * as many times as it is added. The listener cannot be null.
-	 */
-	void addTreeChangeListener(TreeChangeListener listener);
-
-	/**
-	 * Add a listener that listens to all tree change events with
-	 * the specified tree name.
-	 * The same listener may be added more than once and will be called
-	 * as many times as it is added. The listener cannot be null.
-	 */
-	void addTreeChangeListener(String treeName, TreeChangeListener listener);
-
-	/**
-	 * Remove a listener that listens to all tree change events,
-	 * regardless of the tree name associated with that event.
-	 * If the listener was added more than once, it will be notified one less
-	 * time after being removed. An exception will be thrown if the
-	 * listener is null or if the listener was never added.
-	 */
-	void removeTreeChangeListener(TreeChangeListener listener);
-
-	/**
-	 * Remove a listener that listens to all tree change events,
-	 * with the specified tree name.
-	 * If the listener was added more than once, it will be notified one less
-	 * time after being removed. An exception will be thrown if the
-	 * listener is null or if the listener was never added.
-	 */
-	void removeTreeChangeListener(String treeName, TreeChangeListener listener);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/ChangeEvent.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/ChangeEvent.java
deleted file mode 100644
index 5217abbd65..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/ChangeEvent.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.event;
-
-import java.util.EventObject;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.model.Model;
-
-/**
- * Abstract class for all the change events that can be fired by models.
- * 
- * Provisional API: This class 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 abstract class ChangeEvent extends EventObject {
-
-	private static final long serialVersionUID = 1L;
-
-
-	/**
-	 * Construct a new change event.
-	 *
-	 * @param source The object on which the event initially occurred.
-	 */
-	protected ChangeEvent(Model source) {
-		super(source);
-	}
-
-	/**
-	 * Covariant override.
-	 */
-	@Override
-	public Model getSource() {
-		return (Model) super.getSource();
-	}
-
-	/**
-	 * Return the name of the aspect of the source that changed.
-	 * May be null if inappropriate.
-	 */
-	public abstract String getAspectName();
-
-	/**
-	 * Return a copy of the event with the specified source
-	 * replacing the current source.
-	 */
-	public abstract ChangeEvent cloneWithSource(Model newSource);
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.getAspectName());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/CollectionChangeEvent.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/CollectionChangeEvent.java
deleted file mode 100644
index 386026c786..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/CollectionChangeEvent.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.event;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import org.eclipse.jpt.utility.model.Model;
-
-/**
- * A "collection change" event gets delivered whenever a model changes a "bound"
- * or "constrained" collection. A CollectionChangeEvent is sent as an
- * argument to the CollectionChangeListener.
- * 
- * Normally a CollectionChangeEvent is accompanied by the collection name and
- * the items that were added to or removed from the changed collection.
- * 
- * Design options:
- * - create a collection to wrap a single added or removed item
- * 	(this is the option we implemented below and in collaborating code)
- * 	since there is no way to optimize downstream code for
- * 	single items, we take another performance hit by building
- * 	a collection each time  (@see Collections#singleton(Object))
- * 	and forcing downstream code to use an iterator every time
- * 
- * - fire a separate event for each item added or removed
- * 	eliminates any potential for optimizations to downstream code
- * 
- * - add protocol to support both single items and collections
- * 	adds conditional logic to downstream code
- * 
- * Provisional API: This class is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- */
-public class CollectionChangeEvent extends ChangeEvent {
-
-	/** Name of the collection that changed. */
-	private final String collectionName;
-
-	/** The items that were added to or removed from the collection. May be empty, if not known. */
-	private final Collection<?> items;
-
-	private static final long serialVersionUID = 1L;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a new collection change event.
-	 *
-	 * @param source The object on which the event initially occurred.
-	 * @param collectionName The programmatic name of the collection that was changed.
-	 * @param items The items that were added to or removed from the collection.
-	 */
-	public CollectionChangeEvent(Model source, String collectionName, Collection<?> items) {
-		super(source);
-		if ((collectionName == null) || (items == null)) {
-			throw new NullPointerException();
-		}
-		this.collectionName = collectionName;
-		this.items = Collections.unmodifiableCollection(items);
-	}
-
-	/**
-	 * Construct a new collection change event.
-	 *
-	 * @param source The object on which the event initially occurred.
-	 * @param collectionName The programmatic name of the collection that was changed.
-	 */
-	public CollectionChangeEvent(Model source, String collectionName) {
-		this(source, collectionName, Collections.emptySet());
-	}
-
-
-	// ********** standard state **********
-
-	/**
-	 * Return the programmatic name of the collection that was changed.
-	 */
-	public String getCollectionName() {
-		return this.collectionName;
-	}
-
-	@Override
-	public String getAspectName() {
-		return this.collectionName;
-	}
-
-	/**
-	 * Return an iterator on the items that were added to or
-	 * removed from the collection.
-	 * May be empty if inappropriate or unknown.
-	 */
-	public Iterator<?> items() {
-		return this.items.iterator();
-	}
-
-	/**
-	 * Return the number of items that were added to or
-	 * removed from the collection.
-	 * May be 0 if inappropriate or unknown.
-	 */
-	public int itemsSize() {
-		return this.items.size();
-	}
-
-
-	// ********** cloning **********
-
-	/**
-	 * Return a copy of the event with the specified source
-	 * replacing the current source.
-	 */
-	@Override
-	public CollectionChangeEvent cloneWithSource(Model newSource) {
-		return new CollectionChangeEvent(newSource, this.collectionName, this.items);
-	}
-
-	/**
-	 * Return a copy of the event with the specified source and collection name
-	 * replacing the current source and collection name.
-	 */
-	public CollectionChangeEvent cloneWithSource(Model newSource, String newCollectionName) {
-		return new CollectionChangeEvent(newSource, newCollectionName, this.items);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/ListChangeEvent.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/ListChangeEvent.java
deleted file mode 100644
index 9ec18ae194..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/ListChangeEvent.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.event;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.model.Model;
-
-/**
- * A "list change" event gets delivered whenever a model changes a "bound"
- * or "constrained" list. A ListChangeEvent is sent as an
- * argument to the ListChangeListener.
- * 
- * Normally a ListChangeEvent is accompanied by the list name,
- * the items that were added to or removed from the changed list,
- * and the index of where the items are or were in the list.
- * 
- * Design options:
- * - create a list to wrap a single added or removed item
- * 	(this is the option we implemented below and in collaborating code)
- * 	since there is no way to optimize downstream code for
- * 	single items, we take another performance hit by building
- * 	a list each time  (@see Collections#singletonList(Object))
- * 	and forcing downstream code to use a list iterator every time
- * 
- * - fire a separate event for each item added or removed
- * 	eliminates any potential for optimizations to downstream code
- * 
- * - add protocol to support both single items and collections
- * 	adds conditional logic to downstream code
- * 
- * Provisional API: This class is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- */
-public class ListChangeEvent extends ChangeEvent {
-
-	/**
-	 * Name of the list that changed.
-	 */
-	private final String listName;
-
-	/**
-	 * The index at which the items were added, removed, or replaced.
-	 * In the case of "moved" items, this will be the "target" index.
-	 * May be -1, if not known.
-	 */
-	private final int index;
-
-	/**
-	 * The items that were added to or removed from the list. In the case of
-	 * "replaced" items, these are the new items in the list.
-	 * In the case of "moved" items, this will be empty.
-	 * May be empty, if not known.
-	 */
-	private final List<?> items;
-
-	/**
-	 * The items in the list that were replaced by the items listed above,
-	 * in #items. May be empty, if not known.
-	 */
-	private final List<?> replacedItems;
-
-	/**
-	 * In the case of "moved" items, this will be the "source" index.
-	 * May be -1, if not known.
-	 */
-	private final int sourceIndex;
-
-	/**
-	 * In the case of "moved" items, this will be the number of items moved.
-	 * May be -1, if not known.
-	 */
-	private final int moveLength;
-
-	private static final long serialVersionUID = 1L;
-
-
-	// ********** constructors **********
-
-	protected ListChangeEvent(Model source, String listName, int index, List<?> items, List<?> replacedItems, int sourceIndex, int moveLength) {
-		super(source);
-		if ((listName == null) || (items == null) || (replacedItems == null)) {
-			throw new NullPointerException();
-		}
-		this.listName = listName;
-		this.index = index;
-		this.items = Collections.unmodifiableList(items);
-		this.replacedItems = Collections.unmodifiableList(replacedItems);
-		this.sourceIndex = sourceIndex;
-		this.moveLength = moveLength;
-	}
-
-	/**
-	 * Construct a new list change event for a list of replaced items.
-	 *
-	 * @param source The object on which the event initially occurred.
-	 * @param listName The programmatic name of the list that was changed.
-	 * @param index The index at which the items in the list were replaced.
-	 * @param items The new items in the list.
-	 * @param replacedItems The items in the list that were replaced.
-	 */
-	public ListChangeEvent(Model source, String listName, int index, List<?> items, List<?> replacedItems) {
-		this(source, listName, index, items, replacedItems, -1, -1);
-	}
-
-	/**
-	 * Construct a new list change event for a list of added or removed items.
-	 *
-	 * @param source The object on which the event initially occurred.
-	 * @param listName The programmatic name of the list that was changed.
-	 * @param index The index at which the items were added to or removed from the list.
-	 * @param items The items that were added to or removed from the list.
-	 */
-	public ListChangeEvent(Model source, String listName, int index, List<?> items) {
-		this(source, listName, index, items, Collections.emptyList(), -1, -1);
-	}
-
-	/**
-	 * Construct a new list change event for a list of moved items.
-	 *
-	 * @param source The object on which the event initially occurred.
-	 * @param listName The programmatic name of the list that was changed.
-	 * @param targetIndex The index to which the items were moved.
-	 * @param sourceIndex The index from which the items were moved.
-	 */
-	public ListChangeEvent(Model source, String listName, int targetIndex, int sourceIndex, int length) {
-		this(source, listName, targetIndex, Collections.emptyList(), Collections.emptyList(), sourceIndex, length);
-	}
-
-	/**
-	 * Construct a new list change event.
-	 *
-	 * @param source The object on which the event initially occurred.
-	 * @param listName The programmatic name of the list that was changed.
-	 */
-	public ListChangeEvent(Model source, String listName) {
-		this(source, listName, -1, Collections.emptyList(), Collections.emptyList(), -1, -1);
-	}
-
-
-	// ********** standard state **********
-
-	/**
-	 * Return the programmatic name of the list that was changed.
-	 */
-	public String getListName() {
-		return this.listName;
-	}
-
-	@Override
-	public String getAspectName() {
-		return this.listName;
-	}
-
-	/**
-	 * Return the index at which the items were added to, removed from,
-	 * or replaced in the list.
-	 * In the case of "moved" items, this will be the "target" index.
-	 * May be -1 if inappropriate or unknown.
-	 */
-	public int getIndex() {
-		return this.index;
-	}
-
-	/**
-	 * Return a list iterator on the items that were added to or
-	 * removed from the list. In the case of "replaced" items, these
-	 * are the new items in the list.
-	 * May be empty if inappropriate or unknown.
-	 */
-	public ListIterator<?> items() {
-		return this.items.listIterator();
-	}
-
-	/**
-	 * Return the number of items that were added to,
-	 * removed from, or replaced in the list.
-	 * May be 0 if inappropriate or unknown.
-	 */
-	public int itemsSize() {
-		return this.items.size();
-	}
-
-
-	// ********** replace **********
-
-	/**
-	 * Return a list iterator on the items in the list that were replaced.
-	 * May be empty if inappropriate or unknown.
-	 */
-	public ListIterator<?> replacedItems() {
-		return this.replacedItems.listIterator();
-	}
-
-
-	// ********** move **********
-
-	/**
-	 * In the case of "moved" items, this will be the "target" index.
-	 * May be -1 if inappropriate or unknown.
-	 */
-	public int getTargetIndex() {
-		return this.index;
-	}
-
-	/**
-	 * In the case of "moved" items, this will be the "source" index.
-	 * May be -1 if inappropriate or unknown.
-	 */
-	public int getSourceIndex() {
-		return this.sourceIndex;
-	}
-
-	/**
-	 * In the case of "moved" items, this will be the number of items moved.
-	 * May be -1 if inappropriate or unknown.
-	 */
-	public int getMoveLength() {
-		return this.moveLength;
-	}
-
-
-	// ********** cloning **********
-
-	/**
-	 * Return a copy of the event with the specified source
-	 * replacing the current source.
-	 */
-	@Override
-	public ListChangeEvent cloneWithSource(Model newSource) {
-		return new ListChangeEvent(newSource, this.listName, this.index, this.items, this.replacedItems, this.sourceIndex, this.moveLength);
-	}
-
-	/**
-	 * Return a copy of the event with the specified source and list name
-	 * replacing the current source and list name.
-	 */
-	public ListChangeEvent cloneWithSource(Model newSource, String newListName) {
-		return new ListChangeEvent(newSource, newListName, this.index, this.items, this.replacedItems, this.sourceIndex, this.moveLength);
-	}
-
-	/**
-	 * Return a copy of the event with the specified source and list name
-	 * replacing the current source and list name and displacing
-	 * the index by the specified amount.
-	 */
-	public ListChangeEvent cloneWithSource(Model newSource, String newListName, int offset) {
-		return new ListChangeEvent(newSource, newListName, this.index + offset, this.items, this.replacedItems, this.sourceIndex + offset, this.moveLength);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/PropertyChangeEvent.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/PropertyChangeEvent.java
deleted file mode 100644
index ee2fa2f8b2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/PropertyChangeEvent.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.event;
-
-import org.eclipse.jpt.utility.model.Model;
-
-/**
- * A "property change" event gets delivered whenever a model changes a "bound"
- * or "constrained" property. A PropertyChangeEvent is sent as an
- * argument to the PropertyChangeListener.
- * 
- * Provisional API: This class is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- */
-public class PropertyChangeEvent extends ChangeEvent {
-
-	/** Name of the property that changed. */
-	private final String propertyName;
-
-	/** The property's old value, before the change. */
-	private final Object oldValue;
-
-	/** The property's new value, after the change. */
-	private final Object newValue;
-
-	private static final long serialVersionUID = 1L;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a new property change event.
-	 *
-	 * @param source The object on which the event initially occurred.
-	 * @param propertyName The programmatic name of the property that was changed.
-	 * @param oldValue The old value of the property.
-	 * @param newValue The new value of the property.
-	 */
-	public PropertyChangeEvent(Model source, String propertyName, Object oldValue, Object newValue) {
-		super(source);
-		if (propertyName == null) {
-			throw new NullPointerException();
-		}
-		this.propertyName = propertyName;
-		this.oldValue = oldValue;
-		this.newValue = newValue;
-	}
-
-
-	// ********** standard state **********
-
-	/**
-	 * Return the programmatic name of the property that was changed.
-	 */
-	public String getPropertyName() {
-		return this.propertyName;
-	}
-
-	@Override
-	public String getAspectName() {
-		return this.propertyName;
-	}
-
-	/**
-	 * Return the old value of the property.
-	 */
-	public Object getOldValue() {
-		return this.oldValue;
-	}
-
-	/**
-	 * Return the new value of the property.
-	 */
-	public Object getNewValue() {
-		return this.newValue;
-	}
-
-
-	// ********** cloning **********
-
-	@Override
-	public PropertyChangeEvent cloneWithSource(Model newSource) {
-		return new PropertyChangeEvent(newSource, this.propertyName, this.oldValue, this.newValue);
-	}
-
-	/**
-	 * Return a copy of the event with the specified source
-	 * replacing the current source and the property name.
-	 */
-	public PropertyChangeEvent cloneWithSource(Model newSource, String newPropertyName) {
-		return new PropertyChangeEvent(newSource, newPropertyName, this.oldValue, this.newValue);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/StateChangeEvent.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/StateChangeEvent.java
deleted file mode 100644
index 52e3690e69..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/StateChangeEvent.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.event;
-
-import org.eclipse.jpt.utility.model.Model;
-
-/**
- * A generic "state change" event gets delivered whenever a model changes to 
- * such extent that it cannot be delineated all aspects of it that have changed. 
- * A StateChangeEvent is sent as an argument to the StateChangeListener.
- * 
- * Provisional API: This class is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- */
-public class StateChangeEvent extends ChangeEvent {
-
-	private static final long serialVersionUID = 1L;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a new state change event.
-	 *
-	 * @param source The object on which the event initially occurred.
-	 */
-	public StateChangeEvent(Model source) {
-		super(source);
-	}
-
-
-	// ********** standard state **********
-
-	@Override
-	public String getAspectName() {
-		return null;  // the point of the event is that the name is unknown...
-	}
-
-
-	// ********** cloning **********
-
-	@Override
-	public StateChangeEvent cloneWithSource(Model newSource) {
-		return new StateChangeEvent(newSource);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/TreeChangeEvent.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/TreeChangeEvent.java
deleted file mode 100644
index 2272020490..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/TreeChangeEvent.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.event;
-
-import org.eclipse.jpt.utility.model.Model;
-
-/**
- * A "tree change" event gets delivered whenever a model changes a "bound"
- * or "constrained" tree. A TreeChangeEvent is sent as an
- * argument to the TreeChangeListener.
- * 
- * Normally a TreeChangeEvent is accompanied by the tree name and a path
- * to the part of the tree that was changed.
- * 
- * Provisional API: This class is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- */
-public class TreeChangeEvent extends ChangeEvent {
-
-	/** Name of the tree that changed. */
-	private final String treeName;
-
-    /**
-     * Path to the parent of the part of the tree that was changed.
-     * May be empty, if not known or if the entire tree changed.
-     */
-	protected final Object[] path;
-
-	private static final Object[] EMPTY_PATH = new Object[0];
-
-	private static final long serialVersionUID = 1L;
-
-
-	// ********** constructors **********
-
-	/**
-	 * Construct a new tree change event.
-	 *
-	 * @param source The object on which the event initially occurred.
-	 * @param treeName The programmatic name of the tree that was changed.
-	 * @param path The path to the part of the tree that was changed.
-	 */
-	public TreeChangeEvent(Model source, String treeName, Object[] path) {
-		super(source);
-		if ((treeName == null) || (path == null)) {
-			throw new NullPointerException();
-		}
-		this.treeName = treeName;
-		this.path = path;
-	}
-	
-	/**
-	 * Construct a new tree change event.
-	 *
-	 * @param source The object on which the event initially occurred.
-	 * @param treeName The programmatic name of the tree that was changed.
-	 */
-	public TreeChangeEvent(Model source, String treeName) {
-		this(source, treeName, EMPTY_PATH);
-	}
-	
-
-	// ********** standard state **********
-
-	/**
-	 * Return the programmatic name of the tree that was changed.
-	 */
-	public String getTreeName() {
-		return this.treeName;
-	}
-
-	@Override
-	public String getAspectName() {
-		return this.treeName;
-	}
-
-	/**
-	 * Return the path to the part of the tree that was changed.
-	 * May be empty, if not known.
-	 */
-	public Object[] getPath() {
-		return this.path;
-	}
-
-
-	// ********** cloning **********
-
-	@Override
-	public TreeChangeEvent cloneWithSource(Model newSource) {
-		return new TreeChangeEvent(newSource, this.treeName, this.path);
-	}
-
-	/**
-	 * Return a copy of the event with the specified source
-	 * replacing the current source and the tree name.
-	 */
-	public TreeChangeEvent cloneWithSource(Model newSource, String newTreeName) {
-		return new TreeChangeEvent(newSource, newTreeName, this.path);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/ChangeListener.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/ChangeListener.java
deleted file mode 100644
index d29a7a7de2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/ChangeListener.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.listener;
-
-import java.util.EventListener;
-
-/**
- * Marker interface.
- * 
- * 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 ChangeListener extends EventListener {
-	// nothing for now
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/CollectionChangeAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/CollectionChangeAdapter.java
deleted file mode 100644
index 88b1359e16..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/CollectionChangeAdapter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.listener;
-
-import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
-
-/**
- * Convenience implementation of CollectionChangeListener.
- * 
- * Provisional API: This class is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- */
-public class CollectionChangeAdapter implements CollectionChangeListener {
-
-	/**
-	 * Default constructor.
-	 */
-	public CollectionChangeAdapter() {
-		super();
-	}
-
-	public void itemsAdded(CollectionChangeEvent event) {
-		// do nothing
-	}
-
-	public void itemsRemoved(CollectionChangeEvent event) {
-		// do nothing
-	}
-
-	public void collectionCleared(CollectionChangeEvent event) {
-		// do nothing
-	}
-
-	public void collectionChanged(CollectionChangeEvent event) {
-		// do nothing
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/CollectionChangeListener.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/CollectionChangeListener.java
deleted file mode 100644
index 210388b923..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/CollectionChangeListener.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.listener;
-
-import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
-
-/**
- * A "collection change" event gets fired whenever a model changes a "bound"
- * collection. You can register a CollectionChangeListener with a source
- * model so as to be notified of any bound collection updates.
- * 
- * 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 CollectionChangeListener extends ChangeListener {
-
-	/**
-	 * This method gets called when items are added to a bound collection.
-	 * 
-	 * @param event A CollectionChangeEvent describing the event source,
-	 * the collection that changed, and the items that were added.
-	 */
-	void itemsAdded(CollectionChangeEvent event);
-
-	/**
-	 * This method gets called when items are removed from a bound collection.
-	 * 
-	 * @param event A CollectionChangeEvent describing the event source,
-	 * the collection that changed, and the items that were removed.
-	 */
-	void itemsRemoved(CollectionChangeEvent event);
-
-	/**
-	 * This method gets called when a bound collection is cleared.
-	 * 
-	 * @param event A CollectionChangeEvent describing the event source 
-	 * and the collection that changed.
-	 */
-	void collectionCleared(CollectionChangeEvent event);
-
-	/**
-	 * This method gets called when a bound collection is changed in a manner
-	 * that is not easily characterized by the other methods in this interface.
-	 * 
-	 * @param event A CollectionChangeEvent describing the event source 
-	 * and the collection that changed.
-	 */
-	void collectionChanged(CollectionChangeEvent event);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/ListChangeAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/ListChangeAdapter.java
deleted file mode 100644
index 052abc5cf4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/ListChangeAdapter.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.listener;
-
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-
-/**
- * Convenience implementation of ListChangeListener.
- * 
- * Provisional API: This class is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- */
-public class ListChangeAdapter implements ListChangeListener {
-
-	/**
-	 * Default constructor.
-	 */
-	public ListChangeAdapter() {
-		super();
-	}
-
-	public void itemsAdded(ListChangeEvent event) {
-		// do nothing
-	}
-
-	public void itemsRemoved(ListChangeEvent event) {
-		// do nothing
-	}
-
-	public void itemsReplaced(ListChangeEvent event) {
-		// do nothing
-	}
-
-	public void itemsMoved(ListChangeEvent event) {
-		// do nothing
-	}
-
-	public void listCleared(ListChangeEvent event) {
-		// do nothing
-	}
-
-	public void listChanged(ListChangeEvent event) {
-		// do nothing
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/ListChangeListener.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/ListChangeListener.java
deleted file mode 100644
index 74eab3a002..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/ListChangeListener.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.listener;
-
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-
-/**
- * A "list change" event gets fired whenever a model changes a "bound"
- * list. You can register a ListChangeListener with a source
- * model so as to be notified of any bound list updates.
- * 
- * 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 ListChangeListener extends ChangeListener {
-
-	/**
-	 * This method gets called when items are added to a bound list.
-	 * 
-	 * @param event A ListChangeEvent describing the event source,
-	 * the list that changed, the items that were added, and the index
-	 * at which the items were added.
-	 */
-	void itemsAdded(ListChangeEvent event);
-
-	/**
-	 * This method gets called when items are removed from a bound list.
-	 * 
-	 * @param event A ListChangeEvent describing the event source,
-	 * the list that changed, the items that were removed, and the index
-	 * at which the items were removed.
-	 */
-	void itemsRemoved(ListChangeEvent event);
-
-	/**
-	 * This method gets called when items in a bound list are replaced.
-	 * 
-	 * @param event A ListChangeEvent describing the event source,
-	 * the list that changed, the items that were added, the items that were
-	 * replaced, and the index at which the items were replaced.
-	 */
-	void itemsReplaced(ListChangeEvent event);
-
-	/**
-	 * This method gets called when items in a bound list are moved.
-	 * 
-	 * @param event A ListChangeEvent describing the event source,
-	 * the list that changed, and the indices of where items were moved
-	 * from and to.
-	 */
-	void itemsMoved(ListChangeEvent event);
-
-	/**
-	 * This method gets called when a bound list is cleared.
-	 * 
-	 * @param event A ListChangeEvent object describing the event source 
-	 * and the list that changed.
-	 */
-	void listCleared(ListChangeEvent event);
-
-	/**
-	 * This method gets called when a bound list is changed in a manner
-	 * that is not easily characterized by the other methods in this interface.
-	 * 
-	 * @param event A ListChangeEvent object describing the event source 
-	 * and the list that changed.
-	 */
-	void listChanged(ListChangeEvent event);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/MultiMethodReflectiveChangeListener.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/MultiMethodReflectiveChangeListener.java
deleted file mode 100644
index 9b69de5195..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/MultiMethodReflectiveChangeListener.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.listener;
-
-import java.lang.reflect.Method;
-import org.eclipse.jpt.utility.internal.ClassTools;
-import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.event.TreeChangeEvent;
-
-/**
- * This class is used by ReflectiveChangeListener when the requested listener
- * needs to implement multiple methods (i.e. CollectionChangeListener,
- * ListChangeListener, or TreeChangeListener).
- */
-class MultiMethodReflectiveChangeListener
-	extends ReflectiveChangeListener 
-	implements CollectionChangeListener, ListChangeListener, TreeChangeListener
-{
-	/** the methods we will invoke on the target object */
-	private final Method addMethod;
-	private final Method removeMethod;
-	private final Method replaceMethod;	// this can be null
-	private final Method moveMethod;	// this can be null
-	private final Method clearMethod;
-	private final Method changeMethod;
-
-
-	/**
-	 * The "replace" and "move" methods are optional.
-	 */
-	MultiMethodReflectiveChangeListener(Object target, Method addMethod, Method removeMethod, Method replaceMethod, Method moveMethod, Method clearMethod, Method changeMethod) {
-		super(target);
-		this.addMethod = addMethod;
-		this.removeMethod = removeMethod;
-		this.replaceMethod = replaceMethod;
-		this.moveMethod = moveMethod;
-		this.clearMethod = clearMethod;
-		this.changeMethod = changeMethod;
-	}
-
-	/**
-	 * No "replace" or "move" methods.
-	 */
-	MultiMethodReflectiveChangeListener(Object target, Method addMethod, Method removeMethod, Method clearMethod, Method changeMethod) {
-		this(target, addMethod, removeMethod, null, null, clearMethod, changeMethod);
-	}
-
-
-	// ********** CollectionChangeListener implementation **********
-
-	private void invoke(Method method, CollectionChangeEvent event) {
-		if (method.getParameterTypes().length == 0) {
-			ClassTools.executeMethod(method, this.target, EMPTY_COLLECTION_CHANGE_EVENT_ARRAY);
-		} else {
-			ClassTools.executeMethod(method, this.target, new CollectionChangeEvent[] {event});
-		}
-	}
-
-	public void itemsAdded(CollectionChangeEvent event) {
-		this.invoke(this.addMethod, event);
-	}
-
-	public void itemsRemoved(CollectionChangeEvent event) {
-		this.invoke(this.removeMethod, event);
-	}
-
-	public void collectionCleared(CollectionChangeEvent event) {
-		this.invoke(this.clearMethod, event);
-	}
-
-	public void collectionChanged(CollectionChangeEvent event) {
-		this.invoke(this.changeMethod, event);
-	}
-
-
-	// ********** ListChangeListener implementation **********
-
-	private void invoke(Method method, ListChangeEvent event) {
-		if (method.getParameterTypes().length == 0) {
-			ClassTools.executeMethod(method, this.target, EMPTY_LIST_CHANGE_EVENT_ARRAY);
-		} else {
-			ClassTools.executeMethod(method, this.target, new ListChangeEvent[] {event});
-		}
-	}
-
-	public void itemsAdded(ListChangeEvent event) {
-		this.invoke(this.addMethod, event);
-	}
-
-	public void itemsRemoved(ListChangeEvent event) {
-		this.invoke(this.removeMethod, event);
-	}
-
-	public void itemsReplaced(ListChangeEvent event) {
-		this.invoke(this.replaceMethod, event);
-	}
-
-	public void itemsMoved(ListChangeEvent event) {
-		this.invoke(this.moveMethod, event);
-	}
-
-	public void listCleared(ListChangeEvent event) {
-		this.invoke(this.clearMethod, event);
-	}
-
-	public void listChanged(ListChangeEvent event) {
-		this.invoke(this.changeMethod, event);
-	}
-
-
-	// ********** TreeChangeListener implementation **********
-
-	private void invoke(Method method, TreeChangeEvent event) {
-		if (method.getParameterTypes().length == 0) {
-			ClassTools.executeMethod(method, this.target, EMPTY_TREE_CHANGE_EVENT_ARRAY);
-		} else {
-			ClassTools.executeMethod(method, this.target, new TreeChangeEvent[] {event});
-		}
-	}
-
-	public void nodeAdded(TreeChangeEvent event) {
-		this.invoke(this.addMethod, event);
-	}
-
-	public void nodeRemoved(TreeChangeEvent event) {
-		this.invoke(this.removeMethod, event);
-	}
-
-	public void treeCleared(TreeChangeEvent event) {
-		this.invoke(this.clearMethod, event);
-	}
-
-	public void treeChanged(TreeChangeEvent event) {
-		this.invoke(this.changeMethod, event);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/PropertyChangeListener.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/PropertyChangeListener.java
deleted file mode 100644
index f76bed7d39..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/PropertyChangeListener.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.listener;
-
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-
-/**
- * A "property change" event gets fired whenever a model changes a "bound"
- * property. You can register a PropertyChangeListener with a source
- * model so as to be notified of any bound property updates.
- * 
- * 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 PropertyChangeListener extends ChangeListener {
-
-	/**
-	 * This method gets called when a model has changed a bound property.
-	 * 
-	 * @param event A StateChangeEvent describing the event source
-	 * and the property's old and new values.
-	 */
-	void propertyChanged(PropertyChangeEvent event);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/ReflectiveChangeListener.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/ReflectiveChangeListener.java
deleted file mode 100644
index 0cab7d7cbd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/ReflectiveChangeListener.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.listener;
-
-import java.lang.reflect.Method;
-import org.eclipse.jpt.utility.internal.ClassTools;
-import org.eclipse.jpt.utility.model.event.ChangeEvent;
-import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
-import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.event.StateChangeEvent;
-import org.eclipse.jpt.utility.model.event.TreeChangeEvent;
-
-/**
- * This factory builds listeners that reflectively forward ChangeEvents.
- * If you are worried about having too many little classes that have to be
- * loaded and maintained by the class loader, you can use one of these.
- * Of course, this comes with the additional overhead of reflection....
- * Also note that the validity of the method name is not checked at compile
- * time, but at runtime; although we *do* check the method as soon as the
- * listener is instantiated.
- * 
- * Provisional API: This class 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 abstract class ReflectiveChangeListener {
-
-	/** the target object on which we will invoke the method */
-	protected final Object target;
-
-
-	protected static final Class<StateChangeEvent> STATE_CHANGE_EVENT_CLASS = StateChangeEvent.class;
-	@SuppressWarnings("unchecked")
-	protected static final Class<StateChangeEvent>[] STATE_CHANGE_EVENT_CLASS_ARRAY = new Class[] {STATE_CHANGE_EVENT_CLASS};
-	protected static final StateChangeEvent[] EMPTY_STATE_CHANGE_EVENT_ARRAY = new StateChangeEvent[0];
-
-	protected static final Class<PropertyChangeEvent> PROPERTY_CHANGE_EVENT_CLASS = PropertyChangeEvent.class;
-	@SuppressWarnings("unchecked")
-	protected static final Class<PropertyChangeEvent>[] PROPERTY_CHANGE_EVENT_CLASS_ARRAY = new Class[] {PROPERTY_CHANGE_EVENT_CLASS};
-	protected static final PropertyChangeEvent[] EMPTY_PROPERTY_CHANGE_EVENT_ARRAY = new PropertyChangeEvent[0];
-
-	protected static final Class<CollectionChangeEvent> COLLECTION_CHANGE_EVENT_CLASS = CollectionChangeEvent.class;
-	@SuppressWarnings("unchecked")
-	protected static final Class<CollectionChangeEvent>[] COLLECTION_CHANGE_EVENT_CLASS_ARRAY = new Class[] {COLLECTION_CHANGE_EVENT_CLASS};
-	protected static final CollectionChangeEvent[] EMPTY_COLLECTION_CHANGE_EVENT_ARRAY = new CollectionChangeEvent[0];
-
-	protected static final Class<ListChangeEvent> LIST_CHANGE_EVENT_CLASS = ListChangeEvent.class;
-	@SuppressWarnings("unchecked")
-	protected static final Class<ListChangeEvent>[] LIST_CHANGE_EVENT_CLASS_ARRAY = new Class[] {LIST_CHANGE_EVENT_CLASS};
-	protected static final ListChangeEvent[] EMPTY_LIST_CHANGE_EVENT_ARRAY = new ListChangeEvent[0];
-
-	protected static final Class<TreeChangeEvent> TREE_CHANGE_EVENT_CLASS = TreeChangeEvent.class;
-	@SuppressWarnings("unchecked")
-	protected static final Class<TreeChangeEvent>[] TREE_CHANGE_EVENT_CLASS_ARRAY = new Class[] {TREE_CHANGE_EVENT_CLASS};
-	protected static final TreeChangeEvent[] EMPTY_TREE_CHANGE_EVENT_ARRAY = new TreeChangeEvent[0];
-
-
-
-	// ********** helper methods **********
-
-	/**
-	 * Find and return a method implemented by the target that can be invoked
-	 * reflectively when a change event occurs.
-	 */
-	private static Method findChangeListenerMethod(Object target, String methodName, Class<? extends ChangeEvent>[] eventClassArray) {
-		Method method;
-		try {
-			method = ClassTools.method(target, methodName, eventClassArray);
-		} catch (NoSuchMethodException ex1) {
-			try {
-				method = ClassTools.method(target, methodName);
-			} catch (NoSuchMethodException ex2) {
-				throw new RuntimeException(ex2);  // "checked" exceptions bite
-			}
-		}
-		return method;
-	}
-
-	/**
-	 * Check whether the specified method is suitable for being invoked when a
-	 * change event has occurred. Throw an exception if it is not suitable.
-	 */
-	private static void checkChangeListenerMethod(Method method, Class<? extends ChangeEvent> eventClass) {
-		Class<?>[] parmTypes = method.getParameterTypes();
-		int parmTypesLength = parmTypes.length;
-		if (parmTypesLength == 0) {
-			return;
-		}
-		if ((parmTypesLength == 1) && parmTypes[0].isAssignableFrom(eventClass)) {
-			return;
-		}
-		throw new IllegalArgumentException(method.toString());
-	}
-
-
-	// ********** factory methods: StateChangeListener **********
-
-	/**
-	 * Construct a state change listener that will invoke the specified method
-	 * on the specified target.
-	 */
-	public static StateChangeListener buildStateChangeListener(Object target, Method method) {
-		checkChangeListenerMethod(method, STATE_CHANGE_EVENT_CLASS);
-		return new SingleMethodReflectiveChangeListener(target, method);
-	}
-
-	/**
-	 * Construct a state change listener that will invoke the specified method
-	 * on the specified target. If a single-argument method with the specified
-	 * name and appropriate argument is found, it will be invoked; otherwise,
-	 * a zero-argument method with the specified name will be invoked.
-	 */
-	public static StateChangeListener buildStateChangeListener(Object target, String methodName) {
-		return buildStateChangeListener(target, findChangeListenerMethod(target, methodName, STATE_CHANGE_EVENT_CLASS_ARRAY));
-	}
-
-
-	// ********** factory methods: PropertyChangeListener **********
-
-	/**
-	 * Construct a property change listener that will invoke the specified method
-	 * on the specified target.
-	 */
-	public static PropertyChangeListener buildPropertyChangeListener(Object target, Method method) {
-		checkChangeListenerMethod(method, PROPERTY_CHANGE_EVENT_CLASS);
-		return new SingleMethodReflectiveChangeListener(target, method);
-	}
-
-	/**
-	 * Construct a property change listener that will invoke the specified method
-	 * on the specified target. If a single-argument method with the specified
-	 * name and appropriate argument is found, it will be invoked; otherwise,
-	 * a zero-argument method with the specified name will be invoked.
-	 */
-	public static PropertyChangeListener buildPropertyChangeListener(Object target, String methodName) {
-		return buildPropertyChangeListener(target, findChangeListenerMethod(target, methodName, PROPERTY_CHANGE_EVENT_CLASS_ARRAY));
-	}
-
-
-	// ********** factory methods: CollectionChangeListener **********
-
-	/**
-	 * Construct a collection change listener that will invoke the specified methods
-	 * on the specified target.
-	 */
-	public static CollectionChangeListener buildCollectionChangeListener(Object target, Method addMethod, Method removeMethod, Method clearMethod, Method changeMethod) {
-		checkChangeListenerMethod(addMethod, COLLECTION_CHANGE_EVENT_CLASS);
-		checkChangeListenerMethod(removeMethod, COLLECTION_CHANGE_EVENT_CLASS);
-		checkChangeListenerMethod(clearMethod, COLLECTION_CHANGE_EVENT_CLASS);
-		checkChangeListenerMethod(changeMethod, COLLECTION_CHANGE_EVENT_CLASS);
-		return new MultiMethodReflectiveChangeListener(target, addMethod, removeMethod, clearMethod, changeMethod);
-	}
-
-	/**
-	 * Construct a collection change listener that will invoke the specified method
-	 * on the specified target for any change event.
-	 */
-	public static CollectionChangeListener buildCollectionChangeListener(Object target, Method method) {
-		return buildCollectionChangeListener(target, method, method, method, method);
-	}
-
-	/**
-	 * Construct a collection change listener that will invoke the specified methods
-	 * on the specified target for change events. If a single-argument method
-	 * with the specified name and appropriate argument is found, it will be invoked;
-	 * otherwise, a zero-argument method with the specified name will be invoked.
-	 */
-	public static CollectionChangeListener buildCollectionChangeListener(Object target, String addMethodName, String removeMethodName, String clearMethodName, String changeMethodName) {
-		return buildCollectionChangeListener(
-				target,
-				findChangeListenerMethod(target, addMethodName, COLLECTION_CHANGE_EVENT_CLASS_ARRAY),
-				findChangeListenerMethod(target, removeMethodName, COLLECTION_CHANGE_EVENT_CLASS_ARRAY),
-				findChangeListenerMethod(target, clearMethodName, COLLECTION_CHANGE_EVENT_CLASS_ARRAY),
-				findChangeListenerMethod(target, changeMethodName, COLLECTION_CHANGE_EVENT_CLASS_ARRAY)
-		);
-	}
-
-	/**
-	 * Construct a collection change listener that will invoke the specified method
-	 * on the specified target for any change event. If a single-argument method
-	 * with the specified name and appropriate argument is found, it will be invoked;
-	 * otherwise, a zero-argument method with the specified name will be invoked.
-	 */
-	public static CollectionChangeListener buildCollectionChangeListener(Object target, String methodName) {
-		return buildCollectionChangeListener(target, findChangeListenerMethod(target, methodName, COLLECTION_CHANGE_EVENT_CLASS_ARRAY));
-	}
-
-
-	// ********** factory methods: ListChangeListener **********
-
-	/**
-	 * Construct a list change listener that will invoke the specified methods
-	 * on the specified target.
-	 */
-	public static ListChangeListener buildListChangeListener(Object target, Method addMethod, Method removeMethod, Method replaceMethod, Method moveMethod, Method clearMethod, Method changeMethod) {
-		checkChangeListenerMethod(addMethod, LIST_CHANGE_EVENT_CLASS);
-		checkChangeListenerMethod(removeMethod, LIST_CHANGE_EVENT_CLASS);
-		checkChangeListenerMethod(replaceMethod, LIST_CHANGE_EVENT_CLASS);
-		checkChangeListenerMethod(moveMethod, LIST_CHANGE_EVENT_CLASS);
-		checkChangeListenerMethod(clearMethod, LIST_CHANGE_EVENT_CLASS);
-		checkChangeListenerMethod(changeMethod, LIST_CHANGE_EVENT_CLASS);
-		return new MultiMethodReflectiveChangeListener(target, addMethod, removeMethod, replaceMethod, moveMethod, clearMethod, changeMethod);
-	}
-
-	/**
-	 * Construct a list change listener that will invoke the specified method
-	 * on the specified target for any change event.
-	 */
-	public static ListChangeListener buildListChangeListener(Object target, Method method) {
-		return buildListChangeListener(target, method, method, method, method, method, method);
-	}
-
-	/**
-	 * Construct a list change listener that will invoke the specified methods
-	 * on the specified target for change events. If a single-argument method
-	 * with the specified name and appropriate argument is found, it will be invoked;
-	 * otherwise, a zero-argument method with the specified name will be invoked.
-	 */
-	public static ListChangeListener buildListChangeListener(Object target, String addMethodName, String removeMethodName, String replaceMethodName, String moveMethodName, String clearMethodName, String changeMethodName) {
-		return buildListChangeListener(
-				target,
-				findChangeListenerMethod(target, addMethodName, LIST_CHANGE_EVENT_CLASS_ARRAY),
-				findChangeListenerMethod(target, removeMethodName, LIST_CHANGE_EVENT_CLASS_ARRAY),
-				findChangeListenerMethod(target, replaceMethodName, LIST_CHANGE_EVENT_CLASS_ARRAY),
-				findChangeListenerMethod(target, moveMethodName, LIST_CHANGE_EVENT_CLASS_ARRAY),
-				findChangeListenerMethod(target, clearMethodName, LIST_CHANGE_EVENT_CLASS_ARRAY),
-				findChangeListenerMethod(target, changeMethodName, LIST_CHANGE_EVENT_CLASS_ARRAY)
-		);
-	}
-
-	/**
-	 * Construct a list change listener that will invoke the specified method
-	 * on the specified target for any change event. If a single-argument method
-	 * with the specified name and appropriate argument is found, it will be invoked;
-	 * otherwise, a zero-argument method with the specified name will be invoked.
-	 */
-	public static ListChangeListener buildListChangeListener(Object target, String methodName) {
-		return buildListChangeListener(target, findChangeListenerMethod(target, methodName, LIST_CHANGE_EVENT_CLASS_ARRAY));
-	}
-
-
-	// ********** factory methods: TreeChangeListener **********
-
-	/**
-	 * Construct a tree change listener that will invoke the specified methods
-	 * on the specified target.
-	 */
-	public static TreeChangeListener buildTreeChangeListener(Object target, Method addMethod, Method removeMethod, Method clearMethod, Method changeMethod) {
-		checkChangeListenerMethod(addMethod, TREE_CHANGE_EVENT_CLASS);
-		checkChangeListenerMethod(removeMethod, TREE_CHANGE_EVENT_CLASS);
-		checkChangeListenerMethod(clearMethod, TREE_CHANGE_EVENT_CLASS);
-		checkChangeListenerMethod(changeMethod, TREE_CHANGE_EVENT_CLASS);
-		return new MultiMethodReflectiveChangeListener(target, addMethod, removeMethod, clearMethod, changeMethod);
-	}
-
-	/**
-	 * Construct a tree change listener that will invoke the specified method
-	 * on the specified target for any change event.
-	 */
-	public static TreeChangeListener buildTreeChangeListener(Object target, Method method) {
-		return buildTreeChangeListener(target, method, method, method, method);
-	}
-
-	/**
-	 * Construct a tree change listener that will invoke the specified methods
-	 * on the specified target for change events. If a single-argument method
-	 * with the specified name and appropriate argument is found, it will be invoked;
-	 * otherwise, a zero-argument method with the specified name will be invoked.
-	 */
-	public static TreeChangeListener buildTreeChangeListener(Object target, String addMethodName, String removeMethodName, String clearMethodName, String changeMethodName) {
-		return buildTreeChangeListener(
-				target,
-				findChangeListenerMethod(target, addMethodName, TREE_CHANGE_EVENT_CLASS_ARRAY),
-				findChangeListenerMethod(target, removeMethodName, TREE_CHANGE_EVENT_CLASS_ARRAY),
-				findChangeListenerMethod(target, clearMethodName, TREE_CHANGE_EVENT_CLASS_ARRAY),
-				findChangeListenerMethod(target, changeMethodName, TREE_CHANGE_EVENT_CLASS_ARRAY)
-		);
-	}
-
-	/**
-	 * Construct a tree change listener that will invoke the specified method
-	 * on the specified target for any change event. If a single-argument method
-	 * with the specified name and appropriate argument is found, it will be invoked;
-	 * otherwise, a zero-argument method with the specified name will be invoked.
-	 */
-	public static TreeChangeListener buildTreeChangeListener(Object target, String methodName) {
-		return buildTreeChangeListener(target, findChangeListenerMethod(target, methodName, TREE_CHANGE_EVENT_CLASS_ARRAY));
-	}
-
-
-	// ********** constructor **********
-
-	/**
-	 * Construct a listener that will invoke the specified method
-	 * on the specified target.
-	 */
-	protected ReflectiveChangeListener(Object target) {
-		super();
-		this.target = target;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/SingleMethodReflectiveChangeListener.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/SingleMethodReflectiveChangeListener.java
deleted file mode 100644
index ba7ea243e2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/SingleMethodReflectiveChangeListener.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.listener;
-
-import java.lang.reflect.Method;
-import org.eclipse.jpt.utility.internal.ClassTools;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.event.StateChangeEvent;
-
-/**
- * This class is used by ReflectiveChangeListener when the requested listener
- * need only implement a single method (i.e. StateChangeListener or
- * PropertyChangeListener).
- */
-class SingleMethodReflectiveChangeListener
-	extends ReflectiveChangeListener
-	implements StateChangeListener, PropertyChangeListener
-{
-
-	/** the method we will invoke on the target object */
-	private final Method method;
-	/** cache the number of arguments */
-	private final boolean methodIsZeroArgument;
-
-	SingleMethodReflectiveChangeListener(Object target, Method method) {
-		super(target);
-		this.method = method;
-		this.methodIsZeroArgument = method.getParameterTypes().length == 0;
-	}
-
-
-	// ********** StateChangeListener implementation **********
-
-	public void stateChanged(StateChangeEvent event) {
-		if (this.methodIsZeroArgument) {
-			ClassTools.executeMethod(this.method, this.target, EMPTY_STATE_CHANGE_EVENT_ARRAY);
-		} else {
-			ClassTools.executeMethod(this.method, this.target, new StateChangeEvent[] {event});
-		}
-	}
-
-
-	// ********** PropertyChangeListener implementation **********
-
-	public void propertyChanged(PropertyChangeEvent event) {
-		if (this.methodIsZeroArgument) {
-			ClassTools.executeMethod(this.method, this.target, EMPTY_PROPERTY_CHANGE_EVENT_ARRAY);
-		} else {
-			ClassTools.executeMethod(this.method, this.target, new PropertyChangeEvent[] {event});
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/StateChangeListener.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/StateChangeListener.java
deleted file mode 100644
index 1ce6ba5d69..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/StateChangeListener.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.listener;
-
-import org.eclipse.jpt.utility.model.event.StateChangeEvent;
-
-/**
- * A generic "state change" event gets delivered whenever a model changes to 
- * such extent that it cannot be delineated all aspects of it that have changed. 
- * You can register a StateChangeListener with a source model so as to be notified 
- * of any such changes.
- * 
- * 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 StateChangeListener extends ChangeListener {
-
-	/**
-	 * This method gets called when a model has changed in some general fashion.
-	 * 
-	 * @param event A StateChangeEvent describing the event source.
-	 */
-	void stateChanged(StateChangeEvent event);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/TreeChangeAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/TreeChangeAdapter.java
deleted file mode 100644
index 3b46202fd1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/TreeChangeAdapter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.listener;
-
-import org.eclipse.jpt.utility.model.event.TreeChangeEvent;
-
-/**
- * Convenience implementation of TreeChangeListener.
- * 
- * Provisional API: This class is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- */
-public class TreeChangeAdapter implements TreeChangeListener {
-
-	/**
-	 * Default constructor.
-	 */
-	public TreeChangeAdapter() {
-		super();
-	}
-
-	public void nodeAdded(TreeChangeEvent event) {
-		// do nothing
-	}
-
-	public void nodeRemoved(TreeChangeEvent event) {
-		// do nothing
-	}
-
-	public void treeCleared(TreeChangeEvent event) {
-		// do nothing
-	}
-
-	public void treeChanged(TreeChangeEvent event) {
-		// do nothing
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/TreeChangeListener.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/TreeChangeListener.java
deleted file mode 100644
index 7591f9df78..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/listener/TreeChangeListener.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.listener;
-
-import org.eclipse.jpt.utility.model.event.TreeChangeEvent;
-
-/**
- * A "tree change" event gets fired whenever a model changes a "bound"
- * tree. You can register a TreeChangeListener with a source
- * model so as to be notified of any bound tree updates.
- * 
- * 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 TreeChangeListener extends ChangeListener {
-
-	/**
-	 * This method gets called when a node is added to a bound tree.
-	 * 
-	 * @param event A TreeChangeEvent describing the event source,
-	 * the tree that changed, and the path to the node that was added.
-	 */
-	void nodeAdded(TreeChangeEvent event);
-
-	/**
-	 * This method gets called when a node is removed from a bound tree.
-	 * 
-	 * @param event A TreeChangeEvent describing the event source,
-	 * the tree that changed, and the path to the node that was removed.
-	 */
-	void nodeRemoved(TreeChangeEvent event);
-
-	/**
-	 * This method gets called when a bound tree is cleared.
-	 * 
-	 * @param event A TreeChangeEvent describing the event source,
-	 * the tree that changed, and an empty path.
-	 */
-	void treeCleared(TreeChangeEvent event);
-
-	/**
-	 * This method gets called when a portion of a bound tree is changed in
-	 * a manner that is not easily characterized by the other methods in this
-	 * interface.
-	 * 
-	 * @param event A TreeChangeEvent describing the event source,
-	 * the tree that changed, and the path to the branch of the
-	 * tree that changed.
-	 */
-	void treeChanged(TreeChangeEvent event);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/CollectionValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/CollectionValueModel.java
deleted file mode 100644
index ba25cf9262..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/CollectionValueModel.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.value;
-
-import java.util.Iterator;
-import org.eclipse.jpt.utility.model.Model;
-
-/**
- * Interface used to abstract collection accessing and
- * change notification and make it more pluggable.
- * 
- * 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 CollectionValueModel<E>
-	extends Model, Iterable<E>
-{
-
-	/**
-	 * Return the collection's values.
-	 */
-	Iterator<E> iterator();
-		String VALUES = "values";
-
-	/**
-	 * Return the size of the collection value.
-	 */
-	int size();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/ListValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/ListValueModel.java
deleted file mode 100644
index 65eaa7723b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/ListValueModel.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.value;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-import org.eclipse.jpt.utility.model.Model;
-
-/**
- * Interface used to abstract list accessing and
- * change notification and make it more pluggable.
- * 
- * 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 ListValueModel<E>
-	extends Model, Iterable<E>
-{
-	/**
-	 * Return the list's values.
-	 */
-	Iterator<E> iterator();
-		String LIST_VALUES = "list values";
-
-	/**
-	 * Return the list's values.
-	 */
-	ListIterator<E> listIterator();
-
-	/**
-	 * Return the size of the list.
-	 */
-	int size();
-
-	/**
-	 * Return the item at the specified index of the list.
-	 */
-	E get(int index);
-
-	/**
-	 * Return the list's values.
-	 */
-	Object[] toArray();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/PropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/PropertyValueModel.java
deleted file mode 100644
index 82ee3c0096..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/PropertyValueModel.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.value;
-
-import org.eclipse.jpt.utility.model.Model;
-
-/**
- * Interface used to abstract property accessing and
- * change notification and make it more pluggable.
- * 
- * 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 PropertyValueModel<T>
-	extends Model
-{
-
-	/**
-	 * Return the property's value.
-	 */
-	T getValue();
-		String VALUE = "value";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/TreeNodeValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/TreeNodeValueModel.java
deleted file mode 100644
index a6bcea8cdf..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/TreeNodeValueModel.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.value;
-
-/**
- * Extend WritablePropertyValueModel to better support TreeModelAdapter.
- * 
- * Implementors of this interface should fire a "state change" event
- * whenever the node's internal state changes in a way that the
- * tree listeners should be notified.
- * 
- * Implementors of this interface should also fire a "value property change"
- * event whenever the node's value changes. Typically, only nodes that
- * hold "primitive" data will fire this event.
- * 
- * @see org.eclipse.jpt.utility.internal.model.value.AbstractTreeNodeValueModel
- * 
- * 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 TreeNodeValueModel<T>
-	extends WritablePropertyValueModel<T>
-{
-
-	/**
-	 * Return the node's parent node; null if the node
-	 * is the root.
-	 */
-	TreeNodeValueModel<T> parent();
-
-	/**
-	 * Return the path to the node.
-	 */
-	TreeNodeValueModel<T>[] path();
-
-	/**
-	 * Return a list value model of the node's child nodes.
-	 */
-	ListValueModel<TreeNodeValueModel<T>> childrenModel();
-
-	/**
-	 * Return the node's child at the specified index.
-	 */
-	TreeNodeValueModel<T> child(int index);
-
-	/**
-	 * Return the size of the node's list of children.
-	 */
-	int childrenSize();
-
-	/**
-	 * Return the index in the node's list of children of the specified child.
-	 */
-	int indexOfChild(TreeNodeValueModel<T> child);
-
-	/**
-	 * Return whether the node is a leaf (i.e. it has no children)
-	 */
-	boolean isLeaf();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/TreeValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/TreeValueModel.java
deleted file mode 100644
index ec87a2771a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/TreeValueModel.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.value;
-
-import java.util.Iterator;
-import org.eclipse.jpt.utility.model.Model;
-
-/**
- * Interface used to abstract tree accessing and
- * change notification and make it more pluggable.
- * 
- * 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 TreeValueModel<E>
-	extends Model
-{
-	/**
-	 * Return the tree's nodes.
-	 */
-	Iterator<E> nodes();
-		String NODES = "nodes";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/WritablePropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/WritablePropertyValueModel.java
deleted file mode 100644
index c2ddacebe4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/WritablePropertyValueModel.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.utility.model.value;
-
-/**
- * Extend ValueModel to allow the setting of the property's value.
- * 
- * 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 WritablePropertyValueModel<T>
-	extends PropertyValueModel<T>
-{
-
-	/**
-	 * Set the value and fire a property change notification.
-	 * @see PropertyValueModel#VALUE
-	 */
-	void setValue(T value);
-
-}